From 702a8ff4a947adba2f859f9e063655d8d3652b44 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 8 Dec 2019 01:01:19 +0000 Subject: [PATCH 001/239] Change ref handling in TextualBody to prevent it parsing generated nodes Remove unused paths Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/HtmlUtils.js | 5 ++-- .../views/context_menus/MessageContextMenu.js | 2 +- src/components/views/messages/TextualBody.js | 29 ++++++++++--------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index 2b7384a5aa..9cf3994ff4 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -394,6 +394,7 @@ class TextHighlighter extends BaseHighlighter { * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing * opts.returnString: return an HTML string rather than JSX elements * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer + * opts.ref: React ref to attach to any React components returned (not compatible with opts.returnString) */ export function bodyToHtml(content, highlights, opts={}) { const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body; @@ -476,8 +477,8 @@ export function bodyToHtml(content, highlights, opts={}) { }); return isDisplayedWithHtml ? - : - { strippedBody }; + : + { strippedBody }; } /** diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index efbfc4322f..2084a67cdc 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -422,7 +422,7 @@ module.exports = createReactClass({ ); - if (this.props.eventTileOps && this.props.eventTileOps.getInnerText) { + if (this.props.eventTileOps) { // this event is rendered using TextuaLBody quoteButton = ( { _t('Quote') } diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index 2680c13512..fdfa351df3 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from 'react'; +import React, {createRef} from 'react'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; @@ -86,6 +86,10 @@ module.exports = createReactClass({ return successful; }, + componentWillMount: function() { + this._content = createRef(); + }, + componentDidMount: function() { this._unmounted = false; if (!this.props.editState) { @@ -94,13 +98,13 @@ module.exports = createReactClass({ }, _applyFormatting() { - this.activateSpoilers(this.refs.content.children); + this.activateSpoilers([this._content.current]); // pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer // are still sent as plaintext URLs. If these are ever pillified in the composer, // we should be pillify them here by doing the linkifying BEFORE the pillifying. - pillifyLinks(this.refs.content.children, this.props.mxEvent); - HtmlUtils.linkifyElement(this.refs.content); + pillifyLinks([this._content.current], this.props.mxEvent); + HtmlUtils.linkifyElement(this._content.current); this.calculateUrlPreview(); if (this.props.mxEvent.getContent().format === "org.matrix.custom.html") { @@ -163,7 +167,8 @@ module.exports = createReactClass({ //console.info("calculateUrlPreview: ShowUrlPreview for %s is %s", this.props.mxEvent.getId(), this.props.showUrlPreview); if (this.props.showUrlPreview) { - let links = this.findLinks(this.refs.content.children); + // pass only the first child which is the event tile otherwise this recurses on edited events + let links = this.findLinks([this._content.current]); if (links.length) { // de-dup the links (but preserve ordering) const seen = new Set(); @@ -325,10 +330,6 @@ module.exports = createReactClass({ global.localStorage.removeItem("hide_preview_" + this.props.mxEvent.getId()); } }, - - getInnerText: () => { - return this.refs.content.innerText; - }, }; }, @@ -424,6 +425,7 @@ module.exports = createReactClass({ disableBigEmoji: content.msgtype === "m.emote" || !SettingsStore.getValue('TextualBody.enableBigEmoji'), // Part of Replies fallback support stripReplyFallback: stripReply, + ref: this._content, }); if (this.props.replacingEventId) { body = [body, this._renderEditedMarker()]; @@ -450,15 +452,14 @@ module.exports = createReactClass({ switch (content.msgtype) { case "m.emote": - const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender(); return ( - + *  - { name } + { mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender() }   { body } @@ -467,14 +468,14 @@ module.exports = createReactClass({ ); case "m.notice": return ( - + { body } { widgets } ); default: // including "m.text" return ( - + { body } { widgets } From 0d537ecbb3e9cb59084e468fec0499b8ee6afe7a Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 2 Dec 2019 17:27:12 +0000 Subject: [PATCH 002/239] Add bridge info tab --- .../settings/tabs/room/BridgeSettingsTab.js | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 src/components/views/settings/tabs/room/BridgeSettingsTab.js diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js new file mode 100644 index 0000000000..732d7b2947 --- /dev/null +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -0,0 +1,128 @@ +/* +Copyright 2019 New Vector Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; +import PropTypes from 'prop-types'; +import {_t} from "../../../../../languageHandler"; +import MatrixClientPeg from "../../../../../MatrixClientPeg"; +import Pill from "../../../elements/Pill"; +import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks"; + +const BRIDGE_EVENT_TYPES = [ + "uk.half-shot.bridge", + // m.bridge +]; + +export default class BridgeSettingsTab extends React.Component { + static propTypes = { + roomId: PropTypes.string.isRequired, + }; + + constructor() { + super(); + + this.state = { + }; + } + + componentWillMount() { + + } + + _renderBridgeCard(event, room) { + const content = event.getContent(); + if (!content || !content.channel || !content.protocol) { + return null; + } + const protocolName = content.protocol.displayname || content.protocol.id; + const channelName = content.channel.displayname || content.channel.id; + const networkName = content.network ? " on " + (content.network.displayname || content.network.id) : ""; + let status = null; + if (content.status === "active") { + status = (

Status: Active

); + } else if (content.status === "disabled") { + status = (

Status: Disabled

); + } + + let creator = null; + if (content.creator) { + creator = (

+ This bridge was provisioned by +

); + } + + const bot = (

+ The bridge is managed by the bot user.

+ ); + + const chanAndNetworkInfo = ( +

Bridged into {channelName}{networkName}, on {protocolName}

+ ); + + return (
  • +
    +

    {channelName}{networkName} ({protocolName})

    +
    + {status} + {creator} + {bot} + {chanAndNetworkInfo} +
    +
    +
    • ); + } + + static getBridgeStateEvents(roomId) { + const client = MatrixClientPeg.get(); + const roomState = (client.getRoom(roomId)).currentState; + + const bridgeEvents = Array.concat(...BRIDGE_EVENT_TYPES.map((typeName) => + Object.values(roomState.events[typeName] || {}), + )); + + return bridgeEvents; + } + + render() { + // This settings tab will only be invoked if the following function returns more + // than 0 events, so no validation is needed at this stage. + const bridgeEvents = BridgeSettingsTab.getBridgeStateEvents(this.props.roomId); + const client = MatrixClientPeg.get(); + const room = client.getRoom(this.props.roomId); + + return ( +
    +
    {_t("Bridge Info")}
    +
    +

    Below is a list of bridges connected to this room.

    +
      + { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) } +
    +
    +
    + ); + } +} From 7c35b16f4d272b048e23ecd969e0f7aea5e44983 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 2 Dec 2019 17:27:23 +0000 Subject: [PATCH 003/239] Add bridge tab button --- src/components/views/dialogs/RoomSettingsDialog.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js index 740dc4d2c2..b262a1f078 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.js +++ b/src/components/views/dialogs/RoomSettingsDialog.js @@ -24,6 +24,7 @@ import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab"; import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab"; import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab"; import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab"; +import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab"; import sdk from "../../../index"; import MatrixClientPeg from "../../../MatrixClientPeg"; import dis from "../../../dispatcher"; @@ -52,6 +53,7 @@ export default class RoomSettingsDialog extends React.Component { _getTabs() { const tabs = []; + const shouldShowBridgeIcon = BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0; tabs.push(new Tab( _td("General"), @@ -73,6 +75,15 @@ export default class RoomSettingsDialog extends React.Component { "mx_RoomSettingsDialog_rolesIcon", , )); + + if (shouldShowBridgeIcon) { + tabs.push(new Tab( + _td("Bridge Info"), + "mx_RoomSettingsDialog_bridgesIcon", + , + )); + } + tabs.push(new Tab( _td("Advanced"), "mx_RoomSettingsDialog_warningIcon", From 626ab17ed38e9c8c11dd9accb70d38be7439f1ac Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 2 Dec 2019 17:27:31 +0000 Subject: [PATCH 004/239] Styling --- .../views/dialogs/_RoomSettingsDialog.scss | 17 +++++++ res/img/feather-customised/bridge.svg | 50 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 res/img/feather-customised/bridge.svg diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss index 723eb237ad..8e648e8881 100644 --- a/res/css/views/dialogs/_RoomSettingsDialog.scss +++ b/res/css/views/dialogs/_RoomSettingsDialog.scss @@ -29,6 +29,11 @@ limitations under the License. mask-image: url('$(res)/img/feather-customised/users-sm.svg'); } +.mx_RoomSettingsDialog_bridgesIcon::before { + // This icon is pants, please improve :) + mask-image: url('$(res)/img/feather-customised/bridge.svg'); +} + .mx_RoomSettingsDialog_warningIcon::before { mask-image: url('$(res)/img/feather-customised/warning-triangle.svg'); } @@ -42,3 +47,15 @@ limitations under the License. padding-left: 40px; padding-right: 80px; } + + +.mx_RoomSettingsDialog_BridgeList { + padding: 0; +} + +.mx_RoomSettingsDialog_BridgeList li { + list-style-type: none; + padding: 0; + margin: 0; + border-bottom: 1px solid $panel-divider-color; +} \ No newline at end of file diff --git a/res/img/feather-customised/bridge.svg b/res/img/feather-customised/bridge.svg new file mode 100644 index 0000000000..f8f3468155 --- /dev/null +++ b/res/img/feather-customised/bridge.svg @@ -0,0 +1,50 @@ + + + + + + + image/svg+xml + + + + + + + + + + + From 2bc6e2e3326250fb55ebf3b4662fd42602db1ecf Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 2 Dec 2019 17:27:38 +0000 Subject: [PATCH 005/239] Add the one string I bothered to i18n --- src/i18n/strings/en_EN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 182c761c5f..74ac452bb1 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -725,6 +725,7 @@ "Room version:": "Room version:", "Developer options": "Developer options", "Open Devtools": "Open Devtools", + "Bridge Info": "Bridge Info", "Room Addresses": "Room Addresses", "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?", "URL Previews": "URL Previews", From 9f2ccdf913dce10170a7d2465a2f97ac0936d77e Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Wed, 4 Dec 2019 15:02:36 +0000 Subject: [PATCH 006/239] Add support for displaying avatars and links in bridge info --- .../settings/tabs/room/BridgeSettingsTab.js | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js index 732d7b2947..459f11277c 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -20,6 +20,8 @@ import {_t} from "../../../../../languageHandler"; import MatrixClientPeg from "../../../../../MatrixClientPeg"; import Pill from "../../../elements/Pill"; import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks"; +import BaseAvatar from "../../../avatars/BaseAvatar"; +import { ContentRepo } from "matrix-js-sdk"; const BRIDGE_EVENT_TYPES = [ "uk.half-shot.bridge", @@ -47,9 +49,10 @@ export default class BridgeSettingsTab extends React.Component { if (!content || !content.channel || !content.protocol) { return null; } + const { channel, network } = content; const protocolName = content.protocol.displayname || content.protocol.id; - const channelName = content.channel.displayname || content.channel.id; - const networkName = content.network ? " on " + (content.network.displayname || content.network.id) : ""; + const channelName = channel.displayname || channel.id; + const networkName = network ? network.displayname || network.id : ""; let status = null; if (content.status === "active") { status = (

    Status: Active

    ); @@ -78,13 +81,41 @@ export default class BridgeSettingsTab extends React.Component { /> bot user.

    ); + const channelLink = channel.external_url ? ({channelName}) : channelName; + const networkLink = network && network.external_url ? ({networkName}) + : networkName; + const chanAndNetworkInfo = ( -

    Bridged into {channelName}{networkName}, on {protocolName}

    +

    Bridged into {channelLink} {networkLink}, on {protocolName}

    ); + let networkIcon = null; + if (networkName && network.avatar) { + const avatarUrl = ContentRepo.getHttpUriForMxc( + MatrixClientPeg.get().getHomeserverUrl(), + network.avatar, 32, 32, "crop", + ); + networkIcon = ; + } + + let channelIcon = null; + if (channel.avatar) { + const avatarUrl = ContentRepo.getHttpUriForMxc( + MatrixClientPeg.get().getHomeserverUrl(), + channel.avatar, 32, 32, "crop", + ); + console.log(channel.avatar); + channelIcon = ; + } + return (
  • -

    {channelName}{networkName} ({protocolName})

    +

    {channelIcon} {channelName} {networkName ? ` on ${networkName}` : ""} {networkIcon}

    +

    Connected via {protocolName}

    {status} {creator} From ce21ce8bbea93c9a2b48b0c0c6f341f4360d375b Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 5 Dec 2019 00:28:29 +0000 Subject: [PATCH 007/239] Lint --- .../views/settings/tabs/room/BridgeSettingsTab.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js index 459f11277c..031e2651c3 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -80,10 +80,15 @@ export default class BridgeSettingsTab extends React.Component { shouldShowPillAvatar={true} /> bot user.

    ); + let channelLink = channelName; + if (channel.external_url) { + channelLink = {channelName}; + } - const channelLink = channel.external_url ? ({channelName}) : channelName; - const networkLink = network && network.external_url ? ({networkName}) - : networkName; + let networkLink = networkName; + if (network && network.external_url) { + networkLink = {networkName}; + } const chanAndNetworkInfo = (

    Bridged into {channelLink} {networkLink}, on {protocolName}

    From d9943754f7c936fae5643ae6c16205d99467d9f9 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 9 Dec 2019 13:28:16 +0000 Subject: [PATCH 008/239] Remove `status` as it's no longer part of the MSC --- .../views/settings/tabs/room/BridgeSettingsTab.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js index 031e2651c3..a165a1db44 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -53,12 +53,6 @@ export default class BridgeSettingsTab extends React.Component { const protocolName = content.protocol.displayname || content.protocol.id; const channelName = channel.displayname || channel.id; const networkName = network ? network.displayname || network.id : ""; - let status = null; - if (content.status === "active") { - status = (

    Status: Active

    ); - } else if (content.status === "disabled") { - status = (

    Status: Disabled

    ); - } let creator = null; if (content.creator) { @@ -122,7 +116,6 @@ export default class BridgeSettingsTab extends React.Component {

    {channelIcon} {channelName} {networkName ? ` on ${networkName}` : ""} {networkIcon}

    Connected via {protocolName}

    - {status} {creator} {bot} {chanAndNetworkInfo} From 7ee5f7ba38e25cf5774e03008ba375c7d5e3f791 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 9 Dec 2019 13:28:43 +0000 Subject: [PATCH 009/239] Add feature flag --- src/components/views/dialogs/RoomSettingsDialog.js | 4 +++- src/i18n/strings/en_EN.json | 3 ++- src/settings/Settings.js | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js index b262a1f078..2952439076 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.js +++ b/src/components/views/dialogs/RoomSettingsDialog.js @@ -28,6 +28,7 @@ import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab"; import sdk from "../../../index"; import MatrixClientPeg from "../../../MatrixClientPeg"; import dis from "../../../dispatcher"; +import SettingsStore from "../settings/SettingsStore"; export default class RoomSettingsDialog extends React.Component { static propTypes = { @@ -53,7 +54,8 @@ export default class RoomSettingsDialog extends React.Component { _getTabs() { const tabs = []; - const shouldShowBridgeIcon = BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0; + const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state"); + const shouldShowBridgeIcon = featureFlag && BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0; tabs.push(new Tab( _td("General"), diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 74ac452bb1..14ba96fa4a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1932,5 +1932,6 @@ "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", + "Show info about bridges in room settings": "Show info about bridges in room settings" } diff --git a/src/settings/Settings.js b/src/settings/Settings.js index b02ab82400..94cc5b587d 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -154,6 +154,12 @@ export const SETTINGS = { displayName: _td("Enable local event indexing and E2EE search (requires restart)"), default: false, }, + "feature_bridge_state": { + isFeature: true, + supportedLevels: LEVELS_FEATURE, + displayName: _td("Show info about bridges in room settings"), + default: false, + }, "useCiderComposer": { displayName: _td("Use the new, faster, composer for writing messages"), supportedLevels: LEVELS_ACCOUNT_SETTINGS, From 6225e402ccdf7781cc6062c339265d63da455fc9 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 9 Dec 2019 13:54:21 +0000 Subject: [PATCH 010/239] i18n'ed all over the plaace --- .../views/dialogs/RoomSettingsDialog.js | 2 +- .../settings/tabs/room/BridgeSettingsTab.js | 58 ++++++++++++------- src/i18n/strings/en_EN.json | 10 +++- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js index 2952439076..9ac2b17f23 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.js +++ b/src/components/views/dialogs/RoomSettingsDialog.js @@ -28,7 +28,7 @@ import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab"; import sdk from "../../../index"; import MatrixClientPeg from "../../../MatrixClientPeg"; import dis from "../../../dispatcher"; -import SettingsStore from "../settings/SettingsStore"; +import SettingsStore from "../../../settings/SettingsStore"; export default class RoomSettingsDialog extends React.Component { static propTypes = { diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js index a165a1db44..82382e7828 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -52,28 +52,31 @@ export default class BridgeSettingsTab extends React.Component { const { channel, network } = content; const protocolName = content.protocol.displayname || content.protocol.id; const channelName = channel.displayname || channel.id; - const networkName = network ? network.displayname || network.id : ""; + const networkName = network ? network.displayname || network.id : protocolName; let creator = null; if (content.creator) { - creator = (

    - This bridge was provisioned by -

    ); + const pill = ; + creator = (

    { + _t("This bridge was provisioned by %(pill)s", { + pill, + }) + }

    ); } - const bot = (

    - The bridge is managed by the bot user.

    - ); + const bot = (

    {_t("This bridge is managed by the %(pill)s bot user.", { + pill: , + })}

    ); let channelLink = channelName; if (channel.external_url) { channelLink = {channelName}; @@ -85,7 +88,11 @@ export default class BridgeSettingsTab extends React.Component { } const chanAndNetworkInfo = ( -

    Bridged into {channelLink} {networkLink}, on {protocolName}

    + (_t("Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s", { + channelLink, + networkLink, + protocolName, + })) ); let networkIcon = null; @@ -111,14 +118,21 @@ export default class BridgeSettingsTab extends React.Component { url={ avatarUrl } />; } + const heading = _t("Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s", { + channelIcon, + channelName, + networkName, + networkIcon, + }); + return (
  • -

    {channelIcon} {channelName} {networkName ? ` on ${networkName}` : ""} {networkIcon}

    -

    Connected via {protocolName}

    +

    {heading}

    +

    {_t("Connected via %(protocolName)s", { protocolName })}

    {creator} {bot} - {chanAndNetworkInfo} +

    {chanAndNetworkInfo}

    • ); @@ -146,7 +160,7 @@ export default class BridgeSettingsTab extends React.Component {
    {_t("Bridge Info")}
    -

    Below is a list of bridges connected to this room.

    +

    { _t("Below is a list of bridges connected to this room.") }

      { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
    diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 14ba96fa4a..b76310ec27 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -342,6 +342,7 @@ "Send verification requests in direct message, including a new verification UX in the member panel.": "Send verification requests in direct message, including a new verification UX in the member panel.", "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)", + "Show info about bridges in room settings": "Show info about bridges in room settings", "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages", "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing", "Use compact timeline layout": "Use compact timeline layout", @@ -725,7 +726,13 @@ "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", + "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.", "Room Addresses": "Room Addresses", "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?", "URL Previews": "URL Previews", @@ -1932,6 +1939,5 @@ "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", - "Show info about bridges in room settings": "Show info about bridges in room settings" + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" } From 03e0f6f8c54a356f6855fe06ce5537672cd64fa2 Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 9 Dec 2019 17:06:57 +0000 Subject: [PATCH 011/239] Translated using Weblate (German) Currently translated at 79.9% (1545 of 1933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 45ba96ec62..7aab2e0e69 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1579,5 +1579,11 @@ "Change identity server": "Wechsle den Identitätsserver", "You should remove your personal data from identity server before disconnecting. Unfortunately, identity server is currently offline or cannot be reached.": "Du solltest deine persönlichen Daten vom Identitätsserver entfernen, bevor du die Verbindung trennst. Leider ist der Identitätsserver derzeit offline oder kann nicht erreicht werden.", "You should:": "Du solltest:", - "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Überprüfe deinen Browser auf Erweiterungen, die den Identitätsserver blockieren könnten (z.B. Privacy Badger)" + "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Überprüfe deinen Browser auf Erweiterungen, die den Identitätsserver blockieren könnten (z.B. Privacy Badger)", + "Error upgrading room": "Fehler beim Raum-Aufrüsten", + "Double check that your server supports the room version chosen and try again.": "Überprüfe nochmal ob dein Server die ausgewählte Raumversion unterstützt und versuche es nochmal.", + "%(senderName)s placed a voice call.": "%(senderName)s tätigte einen Sprachanruf.", + "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s tätigte einen Sprachanruf (Nicht von diesem Browser unterstützt)", + "%(senderName)s placed a video call.": "%(senderName)s tätigte einen Videoanruf.", + "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s tätigte einen Videoanruf (Nicht von diesem Browser unterstützt)" } From 77da7afdc0fe5aaa1f09bebfa377b4d6cbb9bfcf Mon Sep 17 00:00:00 2001 From: Tentarial Date: Mon, 9 Dec 2019 17:11:26 +0000 Subject: [PATCH 012/239] Translated using Weblate (German) Currently translated at 79.9% (1545 of 1933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 7aab2e0e69..4eb038ec33 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1471,7 +1471,7 @@ "Please supply a https:// or http:// widget URL": "Bitte gib eine https:// oder http:// Widget-URL an", "Sends the given emote coloured as a rainbow": "Sended das Emoji in Regenbogenfarben", "%(senderName)s made no change.": "%(senderName)s hat keine Änderung vorgenommen.", - "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung zum Betreten des Raumes für %(targetDisplayName)s zurückgezogen.", + "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung zum Raumbeitritt für %(targetDisplayName)s zurückgezogen.", "Cannot reach homeserver": "Der Heimserver ist nicht erreichbar", "Ensure you have a stable internet connection, or get in touch with the server admin": "Stelle sicher, dass du eine stabile Internetverbindung hast oder wende dich an deinen Server-Administrator", "Ask your Riot admin to check your config for incorrect or duplicate entries.": "Wende dich an deinen Riot Admin um deine Konfiguration auf ungültige oder doppelte Einträge zu überprüfen.", From adc96514e715a7f1b3ae21d578236118cc6a0657 Mon Sep 17 00:00:00 2001 From: random Date: Mon, 9 Dec 2019 14:42:54 +0000 Subject: [PATCH 013/239] Translated using Weblate (Italian) Currently translated at 100.0% (1933 of 1933 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 6910de79fc..d6761f91d7 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1923,5 +1923,20 @@ "%(senderName)s placed a video call.": "%(senderName)s ha effettuato una videochiamata.", "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ha effettuato una videochiamata. (non supportata da questo browser)", "Clear notifications": "Cancella le notifiche", - "Customise your experience with experimental labs features. Learn more.": "Personalizza la tua esperienza con funzionalità sperimentali. Maggiori informazioni." + "Customise your experience with experimental labs features. Learn more.": "Personalizza la tua esperienza con funzionalità sperimentali. Maggiori informazioni.", + "Error upgrading room": "Errore di aggiornamento stanza", + "Double check that your server supports the room version chosen and try again.": "Controlla che il tuo server supporti la versione di stanza scelta e riprova.", + "This message cannot be decrypted": "Questo messaggio non può essere decifrato", + "Unencrypted": "Non criptato", + "Reactions": "Reazioni", + " reacted with %(content)s": " ha reagito con %(content)s", + "Automatically invite users": "Invita utenti automaticamente", + "Upgrade private room": "Aggiorna stanza privata", + "Upgrade public room": "Aggiorna stanza pubblica", + "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Aggiornare una stanza è un'azione avanzata ed è consigliabile quando una stanza non è stabile a causa di errori, funzioni mancanti o vulnerabilità di sicurezza.", + "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please report a bug.": "Solitamente ciò influisce solo come la stanza viene elaborata sul server. Se stai riscontrando problemi con il tuo Riot, segnala un errore.", + "You'll upgrade this room from to .": "Aggiornerai questa stanza dalla alla .", + "Upgrade": "Aggiorna", + "Notification settings": "Impostazioni di notifica", + "User Status": "Stato utente" } From a4dc8c650eee34a5aa2011657b0b76c59741a3c7 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 11 Dec 2019 05:52:08 +0000 Subject: [PATCH 014/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1935 of 1935 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 0c230734e0..10f72ba94e 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1938,5 +1938,7 @@ "Notification settings": "通知設定", "User Status": "使用者狀態", "Reactions": "反應", - " reacted with %(content)s": " 反應了 %(content)s" + " reacted with %(content)s": " 反應了 %(content)s", + " wants to chat": " 想要聊天", + "Start chatting": "開始聊天" } From af890cd517d41be565969f0e7019384a2fc6fe20 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Tue, 10 Dec 2019 20:44:40 +0000 Subject: [PATCH 015/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (1935 of 1935 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 04b5b993ee..13a939058c 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1939,5 +1939,7 @@ "Notification settings": "Értesítések beállítása", "User Status": "Felhasználó állapota", "Reactions": "Reakciók", - " reacted with %(content)s": " ezzel reagáltak: %(content)s" + " reacted with %(content)s": " ezzel reagáltak: %(content)s", + " wants to chat": " csevegni szeretne", + "Start chatting": "Beszélgetés elkezdése" } From 9dbd6e815f81bc07eb7b8e5d1fddd9cfbc1a896a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Wed, 11 Dec 2019 09:43:06 +0000 Subject: [PATCH 016/239] Translated using Weblate (French) Currently translated at 100.0% (1935 of 1935 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index bed99fed86..9bd4046cf7 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1938,5 +1938,7 @@ "Notification settings": "Paramètres de notification", "User Status": "Statut de l’utilisateur", "Reactions": "Réactions", - " reacted with %(content)s": " ont réagi avec %(content)s" + " reacted with %(content)s": " ont réagi avec %(content)s", + " wants to chat": " veut discuter", + "Start chatting": "Commencer à discuter" } From 2a90f287c6c2c26e88d596b155d58bf801a67a63 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 Dec 2019 17:29:57 +0000 Subject: [PATCH 017/239] Added translation using Weblate (Mongolian) --- src/i18n/strings/mn.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/mn.json diff --git a/src/i18n/strings/mn.json b/src/i18n/strings/mn.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/src/i18n/strings/mn.json @@ -0,0 +1 @@ +{} From 24ea1424c56ca1c4f0803d4609eba64ef9db9f83 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Wed, 11 Dec 2019 13:02:52 +0000 Subject: [PATCH 018/239] Translated using Weblate (Albanian) Currently translated at 99.3% (1952 of 1966 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/ --- src/i18n/strings/sq.json | 104 +++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 25 deletions(-) diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index d04fe2b5e1..4d67df4fa4 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -865,7 +865,7 @@ "%(oneUser)shad their invitation withdrawn %(count)s times|other": "Për %(oneUser)s përdorues ftesa u tërhoq mbrapsht %(count)s herë", "%(oneUser)shad their invitation withdrawn %(count)s times|one": "U tërhoq mbrapsht ftesa për %(oneUser)s", "Community IDs cannot be empty.": "ID-të e bashkësisë s’mund të jenë të zbrazëta.", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Kjo do ta bëjë llogarinë tuaj përgjithmonë të papërdorshme. S’do të jeni në gjendje të hyni në llogarinë tuaj, dhe askush s’do të jetë në gjendje të riregjistrojë të njëjtën ID përdoruesi. Kjo do të shkaktojë daljen e llogarisë tuaj nga krejt dhomat ku merrni pjesë, dhe do të heqë hollësitë e llogarisë tuaj nga shërbyesi juaj i identiteteve. Ky veprim është i paprapakthyeshëm.", + "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Kjo do ta bëjë llogarinë tuaj përgjithmonë të papërdorshme. S’do të jeni në gjendje të hyni në llogarinë tuaj, dhe askush s’do të jetë në gjendje të riregjistrojë të njëjtën ID përdoruesi. Kjo do të shkaktojë daljen e llogarisë tuaj nga krejt dhomat ku merrni pjesë, dhe do të heqë hollësitë e llogarisë tuaj nga shërbyesi juaj i identiteteve. Ky veprim është i paprapakthyeshëm.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Çaktivizimi i llogarisë tuaj nuk shkakton, si parazgjedhje, harrimin nga ne të mesazheve që keni dërguar. Nëse do të donit të harrojmë mesazhet tuaja, ju lutemi, i vini shenjë kutizës më poshtë.", "Upgrade this room to version %(version)s": "Përmirësojeni këtë dhomë me versionin %(version)s", "Share Room": "Ndani Dhomë Me të Tjerë", @@ -1037,7 +1037,7 @@ "That doesn't match.": "S’përputhen.", "Go back to set it again.": "Shkoni mbrapsht që ta ricaktoni.", "Repeat your passphrase...": "Përsëritni frazëkalimin tuaj…", - "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Si rrjet i parrezikuar, mund ta përdoreni për të rikthyer historikun e mesazheve tuaj të fshehtëzuar, nëse harroni Frazëkalimin e Rimarrjeve.", + "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Si masë sigurie, mund ta përdoreni për të rikthyer historikun e mesazheve tuaj të fshehtëzuar, nëse harroni Frazëkalimin e Rimarrjeve.", "Your Recovery Key": "Kyçi Juaj i Rimarrjeve", "Copy to clipboard": "Kopjoje në të papastër", "Download": "Shkarkoje", @@ -1046,8 +1046,8 @@ "Print it and store it somewhere safe": "Shtypeni dhe ruajeni diku pa rrezik", "Save it on a USB key or backup drive": "Ruajeni në një diskth USB ose disk kopjeruajtjesh", "Copy it to your personal cloud storage": "Kopjojeni te depoja juaj personale në re", - "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another device.": "Pa rregulluar Rikthim Mesazhesh të Sigurt, s’do të jeni në gjendje të riktheni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen ose përdorni një pajisje tjetër.", - "Set up Secure Message Recovery": "Rregulloni Rikthim Mesazhesh të Sigurt", + "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another device.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, s’do të jeni në gjendje të riktheni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen ose përdorni një pajisje tjetër.", + "Set up Secure Message Recovery": "Rregulloni Rimarrje të Sigurt Mesazhesh", "Keep it safe": "Mbajeni të parrezikuar", "Create Key Backup": "Krijo Kopjeruajtje Kyçesh", "Unable to create key backup": "S’arrihet të krijojhet kopjeruajtje kyçesh", @@ -1059,12 +1059,12 @@ "Failed to decrypt %(failedCount)s sessions!": "S’u arrit të shfshehtëzohet sesioni %(failedCount)s!", "Restored %(sessionCount)s session keys": "U rikthyen kyçet e sesionit %(sessionCount)s", "Enter Recovery Passphrase": "Jepni Frazëkalim Rimarrjeje", - "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë frazëkalimin tuaj të rikthimeve.", - "If you've forgotten your recovery passphrase you can use your recovery key or set up new recovery options": "Nëse keni harruar frazëkalimin tuaj të rikthimeve, mund të përdorni kyçin tuaj të rikthimeve ose rregulloni mundësi të reja rikthimesh", + "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë frazëkalimin tuaj të rimarrjeve.", + "If you've forgotten your recovery passphrase you can use your recovery key or set up new recovery options": "Nëse keni harruar frazëkalimin tuaj të rimarrjeve, mund të përdorni kyçin tuaj të rimarrjeve ose rregulloni mundësi të reja rimarrjesh", "Enter Recovery Key": "Jepni Kyç Rimarrjeje", - "This looks like a valid recovery key!": "Ky duket si kyç i vlefshëm rikthimesh!", - "Not a valid recovery key": "Kyç rikthimesh jo i vlefshëm", - "Access your secure message history and set up secure messaging by entering your recovery key.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë kyçin tuaj të rikthimeve.", + "This looks like a valid recovery key!": "Ky duket si kyç i vlefshëm rimarrjesh!", + "Not a valid recovery key": "Kyç rimarrjesh jo i vlefshëm", + "Access your secure message history and set up secure messaging by entering your recovery key.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë kyçin tuaj të rimarrjeve.", "If you've forgotten your recovery passphrase you can ": "Nëse keni harruar frazëkalimin tuaj të rikthimeve, mund të ", "Sign in with single sign-on": "Bëni hyrjen me hyrje njëshe", "Failed to perform homeserver discovery": "S’u arrit të kryhej zbulim shërbyesi Home", @@ -1096,16 +1096,16 @@ "Common names and surnames are easy to guess": "Emra dhe mbiemra të rëndomtë janë të kollajtë për t’u hamendësuar", "Great! This passphrase looks strong enough.": "Bukur! Ky frazëkalim duket goxha i fuqishëm.", "Failed to load group members": "S'u arrit të ngarkoheshin anëtarë grupi", - "As a safety net, you can use it to restore your encrypted message history.": "Si një rrjet sigurie, mund ta përdorni për të rikthyer historikun e mesazheve tuaj të fshehtëzuar.", + "As a safety net, you can use it to restore your encrypted message history.": "Si masë sigurie, mund ta përdorni për të rikthyer historikun e mesazheve tuaj të fshehtëzuar.", "Failed to invite users to the room:": "S’u arrit të ftohen përdorues te dhoma:", "You do not have permission to invite people to this room.": "S’keni leje të ftoni njerëz në këtë dhomë.", "User %(user_id)s does not exist": "Përdoruesi %(user_id)s nuk ekziston", "Unknown server error": "Gabim i panjohur shërbyesi", "There was an error joining the room": "Pati një gabim ardhjeje në dhomë", - "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Shfaq një kujtues për aktivizim Rikthimi Mesazhesh të Sigurt në dhoma të fshehtëzuara", + "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Shfaq një kujtues për aktivizim Rimarrjeje Mesazhesh të Sigurt në dhoma të fshehtëzuara", "Don't ask again": "Mos pyet sërish", "Set up": "Rregulloje", - "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Po s’rregulluat Rikthim Mesazhesh të Sigurt, do të humbni historikun e mesazheve të parrezik, kur të dilni nga llogaria.", + "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, do të humbni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen nga llogaria.", "If you don't want to set this up now, you can later in Settings.": "Nëse s’doni ta rregulloni tani këtë, mund ta bëni më vonë që nga Rregullimet.", "Messages containing @room": "Mesazhe që përmbajnë @room", "Encrypted messages in one-to-one chats": "Mesazhe të fshehtëzuar në fjalosje tek-për-tek", @@ -1115,7 +1115,7 @@ "Invalid identity server discovery response": "Përgjigje e pavlefshme zbulimi identiteti shërbyesi", "Backup has a valid signature from verified device ": "Kopjeruajtja ka një nënshkrim të vlefshëm prej pajisjes së verifikuar ", "New Recovery Method": "Metodë e Re Rimarrjesh", - "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rikthimeve s’e keni caktuar ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rikthimesh.", + "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rimarrjeve s’e keni caktuar ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh.", "Set up Secure Messages": "Rregulloni Mesazhi të Sigurt", "Go to Settings": "Kalo te Rregullimet", "Straight rows of keys are easy to guess": "Rreshta uniformë tastesh janë lehtësisht të hamendësueshëm", @@ -1230,7 +1230,7 @@ "To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.": "Për të na ndihmuar të shmangim çështje të përsëdytura, ju lutemi, së pari shihni çështjet ekzistuese (dhe shtoni një +1) ose krijoni një çështje të re, nëse nuk gjeni gjë.", "Report bugs & give feedback": "Njoftoni të meta & jepni përshtypjet", "Go back": "Kthehu mbrapsht", - "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Nuk u shfshehtëzua dot kopjeruajtja me këtë kyç: ju lutemi, verifikoni që dhatë kyçin e duhur të rikthimeve.", + "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Nuk u shfshehtëzua dot kopjeruajtja me këtë kyç: ju lutemi, verifikoni që dhatë kyçin e duhur të rimarrjeve.", "Update status": "Përditëso gendjen", "Set status": "Caktojini gjendjen", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Mund të përdorni mundësitë mbi shërbyes vetjak, për të bërë hyrjen në shërbyes të tjerë Matrix, duke dhënë URL-në e një tjetër shërbyesi Home. Kjo ju lejon ta përdorni këtë aplikacion në një tjetër shërbyes Home, me një llogari ekzistuese Matrix.", @@ -1260,12 +1260,12 @@ "Create account": "Krijoni llogari", "Keep going...": "Vazhdoni kështu…", "Starting backup...": "Po fillohet kopjeruajtje…", - "A new recovery passphrase and key for Secure Messages have been detected.": "Janë pikasur një frazëkalim dhe kyç i ri rikthimesh për Mesazhe të Sigurt.", - "This device is encrypting history using the new recovery method.": "Kjo pajisje e fshehtëzon historikun duke përdorur metodë të re rikthimesh.", + "A new recovery passphrase and key for Secure Messages have been detected.": "Janë pikasur një frazëkalim dhe kyç i ri rimarrjesh për Mesazhe të Sigurt.", + "This device is encrypting history using the new recovery method.": "Kjo pajisje e fshehtëzon historikun duke përdorur metodë të re rimarrjesh.", "Recovery Method Removed": "U hoq Metodë Rimarrje", - "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Kjo pajisje ka pikasur se frazëkalimi dhe kyçi juaj i rikthimeve për Mesazhe të Sigurt janë hequr.", - "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë pajisje, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të pajisjes me një metodë të re rikthimesh.", - "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rikthimeve s’e keni hequr ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rikthimesh.", + "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Kjo pajisje ka pikasur se frazëkalimi dhe kyçi juaj i rimarrjeve për Mesazhe të Sigurt janë hequr.", + "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë pajisje, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të pajisjes me një metodë të re rimarrjesh.", + "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rimarrjeve s’e keni hequr ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh.", "Disinvite this user?": "T’i hiqet ftesa këtij përdoruesi?", "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Kartela '%(fileName)s' tejkalon kufirin e këtij shërbyesi Home për madhësinë e ngarkimeve", "Gets or sets the room topic": "Merr ose cakton temën e dhomës", @@ -1332,9 +1332,9 @@ "Chat with Riot Bot": "Fjalosuni me Robotin Riot", "Some devices for this user are not trusted": "Disa pajisje për këtë përdorues nuk janë të besuara", "All devices for this user are trusted": "Krejt pajisjet për këtë përdorues janë të besuara", - "Recovery Key Mismatch": "Mospërputhje Kyçesh", + "Recovery Key Mismatch": "Mospërputhje Kyçesh Rimarrjeje", "Incorrect Recovery Passphrase": "Frazëkalim Rimarrjeje i Pasaktë", - "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "S’u shfshehtëzua dot kopjeruajtja me këtë frazëkalim: ju lutemi, verifikoni që dhatë frazëkalimin e duhur të rikthimeve.", + "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "S’u shfshehtëzua dot kopjeruajtja me këtë frazëkalim: ju lutemi, verifikoni që dhatë frazëkalimin e duhur të rimarrjeve.", "This homeserver would like to make sure you are not a robot.": "Ky Shërbyes Home do të donte të sigurohej se s’jeni robot.", "Change": "Ndërroje", "Couldn't load page": "S’u ngarkua dot faqja", @@ -1382,14 +1382,14 @@ "Hide": "Fshihe", "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Do të depozitojmë në shërbyesin tonë një kopje të fshehtëzuar të kyçeve tuaj. Mbrojeni kopjeruajtjen tuaj me një frazëkalim, për ta mbajtur të parrezikuar.", "For maximum security, this should be different from your account password.": "Për maksimumin e sigurisë, ky do të duhej të ishte i ndryshëm nga fjalëkalimi juaj për llogarinë.", - "Set up with a Recovery Key": "Rregullojeni me një Kyç Rikthimesh", + "Set up with a Recovery Key": "Rregullojeni me një Kyç Rimarrjesh", "Please enter your passphrase a second time to confirm.": "Ju lutemi, që të ripohohet, rijepeni frazëkalimin tuaj.", - "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kyçi juaj i rikthimeve është një rrjet sigurie - mund ta përdorni për rikthim hyrjeje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj.", + "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kyçi juaj i rimarrjeve është një masë sigurie - mund ta përdorni për rimarrje hyrjeje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj.", "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Mbajeni kyçin tuaj të rikthimeve diku në një vend shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh (ose në një kasafortë)", "Your keys are being backed up (the first backup could take a few minutes).": "Kyçet tuaj po kopjeruhen (kopjeruajtja e parë mund të hajë disa minuta).", "Secure your backup with a passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim", "Confirm your passphrase": "Ripohoni frazëkalimin tuaj", - "Recovery key": "Kyç rikthimesh", + "Recovery key": "Kyç rimarrjesh", "Success!": "Sukses!", "Allow Peer-to-Peer for 1:1 calls": "Lejo Peer-to-Peer për thirrje tek për tek", "Credits": "Kredite", @@ -1910,5 +1910,59 @@ "Remove for everyone": "Hiqe për këdo", "Remove for me": "Hiqe për mua", "Verification Request": "Kërkesë Verifikimi", - " (1/%(totalCount)s)": " (1/%(totalCount)s)" + " (1/%(totalCount)s)": " (1/%(totalCount)s)", + "Error upgrading room": "Gabim në përditësim dhome", + "Double check that your server supports the room version chosen and try again.": "Rikontrolloni që shërbyesi juaj e mbulon versionin e zgjedhur për dhomën dhe riprovoni.", + "%(senderName)s placed a voice call.": "%(senderName)s bëri një thirrje zanore.", + "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bëri një thirrje zanore. (e pambuluar nga ky shfletues)", + "%(senderName)s placed a video call.": "%(senderName)s bëri një thirrje video.", + "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bëri një thirrje video. (e pambuluar nga ky shfletues)", + "Enable cross-signing to verify per-user instead of per-device (in development)": "", + "Enable local event indexing and E2EE search (requires restart)": "Aktivizoni indeksim aktesh vendore dhe kërkim E2EE (lyp rinisje)", + "Match system theme": "Përputhe me temën e sistemit", + "Send cross-signing keys to homeserver": "", + "Cross-signing public keys:": "", + "on device": "në pajisje", + "not found": "s’u gjet", + "in secret storage": "në depozitë të fshehtë", + "Secret storage public key:": "Kyç publik depozite të fshehtë:", + "in account data": "në të dhëna llogarie", + "Clear notifications": "Spastro njoftimet", + "Customise your experience with experimental labs features. Learn more.": "Përshtateni punimin tuaj me veçori eksperimentale. Mësoni më tepër.", + "This message cannot be decrypted": "Ky mesazh s'mund të shfshehtëzohet", + "Unencrypted": "Të pafshehtëzuara", + " wants to chat": " dëshiron të bisedojë", + "Start chatting": "Filloni të bisedoni", + "Reactions": "Reagime", + " reacted with %(content)s": " reagoi me %(content)s", + "Automatically invite users": "Fto përdorues automatikisht", + "Upgrade private room": "Përmirëso dhomë private", + "Upgrade public room": "Përmirëso dhomë publike", + "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Përmirësimi i një dhome është një veprim i thelluar dhe zakonisht rekomandohet kur një dhomë është e papërdorshme, për shkak të metash, veçorish që i mungojnë ose cenueshmëri sigurie.", + "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please report a bug.": "Kjo zakonisht prek vetëm mënyrën se si përpunohet dhoma te shërbyesi. Nëse keni probleme me Riot-in, ju lutemi, njoftoni një të metë.", + "You'll upgrade this room from to .": "Do ta përmirësoni këtë dhomë nga në .", + "Upgrade": "Përmirësoje", + "Enter secret storage passphrase": "Jepni frazëkalim për te depozitë e fshehtë", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "S’arrihet të hyhet te depozitë e fshehtë. Ju lutemi, verifikoni se dhatë frazëkalimin e saktë.", + "Warning: You should only access secret storage from a trusted computer.": "Kujdes: Duhet të hyni në depozitën e fshehtë vetëm nga një kompjuter i besuar.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Nëse keni harruar frazëkalimin tuaj, mund të përdorni kyçin tuaj të rimarrjes ose të ujdisni mundësi të reja rimarrjeje.", + "Enter secret storage recovery key": "Jepni kyç rimarrjeje për depozitë të fshehtë", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "S’arrihet të hyhet te depozitë e fshehtë. Ju lutemi, verifikoni se dhatë kyç të saktë rimarrjeje.", + "If you've forgotten your recovery key you can .": "Nëse keni harruar kyçin tuaj të rimarrjeve, mund të .", + "Warning: You should only set up key backup from a trusted computer.": "Kujdes: duhet të ujdisni kopjeruajtje kyçesh vetëm nga një kompjuter i besuar.", + "If you've forgotten your recovery key you can ": "Nëse keni harruar kyçin tuaj të rimarrjeve, mund të ", + "Notification settings": "Rregullime njoftimesh", + "User Status": "Gjendje Përdoruesi", + "Warning: You should only set up secret storage from a trusted computer.": "Kujdes: Duhet të ujdisni një depozitë të fshehtë vetëm nga një kompjuter i besuar.", + "Set up with a recovery key": "Rregullojeni me një kyç rimarrjesh", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Si masë sigurie, mund ta përdorni për të rifituar hyrjen tuaj te mesazhe të fshehtëzuar, nëse harroni frazëkalimin tuaj.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Si një masë sigurie, mund ta përdorni për të rifituar hyrjen tuaj te mesazhe të fshehtëzuar.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Mbajeni kyçin tuaj të rimarrjeve diku në një vend shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh (ose në një kasafortë).", + "Your recovery key has been copied to your clipboard, paste it to:": "Kyçi juaj i rimarrjeve është kopjuar te e papastra juaj, ngjiteni te:", + "Your recovery key is in your Downloads folder.": "Kyçi juaj i rimarrjeve gjendet te dosja juaj Shkarkime.", + "Your access to encrypted messages is now protected.": "Hyrja juaj te mesazhe të fshehtëzuar tani është e mbrojtur.", + "Set up secret storage": "Ujdisni depozitë të fshehtë", + "Secure your encrypted messages with a passphrase": "Sigurojini mesazhet tuaj të fshehtëzuar me një frazëkalim", + "Storing secrets...": "Po depozitohen të fshehta…", + "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë" } From 53692c0938e846e67cf86386e6d91d853bd88acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Wed, 11 Dec 2019 12:56:00 +0000 Subject: [PATCH 019/239] Translated using Weblate (French) Currently translated at 98.5% (1936 of 1966 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 9bd4046cf7..ec2a814b95 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1940,5 +1940,10 @@ "Reactions": "Réactions", " reacted with %(content)s": " ont réagi avec %(content)s", " wants to chat": " veut discuter", - "Start chatting": "Commencer à discuter" + "Start chatting": "Commencer à discuter", + "Send cross-signing keys to homeserver": "Envoyer les clés de signature croisée au serveur d’accueil", + "Cross-signing public keys:": "Clés publiques de signature croisée :", + "on device": "sur l’appareil", + "not found": "non trouvé", + "Cross-signing private keys:": "Clés privées de signature croisée :" } From eb671c372487575cfe5741786bc80f9ea6d2e5a4 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Wed, 11 Dec 2019 15:16:20 +0000 Subject: [PATCH 020/239] Translated using Weblate (Hungarian) Currently translated at 98.9% (1944 of 1966 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 13a939058c..20ed3b3892 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1941,5 +1941,18 @@ "Reactions": "Reakciók", " reacted with %(content)s": " ezzel reagáltak: %(content)s", " wants to chat": " csevegni szeretne", - "Start chatting": "Beszélgetés elkezdése" + "Start chatting": "Beszélgetés elkezdése", + "Send cross-signing keys to homeserver": "Kereszt-aláírás kulcsok küldése a matrix szervernek", + "Cross-signing public keys:": "Kereszt-aláírás nyilvános kulcsok:", + "on device": "eszközön", + "not found": "nem található", + "Cross-signing private keys:": "Kereszt-aláírás privát kulcsok:", + "in secret storage": "biztonsági tárolóban", + "Secret storage public key:": "Biztonsági tároló nyilvános kulcs:", + "in account data": "fiók adatokban", + "Bootstrap Secure Secret Storage": "Biztonsági Titok Tároló megnyitása", + "Cross-signing": "Kereszt-aláírás", + "Enter secret storage passphrase": "Add meg a jelmondatot a biztonsági tárolóhoz", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó jelmondatot adtál-e meg.", + "Warning: You should only access secret storage from a trusted computer.": "Figyelem: Csak biztonságos eszközről férj hozzá a biztonságos tárolóhoz." } From 7e383b771a11b4cefed0c55ccca19ac2fc3c07f1 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Thu, 12 Dec 2019 05:31:45 +0000 Subject: [PATCH 021/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 98.9% (1961 of 1983 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 10f72ba94e..c36eda6e6d 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1940,5 +1940,35 @@ "Reactions": "反應", " reacted with %(content)s": " 反應了 %(content)s", " wants to chat": " 想要聊天", - "Start chatting": "開始聊天" + "Start chatting": "開始聊天", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 使用者的規則", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 聊天室的規則", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 伺服器的規則", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 的規則", + "%(senderName)s updated an invalid ban rule": "%(senderName)s 更新無效的封鎖的規則", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 使用者的規則，因為", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 聊天室的規則，因為 %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 伺服器的規則，因為 %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 的規則，因為 %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 使用者的規則，因為 %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 聊天室的規則，因為 %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 伺服器的規則，因為 %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 的規則，因為 %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 使用者的規則變更為 ，因為 %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 聊天室的規則變更為 %(newGlob)s，因為 %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 伺服器的規則變更為 %(newGlob)s，因為 %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 的規則更新為 %(newGlob)s，因為 %(reason)s", + "Send cross-signing keys to homeserver": "將交叉簽章的金鑰傳送到家伺服器", + "Cross-signing public keys:": "交叉簽章的公開金鑰：", + "on device": "在裝置上", + "not found": "找不到", + "Cross-signing private keys:": "交叉簽章的私密金鑰：", + "in secret storage": "在秘密儲存空間中", + "Secret storage public key:": "秘密儲存空間公開金鑰：", + "in account data": "在帳號資料中", + "Bootstrap Secure Secret Storage": "Bootstrap 安全秘密儲存空間", + "Cross-signing": "交叉簽章", + "Enter secret storage passphrase": "輸入秘密儲存空間密碼", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的密碼。", + "Warning: You should only access secret storage from a trusted computer.": "警告：您應該僅從信任的電腦存取秘密儲存空間。" } From e1ad4b25ce7cc69110ef7ed782d07ad668ae3f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= Date: Thu, 12 Dec 2019 08:54:39 +0000 Subject: [PATCH 022/239] Translated using Weblate (Czech) Currently translated at 99.1% (1966 of 1983 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/ --- src/i18n/strings/cs.json | 164 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 153 insertions(+), 11 deletions(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index f552c117e5..b6a2dcdb18 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -587,10 +587,10 @@ "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)ssi změnili jméno", "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)ssi %(count)s krát změnili jméno", "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)ssi změnili jméno", - "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili avatara", - "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)ssi změnili avatara", - "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssi %(count)s krát změnil avatara", - "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssi změnil avatara", + "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili avatary", + "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)ssi změnili avatary", + "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssi %(count)s krát změnil avatar", + "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssi změnil avatar", "%(items)s and %(count)s others|other": "%(items)s a %(count)s další", "%(items)s and %(count)s others|one": "%(items)s a jeden další", "%(items)s and %(lastItem)s": "%(items)s a také %(lastItem)s", @@ -1019,7 +1019,7 @@ "Room Topic": "Téma místnosti", "No room avatar": "Žádný avatar místnosti", "Room avatar": "Avatar místnosti", - "Upload room avatar": "Nahrát avatara místnosti", + "Upload room avatar": "Nahrát avatar místnosti", "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Změny toho kdo smí číst historické zprávy se aplikují jenom na další zprávy v této místosti. Viditelnost už poslaných zpráv zůstane jaká byla.", "To link to this room, please add an alias.": "K vytvoření odkazu je potřeba vyrobit místnosti alias.", "Roles & Permissions": "Funkce & Práva", @@ -1047,7 +1047,7 @@ "Enable big emoji in chat": "Povolit velké emotikony v chatu", "Show avatars in user and room mentions": "Zobrazovat ikony uživatelů ve zmínkách o nich", "Prompt before sending invites to potentially invalid matrix IDs": "Zeptat před odesláním pozvánky potenciálně neplatným Matrixovým identifikátorům", - "Show avatar changes": "Zobrazovat změny ikony", + "Show avatar changes": "Zobrazovat změny avatarů", "Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovat zprávy o připojení/opuštění (netýká se pozvánek/vykopnutí/vykázání)", "Show a placeholder for removed messages": "Zobrazovat zamazání místo smazané zprávy", "Show display name changes": "Zobrazovat změny jména", @@ -1406,7 +1406,7 @@ "Order rooms in the room list by most important first instead of most recent": "Seřadit místosti v seznamu podle důležitosti místo podle posledního použití", "Scissors": "Nůžky", "Accept all %(invitedRooms)s invites": "Přijmout všechny pozvánky: %(invitedRooms)s", - "Change room avatar": "Změnit avatara místnosti", + "Change room avatar": "Změnit avatar místnosti", "Change room name": "Změnit jméno místnosti", "Change main address for the room": "Změnit hlavní adresu místnosti", "Change history visibility": "Změnit viditelnost historie", @@ -1451,7 +1451,7 @@ "Room upgrades usually only affect server-side processing of the room. If you're having problems with your Riot client, please file an issue with .": "Upgrade místnosti se většinou týká zpracování serverovem. Pokud máte problém s klientem Riot, nahlašte nám prosím chybu na GitHub: .", "Warning: Upgrading a room will not automatically migrate room members to the new version of the room. We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "Varování: Upgrade místnosti automaticky převede všechny členy na novou verzi místnosti. Do staré místnosti pošleme odkaz na novou místnost - všichni členové na něj budou muset kliknout, aby se přidali do nové místnosti.", "Please confirm that you'd like to go forward with upgrading this room from to .": "Potvrďte prosím, že chcete pokračovat a opravdu provést upgrade z verze na verzi .", - "Changes your avatar in this current room only": "Změní vaší ikonu jen v této místnosti", + "Changes your avatar in this current room only": "Změní váš avatar jen v této místnosti", "Unbans user with given ID": "Přijmout zpět uživatele s daným identifikátorem", "Adds a custom widget by URL to the room": "Přidá do místnosti vlastní widget podle adresy URL", "Please supply a https:// or http:// widget URL": "Zadejte webovou adresu widgetu (začínající na https:// nebo http://)", @@ -1602,8 +1602,8 @@ "Actions": "Akce", "Sends a message as plain text, without interpreting it as markdown": "Pošle zprávu jako prostý text, neinterpretuje jí jako Markdown", "You do not have the required permissions to use this command.": "Na provedení tohoto příkazu nemáte dostatečná oprávnění.", - "Changes the avatar of the current room": "Změní vašeho avatara pro tuto místnost", - "Changes your avatar in all rooms": "Změní vašeho avatara pro všechny místnosti", + "Changes the avatar of the current room": "Změní váš avatar pro tuto místnost", + "Changes your avatar in all rooms": "Změní váš avatar pro všechny místnosti", "Use an identity server": "Používat server identit", "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Použít server identit na odeslání emailové pozvánky. Pokračováním použijete výchozí server identit (%(defaultIdentityServerName)s) nebo ho můžete změnit v Nastavení.", "Use an identity server to invite by email. Manage in Settings.": "Použít server identit na odeslání emailové pozvánky. Můžete spravovat v Nastavení.", @@ -1834,5 +1834,147 @@ "Emoji Autocomplete": "Automatické doplňování Emodži", "Notification Autocomplete": "Automatické doplňování upozornění", "Room Autocomplete": "Automatické doplňování místností", - "User Autocomplete": "Automatické doplňování uživatelů" + "User Autocomplete": "Automatické doplňování uživatelů", + "Custom (%(level)s)": "Vlastní (%(level)s)", + "Error upgrading room": "Chyba při upgrade místnosti", + "Double check that your server supports the room version chosen and try again.": "Zkontrolujte, že váš server opravdu podporuje zvolenou verzi místnosti.", + "%(senderName)s placed a voice call.": "%(senderName)s spustil hovor.", + "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s spustil hovor. (není podporováno tímto prohlížečem)", + "%(senderName)s placed a video call.": "%(senderName)s spustil videohovor.", + "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s spustil videohovor. (není podporováno tímto prohlížečem)", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s odstranit pravidlo blokující uživatele odpovídající %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s odstranil pravidlo blokující místnosti odpovídající %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s odstranil pravidlo blokující servery odpovídající %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s odstranil blokující pravidlo %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s aktualizoval neplatné pravidlo blokování", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s vytvořil blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující uživatele odpovídající %(oldGlob)s na uživatele odpovídající %(newGlob)s z důvodu %(reason)s.", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující místnosti odpovídající %(oldGlob)s na místnosti odpovídající %(newGlob)s z důvodu %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil blokovací pravidlo odpovídající %(oldGlob)s na odpovídající %(newGlob)s z důvodu %(reason)s", + "Try out new ways to ignore people (experimental)": "Vyzkošejte nové metody ignorování lidí (experimentální)", + "Send verification requests in direct message, including a new verification UX in the member panel.": "Poslat požadavek na ověření v přímé zprávě včetně nového verifikačního rozhraní v panelu.", + "Enable local event indexing and E2EE search (requires restart)": "Povolit lokální indexování a vyhledávání v E2E šifrovaných zprávách (vyžaduje restart)", + "Match system theme": "Přizpůsobit se systémovému vzhledu", + "My Ban List": "Můj seznam zablokovaných", + "This is your list of users/servers you have blocked - don't leave the room!": "Toto je váš seznam blokovaných uživatelů/serverů - neopouštějte tuto místnost!", + "Decline (%(counter)s)": "Odmítnout (%(counter)s)", + "on device": "na zařízení", + "Connecting to integration manager...": "Připojuji se ke správci integrací...", + "Cannot connect to integration manager": "Nepovedlo se připojení ke správci integrací", + "The integration manager is offline or it cannot reach your homeserver.": "Správce integrací neběží nebo se nemůže připojit k vašemu domovskému serveru.", + "Clear notifications": "Odstranit notifikace", + "Use an Integration Manager (%(serverName)s) to manage bots, widgets, and sticker packs.": "Použít správce integrací (%(serverName)s) na správu botů, widgetů a samolepek.", + "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použít správce integrací na správu botů, widgetů a samolepek.", + "Manage integrations": "Spravovat integrace", + "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Správce integrací dostává konfigurační data a může za vás modifikovat widgety, posílat pozvánky a nastavovat úrovně oprávnění.", + "Customise your experience with experimental labs features. Learn more.": "Přizpůsobte si aplikaci s experimentálními funkcemi. Více informací.", + "Ignored/Blocked": "Ignorováno/Blokováno", + "Error adding ignored user/server": "Chyba při přidávání ignorovaného uživatele/serveru", + "Something went wrong. Please try again or view your console for hints.": "Něco se nepovedlo. Zkuste pro prosím znovu nebo se podívejte na detaily do konzole.", + "Error subscribing to list": "Nepovedlo se založit odběr", + "Please verify the room ID or alias and try again.": "Zkontrolujte prosím ID místnosti a zkuste to znovu.", + "Error removing ignored user/server": "Ignorovaný uživatel/server nejde odebrat", + "Error unsubscribing from list": "Nepovedlo se zrušit odběr", + "Please try again or view your console for hints.": "Zkuste to prosím znovu a nebo se podívejte na detailní chybu do konzole.", + "None": "Žádné", + "Ban list rules - %(roomName)s": "Pravidla blokování - %(roomName)s", + "Server rules": "Pravidla serveru", + "User rules": "Pravidla uživatele", + "You have not ignored anyone.": "Nikoho neignorujete.", + "You are currently ignoring:": "Ignorujete:", + "You are not subscribed to any lists": "Neodebíráte žádné seznamy", + "Unsubscribe": "Přestat odebírat", + "View rules": "Zobrazit pravidla", + "You are currently subscribed to:": "Odebíráte:", + "⚠ These settings are meant for advanced users.": "⚠ Tato nastavení jsou pro pokročilé uživatele.", + "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, @bot:* would ignore all users that have the name 'bot' on any server.": "Sem přidejte uživatele a servery, které chcete ignorovat. Můžete použít hvězdičku místo libovolných znaků. Například pravidlo @bot:* bude blokovat všechny uživatele se jménem 'bot' na libovolném serveru.", + "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Lidé a servery jsou blokováni pomocí seznamů obsahující pravidla koho blokovat. Odebírání blokovacího seznamu znamená, že neuvidíte uživatele a servery na něm uvedené.", + "Personal ban list": "Osobní seznam blokací", + "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Váš osobní seznam blokací obsahuje všechny uživatele a server, které nechcete vidět. Po ignorování prvního uživatele/server se vytvoří nová místnost 'Můj seznam blokací' - zůstaňte v ní aby seznam platil.", + "Server or user ID to ignore": "Server nebo ID uživatele", + "eg: @bot:* or example.org": "např.: @bot:* nebo example.org", + "Subscribed lists": "Odebírané seznamy", + "Room ID or alias of ban list": "ID místnosti nebo alias seznamu blokování", + "Subscribe": "Odebírat", + "This message cannot be decrypted": "Zprávu nelze rozšifrovat", + "Unencrypted": "Nešifrované", + " wants to chat": " chce chatovat", + "Start chatting": "Začít chatovat", + "Failed to connect to integration manager": "Nepovedlo se připojit ke správci integrací", + "Trusted": "Důvěryhodné", + "Not trusted": "Nedůvěryhodné", + "Hide verified Sign-In's": "Skrýt důvěryhodná přihlášení", + "%(count)s verified Sign-In's|other": "%(count)s důvěryhodných přihlášení", + "%(count)s verified Sign-In's|one": "1 důvěryhodné přihlášení", + "Direct message": "Přímá zpráva", + "Unverify user": "Nedůvěřovat uživateli", + "%(role)s in %(roomName)s": "%(role)s v %(roomName)s", + "Messages in this room are end-to-end encrypted.": "V této místosti jsou zprávy E2E šifrované.", + "Security": "Bezpečnost", + "Verify": "Ověřit", + "You have ignored this user, so their message is hidden. Show anyways.": "Tohoto uživatele ignorujete, takže jsou jeho/její zprávy skryté. Přesto zobrazit.", + "Reactions": "Reakce", + " reacted with %(content)s": " reagoval %(content)s", + "Any of the following data may be shared:": "Následující data můžou být sdílena:", + "Your display name": "Vaše zobrazované jméno", + "Your avatar URL": "URL vašeho avataru", + "Your user ID": "Vaše ID", + "Your theme": "Váš motiv", + "Riot URL": "URL Riotu", + "Room ID": "ID místnosti", + "Widget ID": "ID widgetu", + "Using this widget may share data with %(widgetDomain)s & your Integration Manager.": "Použití tohoto widgetu může sdílet data s %(widgetDomain)s a vaším správcem integrací.", + "Using this widget may share data with %(widgetDomain)s.": "Použití tohoto widgetu může sdílet data s %(widgetDomain)s.", + "Widgets do not use message encryption.": "Widgety nepoužívají šifrování zpráv.", + "Widget added by": "Widget přidal", + "This widget may use cookies.": "Widget může používat cookies.", + "More options": "Více možností", + "Integrations are disabled": "Integrace jsou zakázané", + "Enable 'Manage Integrations' in Settings to do this.": "Abyste mohli akci provést, povolte 'Spravovat integrace' v Nastavení.", + "Integrations not allowed": "Integrace nejsou povolené", + "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Váš Riot neumožňuje použít správce integrací. Kontaktujte prosím administrátora.", + "Automatically invite users": "Automaticky zvát uživatele", + "Upgrade private room": "Upgradovat soukromou místnost", + "Upgrade public room": "Upgradovat veřejnou místnost", + "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgradování místnosti je pokročilá operace a je doporučeno jí provést pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo zranitelnostem.", + "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please report a bug.": "Toto běžně ovlivňuje jak je místnost zpracovávána na serveru. Pokud máte problém s Riotem, nahlaste nám prosím bug.", + "You'll upgrade this room from to .": "Upgradujeme tuto místnost z na .", + "Upgrade": "Upgradovat", + "Enter secret storage passphrase": "Zadejte tajné heslo k úložišti", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Nepovedlo se přistoupit k bezpečnému úložišti. Zkontrolujte prosím, že je zadané správné heslo.", + "Warning: You should only access secret storage from a trusted computer.": "Varování: Přistupujte k bezpečnému úložišti pouze z důvěryhodných počítačů.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Pokud si nepamatujete heslo, můžete použít váš obnovovací klíč nebo si nastavte nové možnosti obnovení.", + "Enter secret storage recovery key": "Zadejte klíč k bezpečnému úložišti", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Nepovedlo se dostat k bezpečnému úložišti. Ověřte prosím, že je zadaný správný klíč.", + "If you've forgotten your recovery key you can .": "Pokud si nepamatujete obnovovací klíč, můžete si .", + "Warning: You should only set up key backup from a trusted computer.": "Varování: Nastavujte zálohu jen z důvěryhodných počítačů.", + "If you've forgotten your recovery key you can ": "Pokud si nepamatujete obnovovací klíč, můžete si ", + "Notification settings": "Nastavení notifikací", + "Reload": "Načíst znovu", + "Take picture": "Udělat fotku", + "Remove for everyone": "Odstranit pro všechny", + "Remove for me": "Odstranit pro mě", + "User Status": "Stav uživatele", + "Verification Request": "Požadavek na ověření", + " (1/%(totalCount)s)": " (1/%(totalCount)s)", + "Warning: You should only set up secret storage from a trusted computer.": "Varování: Nastavujte bezpečné úložiště pouze z důvěryhodného počítače.", + "Set up with a recovery key": "Nastavit obnovovací klíč", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv když zapomenete heslo.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Uschovejte svůj klíč na velmi bezpečném místě, například ve správci hesel (nebo v trezoru).", + "Your recovery key has been copied to your clipboard, paste it to:": "Váš obnovovací klíč byl zkopírován do schránky, vložte jej:", + "Your recovery key is in your Downloads folder.": "Váš obnovací klíč je ve složce Stažené.", + "Your access to encrypted messages is now protected.": "Přístup k šifrovaným zprávám je teď chráněn.", + "Set up secret storage": "Nastavit bezpečné úložiště", + "Secure your encrypted messages with a passphrase": "Zabezpečte vaše šifrované zprávy heslem", + "Storing secrets...": "Ukládám tajná data...", + "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště" } From 9eb9921ed0c7a0e75e3f4a6e5214f9eeb77f9d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Thu, 12 Dec 2019 12:52:18 +0000 Subject: [PATCH 023/239] Translated using Weblate (French) Currently translated at 100.0% (1983 of 1983 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 49 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index ec2a814b95..e89e6723a1 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1945,5 +1945,52 @@ "Cross-signing public keys:": "Clés publiques de signature croisée :", "on device": "sur l’appareil", "not found": "non trouvé", - "Cross-signing private keys:": "Clés privées de signature croisée :" + "Cross-signing private keys:": "Clés privées de signature croisée :", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s a supprimé la règle qui bannit les utilisateurs correspondant à %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s a supprimé la règle qui bannit les salons correspondant à %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s a supprimé la règle qui bannit les serveurs correspondant à %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s a supprimé une règle de bannissement correspondant à %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s a mis à jour une règle de bannissement non valide", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s a mis à jour la règle qui bannit les utilisateurs correspondant à %(glob)s pour %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s a supprimé la règle qui bannit les salons correspondant à %(glob)s pour %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s a supprimé la règle qui bannit les serveurs correspondant à %(glob)s pour %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s a mis à jour la règle de bannissement correspondant à %(glob)s pour %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s a créé une règle qui bannit les utilisateurs correspondant à %(glob)s pour %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s a créé une règle qui bannit les salons correspondant à %(glob)s pour %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s a créé une règle qui bannit les serveurs correspondant à %(glob)s pour %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s a créé une règle de bannissement correspondant à %(glob)s pour %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s a changé une règle qui bannit les utilisateurs correspondant à %(oldGlob)s vers une règle correspondant à %(newGlob)s pour %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s a changé une règle qui bannit les salons correspondant à %(oldGlob)s vers une règle correspondant à %(newGlob)s pour %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s a changé une règle qui bannit les serveurs correspondant à %(oldGlob)s vers une règle correspondant à %(newGlob)s pour %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s a mis à jour une règle de bannissement correspondant à %(oldGlob)s vers une règle correspondant à %(newGlob)s pour %(reason)s", + "in secret storage": "dans le coffre secret", + "Secret storage public key:": "Clé publique du coffre secret :", + "in account data": "dans les données du compte", + "Bootstrap Secure Secret Storage": "Créer le coffre secret sécurisé", + "Cross-signing": "Signature croisée", + "Enter secret storage passphrase": "Saisir la phrase de passe du coffre secret", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne phrase de passe.", + "Warning: You should only access secret storage from a trusted computer.": "Attention : Vous devriez uniquement accéder au coffre secret depuis un ordinateur de confiance.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Accédez à l’historique de vos messages sécurisés et votre identité de signature croisée pour vérifier d’autres appareils en saisissant votre phrase de passe.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Si vous avez oublié votre phrase de passe, vous pouvez utiliser votre clé de récupération ou définir de nouvelles options de récupération.", + "Enter secret storage recovery key": "Saisir la clé de récupération du coffre secret", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne clé de récupération.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Accédez à l’historique de vos messages secrets et à votre identité de signature croisée pour vérifier d’autres appareils en saisissant votre clé de récupération.", + "If you've forgotten your recovery key you can .": "Si vous avez oublié votre clé de récupération vous pouvez .", + "Warning: You should only set up key backup from a trusted computer.": "Attention : Vous devriez uniquement configurer une sauvegarde de clés depuis un ordinateur de confiance.", + "If you've forgotten your recovery key you can ": "Si vous avez oublié votre clé de récupération, vous pouvez ", + "Warning: You should only set up secret storage from a trusted computer.": "Attention : Vous devriez uniquement configurer le coffre secret depuis un ordinateur de confiance.", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Nous utiliserons le coffre secret pour conserver optionnellement une copie chiffrée de votre identité de signature croisée pour vérifier d’autres appareils et des clés de messages sur notre serveur. Protégez votre accès aux messages chiffrés avec une phrase de passe pour la sécuriser.", + "Set up with a recovery key": "Configurer avec une clé de récupération", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès aux messages chiffrés si vous oubliez votre phrase de passe.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès à vos messages chiffrés.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Conservez votre clé de récupération dans un endroit très sécurisé, comme un gestionnaire de mots de passe (ou un coffre-fort).", + "Your recovery key has been copied to your clipboard, paste it to:": "Votre clé de récupération a été copiée dans votre presse-papiers, collez-la pour :", + "Your recovery key is in your Downloads folder.": "Votre clé de récupération est dans votre dossier de Téléchargements.", + "Your access to encrypted messages is now protected.": "Votre accès aux messages chiffrés est maintenant protégé.", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Si vous ne configurez pas le coffre secret, vous ne pourrez pas récupérer l’accès à vos messages chiffrés ou à votre identité de signature croisée pour vérifier d’autres appareils si vous vous déconnectez ou si vous utilisez un autre appareil.", + "Set up secret storage": "Configurer le coffre secret", + "Secure your encrypted messages with a passphrase": "Sécuriser vos messages chiffrés avec une phrase de passe", + "Storing secrets...": "Sauvegarde des secrets…", + "Unable to set up secret storage": "Impossible de configurer le coffre secret" } From 084a6feb3b46454b3cb31ee47eab877aa57cdc34 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Wed, 11 Dec 2019 20:51:12 +0000 Subject: [PATCH 024/239] Translated using Weblate (Hungarian) Currently translated at 98.9% (1962 of 1983 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 20ed3b3892..6b59728402 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1954,5 +1954,23 @@ "Cross-signing": "Kereszt-aláírás", "Enter secret storage passphrase": "Add meg a jelmondatot a biztonsági tárolóhoz", "Unable to access secret storage. Please verify that you entered the correct passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó jelmondatot adtál-e meg.", - "Warning: You should only access secret storage from a trusted computer.": "Figyelem: Csak biztonságos eszközről férj hozzá a biztonságos tárolóhoz." + "Warning: You should only access secret storage from a trusted computer.": "Figyelem: Csak biztonságos eszközről férj hozzá a biztonságos tárolóhoz.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Ha elfelejtetted a jelmondatodat használd a visszaállítási kulcsod vagy állíts be új visszaállítási lehetőséget.", + "Enter secret storage recovery key": "Add meg a visszaállítási kulcsot a biztonsági tárolóhoz", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó visszaállítási kulcsot adtál-e meg.", + "If you've forgotten your recovery key you can .": "Ha elfelejtetted a visszaállítási kulcsot .", + "Warning: You should only set up key backup from a trusted computer.": "Figyelmeztetés: Csak biztonságos számítógépről állíts be kulcs mentést.", + "If you've forgotten your recovery key you can ": "Ha elfelejtetted a visszaállítási kulcsot ", + "Warning: You should only set up secret storage from a trusted computer.": "Figyelem: Csak biztonságos eszközről állíts be biztonságos tárolót.", + "Set up with a recovery key": "Beállítás visszaállítási kulccsal", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Mint egy biztonsági háló, ha elfelejted a jelmondatot akkor felhasználhatod ahhoz, hogy hozzáférj a titkosított üzeneteidhez.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Használhatod egy biztonsági hálóként a titkosított üzenetekhez való hozzáférés visszaállításához.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókezelő (vagy széf).", + "Your recovery key has been copied to your clipboard, paste it to:": "A visszaállítási kulcsod a vágólapra lett másolva, illeszd be ide:", + "Your recovery key is in your Downloads folder.": "A visszaállítási kulcsod a Letöltések mappában van.", + "Your access to encrypted messages is now protected.": "A titkosított üzenetekhez való hozzáférésed védve van.", + "Set up secret storage": "Biztonságos tároló beállítása", + "Secure your encrypted messages with a passphrase": "Biztosítsd a titkosított üzeneteidet jelmondattal", + "Storing secrets...": "Titkok tárolása...", + "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani" } From aa92327165e93988a8be572ba281788c082d9c47 Mon Sep 17 00:00:00 2001 From: random Date: Thu, 12 Dec 2019 11:00:31 +0000 Subject: [PATCH 025/239] Translated using Weblate (Italian) Currently translated at 98.8% (1960 of 1983 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index d6761f91d7..67703edc93 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1938,5 +1938,36 @@ "You'll upgrade this room from to .": "Aggiornerai questa stanza dalla alla .", "Upgrade": "Aggiorna", "Notification settings": "Impostazioni di notifica", - "User Status": "Stato utente" + "User Status": "Stato utente", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s ha rimosso la regola che bandisce utenti corrispondenti a %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s ha rimosso la regola che bandisce stanze corrispondenti a %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s ha rimosso la regola che bandisce server corrispondenti a %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s ha rimosso una regola di ban corrispondente a %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s ha aggiornato una regola di ban non valida", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s ha aggiornato la regola che bandisce utenti corrispondenti a %(glob)s perchè %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s ha aggiornato la regola che bandisce stanze corrispondenti a %(glob)s perchè %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s ha aggiornato la regola che bandisce server corrispondenti a %(glob)s perchè %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s ha aggiornato una regola di ban corrispondente a %(glob)s perchè %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s ha creato una regola che bandisce utenti corrispondenti a %(glob)s perchè %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s ha creato una regola che bandisce stanze corrispondenti a %(glob)s perchè %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s ha creato una regola che bandisce server corrispondenti a %(glob)s perchè %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s ha creato una regola di ban corrispondente a %(glob)s perchè %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola che bandiva utenti corrispondenti a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola che bandiva stanze corrispondenti a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola che bandiva server corrispondenti a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola di ban che corrispondeva a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s", + "Send cross-signing keys to homeserver": "Invia chiavi di firma incrociata all'homeserver", + "Cross-signing public keys:": "Chiavi pubbliche di firma incrociata:", + "on device": "sul dispositivo", + "not found": "non trovato", + "Cross-signing private keys:": "Chiavi private di firma incrociata:", + "in secret storage": "in un archivio segreto", + "Secret storage public key:": "Chiave pubblica dell'archivio segreto:", + "in account data": "nei dati dell'account", + "Cross-signing": "Firma incrociata", + " wants to chat": " vuole chattare", + "Start chatting": "Inizia a chattare", + "Enter secret storage passphrase": "Inserisci la password dell'archivio segreto", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la password corretta.", + "Warning: You should only access secret storage from a trusted computer.": "Attenzione: dovresti accedere all'archivio segreto solo da un computer fidato." } From 3ac0deebabd957629ee10a8282a20cd476a75a49 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 13 Dec 2019 13:55:26 +0000 Subject: [PATCH 026/239] Use static modals for verification Verification with cross-signing may requiring asking for your secret storage passphrase, which is displayed in it's own modal on top of flows. For now while verification takes in modals also, mark the verification ones as static so they don't lose state when secret storage appears on top mid-flow. --- src/components/structures/MatrixChat.js | 2 +- src/components/views/dialogs/KeyShareDialog.js | 2 +- src/components/views/elements/DeviceVerifyButtons.js | 2 +- src/components/views/messages/MKeyVerificationRequest.js | 2 +- src/components/views/right_panel/UserInfo.js | 2 +- src/components/views/toasts/VerificationRequestToast.js | 4 +++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 8105805ab0..82a682f9ab 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1492,7 +1492,7 @@ export default createReactClass({ const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog"); Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, { verifier, - }); + }, null, /* priority = */ false, /* static = */ true); }); } // Fire the tinter right on startup to ensure the default theme is applied diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js index 01e3479bb1..ba8918e79c 100644 --- a/src/components/views/dialogs/KeyShareDialog.js +++ b/src/components/views/dialogs/KeyShareDialog.js @@ -99,7 +99,7 @@ export default createReactClass({ this.props.onFinished(true); } }, - }); + }, null, /* priority = */ false, /* static = */ true); }, _onShareClicked: function() { diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js index 15678b7d7a..bb08f8b234 100644 --- a/src/components/views/elements/DeviceVerifyButtons.js +++ b/src/components/views/elements/DeviceVerifyButtons.js @@ -59,7 +59,7 @@ export default createReactClass({ Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, { userId: this.props.userId, device: this.state.device, - }); + }, null, /* priority = */ false, /* static = */ true); }, onUnverifyClick: function() { diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js index b2a1724fc6..4faa1b20aa 100644 --- a/src/components/views/messages/MKeyVerificationRequest.js +++ b/src/components/views/messages/MKeyVerificationRequest.js @@ -52,7 +52,7 @@ export default class MKeyVerificationRequest extends React.Component { const verifier = MatrixClientPeg.get().acceptVerificationDM(this.props.mxEvent, verificationMethods.SAS); Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, { verifier, - }); + }, null, /* priority = */ false, /* static = */ true); }; _onRejectClicked = () => { diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index af8b4616f8..ae29021e08 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -114,7 +114,7 @@ function verifyDevice(userId, device) { Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, { userId: userId, device: device, - }); + }, null, /* priority = */ false, /* static = */ true); } function DeviceItem({userId, device}) { diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js index 89af91c41f..7e043f4d83 100644 --- a/src/components/views/toasts/VerificationRequestToast.js +++ b/src/components/views/toasts/VerificationRequestToast.js @@ -90,7 +90,9 @@ export default class VerificationRequestToast extends React.PureComponent { const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS); const IncomingSasDialog = sdk.getComponent('views.dialogs.IncomingSasDialog'); - Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {verifier}); + Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, { + verifier, + }, null, /* priority = */ false, /* static = */ true); }; render() { From 17a42cd2874849cecb43483304d9435de45220cf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 13 Dec 2019 14:02:50 +0000 Subject: [PATCH 027/239] Make LInkPreviewWidget close button Keyboard & SR Accessible --- res/css/views/rooms/_LinkPreviewWidget.scss | 12 +++++++++--- src/components/views/rooms/LinkPreviewWidget.js | 10 +++++++--- src/i18n/strings/en_EN.json | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/res/css/views/rooms/_LinkPreviewWidget.scss b/res/css/views/rooms/_LinkPreviewWidget.scss index 4495b142e6..022cf3ed28 100644 --- a/res/css/views/rooms/_LinkPreviewWidget.scss +++ b/res/css/views/rooms/_LinkPreviewWidget.scss @@ -52,12 +52,18 @@ limitations under the License. } .mx_LinkPreviewWidget_cancel { - visibility: hidden; cursor: pointer; - flex: 0 0 40px; + width: 18px; + height: 18px; + + img { + flex: 0 0 40px; + visibility: hidden; + } } -.mx_LinkPreviewWidget:hover .mx_LinkPreviewWidget_cancel { +.mx_LinkPreviewWidget:hover .mx_LinkPreviewWidget_cancel img, +.mx_LinkPreviewWidget_cancel.focus-visible:focus img { visibility: visible; } diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js index 2e3a3915d0..ee63cd1bb7 100644 --- a/src/components/views/rooms/LinkPreviewWidget.js +++ b/src/components/views/rooms/LinkPreviewWidget.js @@ -1,5 +1,6 @@ /* Copyright 2016 OpenMarket 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. @@ -19,6 +20,7 @@ import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; import { linkifyElement } from '../../../HtmlUtils'; import SettingsStore from "../../../settings/SettingsStore"; +import { _t } from "../../../languageHandler"; const sdk = require('../../../index'); const MatrixClientPeg = require('../../../MatrixClientPeg'); @@ -125,6 +127,7 @@ module.exports = createReactClass({
    ; } + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); return (
    { img } @@ -135,9 +138,10 @@ module.exports = createReactClass({ { p["og:description"] }
    - + + +
    ); }, diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 80604e9090..361319bb6c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -876,6 +876,7 @@ "Unencrypted": "Unencrypted", "Please select the destination room for this message": "Please select the destination room for this message", "Scroll to bottom of page": "Scroll to bottom of page", + "Close preview": "Close preview", "device id: ": "device id: ", "Disinvite": "Disinvite", "Kick": "Kick", From 9d0bf13ca0c3558ab09d3711a64b4539d40ec0d0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 13 Dec 2019 14:18:41 +0000 Subject: [PATCH 028/239] Fix ToggleSwitch A11Y (trapping tab and switch v. checkbox) --- src/components/views/elements/ToggleSwitch.js | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/components/views/elements/ToggleSwitch.js b/src/components/views/elements/ToggleSwitch.js index 5de249f214..b067840792 100644 --- a/src/components/views/elements/ToggleSwitch.js +++ b/src/components/views/elements/ToggleSwitch.js @@ -19,46 +19,32 @@ import React from "react"; import PropTypes from "prop-types"; import classNames from "classnames"; -import {KeyCode} from "../../../Keyboard"; +import sdk from "../../../index"; -// Controlled Toggle Switch element +// Controlled Toggle Switch element, written with Accessibility in mind const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => { const _onClick = (e) => { - e.stopPropagation(); - e.preventDefault(); if (disabled) return; - onChange(!checked); }; - const _onKeyDown = (e) => { - e.stopPropagation(); - e.preventDefault(); - if (disabled) return; - - if (e.keyCode === KeyCode.ENTER || e.keyCode === KeyCode.SPACE) { - onChange(!checked); - } - }; - const classes = classNames({ "mx_ToggleSwitch": true, "mx_ToggleSwitch_on": checked, "mx_ToggleSwitch_enabled": !disabled, }); + const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); return ( -
    -
    + ); }; From 0bc02564bc046f8f929622a4e6f530bcac1215bb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 13 Dec 2019 14:31:34 +0000 Subject: [PATCH 029/239] Improve a11y of the unignore button in Settings --- .../views/settings/tabs/user/SecurityUserSettingsTab.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js index 98ec18df5a..8f4e909d9d 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js @@ -37,12 +37,13 @@ export class IgnoredUser extends React.Component { }; render() { + const id = `mx_SecurityUserSettingsTab_ignoredUser_${this.props.userId}`; return (
    - - {_t('Unignore')} + + { _t('Unignore') } - {this.props.userId} + { this.props.userId }
    ); } From 5eec97830ffbe7c252bae9bd3036c816600ba082 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Fri, 13 Dec 2019 02:35:13 +0000 Subject: [PATCH 030/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1993 of 1993 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 43 ++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index c36eda6e6d..56b2c05d75 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1946,7 +1946,7 @@ "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 伺服器的規則", "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s 移除了封鎖符合 %(glob)s 的規則", "%(senderName)s updated an invalid ban rule": "%(senderName)s 更新無效的封鎖的規則", - "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 使用者的規則，因為", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 使用者的規則，因為 %(reason)s", "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 聊天室的規則，因為 %(reason)s", "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 伺服器的規則，因為 %(reason)s", "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 更新了封鎖符合 %(glob)s 的規則，因為 %(reason)s", @@ -1954,7 +1954,7 @@ "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 聊天室的規則，因為 %(reason)s", "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 伺服器的規則，因為 %(reason)s", "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 建立了封鎖符合 %(glob)s 的規則，因為 %(reason)s", - "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 使用者的規則變更為 ，因為 %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 使用者的規則變更為 %(newGlob)s，因為 %(reason)s", "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 聊天室的規則變更為 %(newGlob)s，因為 %(reason)s", "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 伺服器的規則變更為 %(newGlob)s，因為 %(reason)s", "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 的規則更新為 %(newGlob)s，因為 %(reason)s", @@ -1970,5 +1970,42 @@ "Cross-signing": "交叉簽章", "Enter secret storage passphrase": "輸入秘密儲存空間密碼", "Unable to access secret storage. Please verify that you entered the correct passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的密碼。", - "Warning: You should only access secret storage from a trusted computer.": "警告：您應該僅從信任的電腦存取秘密儲存空間。" + "Warning: You should only access secret storage from a trusted computer.": "警告：您應該僅從信任的電腦存取秘密儲存空間。", + "Cross-signing and secret storage are enabled.": "已啟用交叉簽章與秘密儲存空間。", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "您的帳號在秘密儲存空間中有交叉簽章的身份，但尚未被此裝置信任。", + "Cross-signing and secret storage are not yet set up.": "尚未設定交叉簽章與秘密儲存空間。", + "Bootstrap cross-signing and secret storage": "啟動交叉簽章與秘密儲存空間", + "not stored": "未儲存", + "Backup has a valid signature from this user": "備份有從此使用者而來的有效簽章", + "Backup has a invalid signature from this user": "備份有從此使用者而來的無效簽章", + "Backup has a signature from unknown user with ID %(deviceId)s": "備份有從未知的使用者而來，ID 為 %(deviceId)s 的簽章", + "Backup has a signature from unknown device with ID %(deviceId)s": "備份有從未知的裝置而來，ID 為 %(deviceId)s 的簽章", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "備份金鑰儲存於秘密儲存空間中，但此功能未在此裝置上啟用。請在實驗室中啟用交叉簽章以修改金鑰備份狀態。", + "Backup key stored: ": "備份金鑰已儲存： ", + "Start using Key Backup with Secure Secret Storage": "開始將金鑰備份與安全秘密儲存空間一起使用", + "Hide verified sessions": "隱藏已驗證的工作階段", + "%(count)s verified sessions|other": "%(count)s 個已驗證的工作階段", + "%(count)s verified sessions|one": "1 個已驗證的工作階段", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "透過輸入您的密碼來存取您的安全訊息歷史與您的交叉簽章身份並驗證其他裝置。", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "如果您忘記您的密碼，您可以使用您的復原金鑰或設定新的復原選項。", + "Enter secret storage recovery key": "輸入秘密儲存空間復原金鑰", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的復原金鑰。", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "透過輸入您的復原金鑰來存取您的安全訊息歷史與您的交叉簽章身份並驗證其他裝置。", + "If you've forgotten your recovery key you can .": "如果您忘記您的復原金鑰，您可以。", + "Warning: You should only set up key backup from a trusted computer.": "警告：您應該只從信任的電腦設定金鑰備份。", + "If you've forgotten your recovery key you can ": "如果您忘記您的復原金鑰，您可以", + "Warning: You should only set up secret storage from a trusted computer.": "警告：您應該只從信任的電腦設定秘密儲存空間。", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "我們將會使用秘密儲存空間來選擇性儲存您用來驗證其他裝置與訊息金鑰的交叉簽章加密副本在我們的伺服器上。使用密碼來保護您對加密訊息的存取權以使其更安全。", + "Set up with a recovery key": "設定復原金鑰", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "作為安全網，如果您忘記您的密碼的話，您可以使用它來恢復您對加密訊息的存取。", + "As a safety net, you can use it to restore your access to encrypted messages.": "作為安全網，您可以使用它來恢復您對加密訊息的存取。", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "將您的復原金鑰保留在某個非常安全的地方，如密碼管理員（或保險櫃）中。", + "Your recovery key has been copied to your clipboard, paste it to:": "您的復原金鑰已被複製到您的剪貼簿，請將其貼到：", + "Your recovery key is in your Downloads folder.": "您的復原金鑰在您的下載資料夾中。", + "Your access to encrypted messages is now protected.": "您對加密訊息的存取權已被保護。", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "沒有設定秘密儲存空間，您將無法恢復您的加密訊息的存取權，或是您在登出或使用其他裝置時，用以驗證其他裝置的交叉簽章身份。", + "Set up secret storage": "設定秘密儲存空間", + "Secure your encrypted messages with a passphrase": "使用密碼保護您的加密訊息", + "Storing secrets...": "正在儲存秘密……", + "Unable to set up secret storage": "無法設定秘密儲存空間" } From f0147f5517a04d4f326720cbb2b06977c7b3317c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Fri, 13 Dec 2019 09:21:44 +0000 Subject: [PATCH 031/239] Translated using Weblate (French) Currently translated at 100.0% (1993 of 1993 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index e89e6723a1..21ca482164 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -122,7 +122,7 @@ "%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.", "Kick": "Expulser", "Kicks user with given id": "Expulse l'utilisateur à partir de son identifiant", - "Labs": "Laboratoire", + "Labs": "Labo", "Leave room": "Quitter le salon", "%(targetName)s left the room.": "%(targetName)s a quitté le salon.", "Local addresses for this room:": "Adresses locales pour ce salon :", @@ -1992,5 +1992,20 @@ "Set up secret storage": "Configurer le coffre secret", "Secure your encrypted messages with a passphrase": "Sécuriser vos messages chiffrés avec une phrase de passe", "Storing secrets...": "Sauvegarde des secrets…", - "Unable to set up secret storage": "Impossible de configurer le coffre secret" + "Unable to set up secret storage": "Impossible de configurer le coffre secret", + "Cross-signing and secret storage are enabled.": "La signature croisée et le coffre secret sont activés.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Votre compte a une identité de signature croisée dans le coffre secret, mais cet appareil ne lui fait pas encore confiance.", + "Cross-signing and secret storage are not yet set up.": "La signature croisée et le coffre secret ne sont pas encore configurés.", + "Bootstrap cross-signing and secret storage": "Initialiser la signature croisée et le coffre secret", + "not stored": "non sauvegardé", + "Backup has a valid signature from this user": "La sauvegarde a une signature valide de cet utilisateur", + "Backup has a invalid signature from this user": "La sauvegarde a une signature non valide de cet utilisateur", + "Backup has a signature from unknown user with ID %(deviceId)s": "La sauvegarde a une signature de l’utilisateur inconnu ayant pour identifiant %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "La sauvegarde a une signature de l’appareil inconnu ayant pour identifiant %(deviceId)s", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "La clé de sauvegarde est stockée dans le coffre secret, mais cette fonctionnalité n’est pas activée sur cet appareil. Activez la signature croisée dans le Labo pour modifier l’état de la sauvegarde de clé.", + "Backup key stored: ": "Clé de sauvegarde stockée : ", + "Start using Key Backup with Secure Secret Storage": "Commencer à utiliser la sauvegarde de clés avec le coffre secret sécurisé", + "Hide verified sessions": "Masquer les sessions vérifiées", + "%(count)s verified sessions|other": "%(count)s sessions vérifiées", + "%(count)s verified sessions|one": "1 session vérifiée" } From d4c6b0cb9b8df9ca0b97cde3b8eafd182c483227 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Thu, 12 Dec 2019 20:57:39 +0000 Subject: [PATCH 032/239] Translated using Weblate (Hungarian) Currently translated at 99.7% (1988 of 1993 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 6b59728402..50a19566b0 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1972,5 +1972,36 @@ "Set up secret storage": "Biztonságos tároló beállítása", "Secure your encrypted messages with a passphrase": "Biztosítsd a titkosított üzeneteidet jelmondattal", "Storing secrets...": "Titkok tárolása...", - "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani" + "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szobák voltak kitiltva: %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szerverek voltak kitiltva: %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s törölte ezt a kitiltó szabályt: %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s frissített egy érvénytelen kitiltó szabályt", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s frissítette azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s ezért: %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s frissítette azt a szabályt amivel ilyen szobák voltak kitiltva: %(glob)s ezért: %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s frissítette azt a szabályt amivel ilyen szerverek voltak kitiltva: %(glob)s ezért: %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s frissítette ezt a kitiltó szabályt: %(glob)s ezért: %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s hozzáadta azt a szabályt amivel ilyen felhasználók lesznek kitiltva: %(glob)s ezért: %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s hozzáadta azt a szabályt amivel ilyen szobák lesznek kitiltva: %(glob)s ezért: %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s hozzáadta azt a szabályt amivel ilyen szerverek lesznek kitiltva: %(glob)s ezért: %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s hozzáadta ezt a kitiltó szabályt: %(glob)s ezért: %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel felhasználók voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szobák voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szerverek voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a kitiltó szabályt erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s", + "Cross-signing and secret storage are enabled.": "Kereszt-aláírás és a biztonsági tároló engedélyezve van.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "A fiókod a biztonsági tárolóban tartalmaz egy személyazonosságot a kereszt-aláíráshoz de egyenlőre nincs megbízhatónak jelölve ezen az eszközön.", + "Cross-signing and secret storage are not yet set up.": "Kereszt-aláírás és a biztonsági tároló egyenlőre nincs beállítva.", + "Bootstrap cross-signing and secret storage": "Kereszt-aláírás és biztonsági tároló beállítása", + "not stored": "nincs mentve", + "Backup has a valid signature from this user": "A mentés érvényes aláírást tartalmaz a felhasználótól", + "Backup has a invalid signature from this user": "A mentés érvénytelen aláírást tartalmaz a felhasználótól", + "Backup has a signature from unknown user with ID %(deviceId)s": "A mentésnek ismeretlen felhasználótól származó aláírása van ezzel az azonosítóval: %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "A mentésnek ismeretlen eszköztől származó aláírása van ezzel az azonosítóval: %(deviceId)s", + "Backup key stored: ": "Visszaállítási kulcs tárolva: ", + "Start using Key Backup with Secure Secret Storage": "Kulcs Mentés és Biztonsági Titok Tároló használatának megkezdése", + "Hide verified sessions": "Ellenőrzött munkamenetek eltakarása", + "%(count)s verified sessions|other": "%(count)s ellenőrzött munkamenet", + "%(count)s verified sessions|one": "1 ellenőrzött munkamenet" } From 71a5cf6616a67bf2f0a6428578b2e2f835754d31 Mon Sep 17 00:00:00 2001 From: random Date: Fri, 13 Dec 2019 11:49:50 +0000 Subject: [PATCH 033/239] Translated using Weblate (Italian) Currently translated at 99.9% (1992 of 1993 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 67703edc93..2993fadf29 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -858,7 +858,7 @@ "All messages": "Tutti i messaggi", "Call invitation": "Invito ad una chiamata", "Downloading update...": "Scaricamento aggiornamento...", - "State Key": "Chiave dello Stato", + "State Key": "Chiave dello stato", "Failed to send custom event.": "Impossibile inviare evento personalizzato.", "What's new?": "Cosa c'è di nuovo?", "Notify me for anything else": "Notificami per qualsiasi altra cosa", @@ -1969,5 +1969,41 @@ "Start chatting": "Inizia a chattare", "Enter secret storage passphrase": "Inserisci la password dell'archivio segreto", "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la password corretta.", - "Warning: You should only access secret storage from a trusted computer.": "Attenzione: dovresti accedere all'archivio segreto solo da un computer fidato." + "Warning: You should only access secret storage from a trusted computer.": "Attenzione: dovresti accedere all'archivio segreto solo da un computer fidato.", + "Cross-signing and secret storage are enabled.": "La firma incrociata e l'archivio segreto sono attivi.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Il tuo account ha un'identità a firma incrociata in archivio segreto, ma non è ancora fidata da questo dispositivo.", + "Cross-signing and secret storage are not yet set up.": "La firma incrociata e l'archivio segreto non sono ancora impostati.", + "not stored": "non salvato", + "Backup has a valid signature from this user": "Il backup ha una firma valida da questo utente", + "Backup has a invalid signature from this user": "Il backup ha una firma non valida da questo utente", + "Backup has a signature from unknown user with ID %(deviceId)s": "Il backup ha una firma dall'utente sconosciuto con ID %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "Il backup ha una firma dal dispositivo sconosciuto con ID %(deviceId)s", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Backup chiavi presente nell'archivio segreto, ma questa funzione non è attiva sul dispositivo. Attiva la firma incrociata in Labs per modificare lo stato del backup.", + "Backup key stored: ": "Backup chiavi salvato: ", + "Start using Key Backup with Secure Secret Storage": "Inizia ad usare il Backup Chiavi con l'Archivio Segreto", + "Hide verified sessions": "Nascondi sessioni verificate", + "%(count)s verified sessions|other": "%(count)s sessioni verificate", + "%(count)s verified sessions|one": "1 sessione verificata", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Accedi alla cronologia sicura dei tuoi messaggi e all'identità a firma incrociata per verificare altri dispositivi inserendo la tua password.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Se hai dimenticato la password puoi usare la tua chiave di recupero o impostare nuove opzioni di recupero.", + "Enter secret storage recovery key": "Inserisci la chiave di recupero dell'archivio segreto", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la chiave di recupero corretta.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Accedi alla cronologia sicura dei tuoi messaggi e all'identità a firma incrociata per verificare altri dispositivi inserendo la tua chiave di recupero.", + "If you've forgotten your recovery key you can .": "Se hai dimenticato la tua chiave di recupero puoi .", + "Warning: You should only set up key backup from a trusted computer.": "Attenzione: dovresti impostare il backup chiavi solo da un computer fidato.", + "If you've forgotten your recovery key you can ": "Se hai dimenticato la tua chiave di recupero puoi ", + "Warning: You should only set up secret storage from a trusted computer.": "Attenzione: dovresti impostare l'archivio segreto solo da un computer fidato.", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Utilizzeremo l'archivio segreto per memorizzare facoltativamente una copia criptata della tua identità a firma incrociata per verificare altri dispositivi e chiavi dei messaggi sul nostro server. Proteggi il tuo accesso ai messaggi cifrati con una password per tenerlo al sicuro.", + "Set up with a recovery key": "Imposta con una chiave di recupero", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Come àncora di salvezza, puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la password.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Come àncora di salvezza, puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Tieni la chiave di recupero in un posto molto sicuro, come un gestore di password (o una cassaforte).", + "Your recovery key has been copied to your clipboard, paste it to:": "La tua chiave di recupero è stata copiata negli appunti, incollala in:", + "Your recovery key is in your Downloads folder.": "La chiave di recupero è nella tua cartella Scaricati.", + "Your access to encrypted messages is now protected.": "L'accesso ai tuoi messaggi cifrati è ora protetto.", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Senza l'impostazione dell'archivio segreto, non sarà possibile recuperare l'accesso ai messaggi cifrati o l'identità a firma incrociata per verificare altri dispositivi se ti disconnetti o utilizzi un altro dispositivo.", + "Set up secret storage": "Imposta l'archivio segreto", + "Secure your encrypted messages with a passphrase": "Proteggi i tuoi messaggi cifrati con una password", + "Storing secrets...": "Memorizzo i segreti...", + "Unable to set up secret storage": "Impossibile impostare un archivio segreto" } From 2df72bfde2570e42d9960fa76dadd3a0d1450157 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 13 Dec 2019 17:57:26 +0000 Subject: [PATCH 034/239] Update room / user decoration for cross-signing --- res/css/views/rooms/_E2EIcon.scss | 16 ++++-- src/components/structures/RoomView.js | 41 ++++++++++++--- src/components/views/right_panel/UserInfo.js | 20 ++++++-- src/components/views/rooms/E2EIcon.js | 54 +++++++++++++++++--- src/i18n/strings/en_EN.json | 7 ++- 5 files changed, 114 insertions(+), 24 deletions(-) diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss index cb99aa63f1..584ea17433 100644 --- a/res/css/views/rooms/_E2EIcon.scss +++ b/res/css/views/rooms/_E2EIcon.scss @@ -22,7 +22,9 @@ limitations under the License. display: block; } -.mx_E2EIcon_verified::after, .mx_E2EIcon_warning::after { +.mx_E2EIcon_warning::after, +.mx_E2EIcon_normal::after, +.mx_E2EIcon_verified::after { content: ""; display: block; position: absolute; @@ -34,10 +36,14 @@ limitations under the License. background-size: contain; } -.mx_E2EIcon_verified::after { - background-image: url('$(res)/img/e2e/verified.svg'); -} - .mx_E2EIcon_warning::after { background-image: url('$(res)/img/e2e/warning.svg'); } + +.mx_E2EIcon_normal::after { + background-image: url('$(res)/img/e2e/normal.svg'); +} + +.mx_E2EIcon_verified::after { + background-image: url('$(res)/img/e2e/verified.svg'); +} diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index d78c9923c2..8c05acf60a 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -792,11 +792,12 @@ module.exports = createReactClass({ this._updateE2EStatus(room); }, - _updateE2EStatus: function(room) { - if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) { + _updateE2EStatus: async function(room) { + const cli = MatrixClientPeg.get(); + if (!cli.isRoomEncrypted(room.roomId)) { return; } - if (!MatrixClientPeg.get().isCryptoEnabled()) { + if (!cli.isCryptoEnabled()) { // If crypto is not currently enabled, we aren't tracking devices at all, // so we don't know what the answer is. Let's error on the safe side and show // a warning for this case. @@ -805,10 +806,38 @@ module.exports = createReactClass({ }); return; } - room.hasUnverifiedDevices().then((hasUnverifiedDevices) => { - this.setState({ - e2eStatus: hasUnverifiedDevices ? "warning" : "verified", + if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) { + room.hasUnverifiedDevices().then((hasUnverifiedDevices) => { + this.setState({ + e2eStatus: hasUnverifiedDevices ? "warning" : "verified", + }); }); + return; + } + const e2eMembers = await room.getEncryptionTargetMembers(); + for (const member of e2eMembers) { + const { userId } = member; + const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified(); + if (!userVerified) { + this.setState({ + e2eStatus: "warning", + }); + return; + } + const devices = await cli.getStoredDevicesForUser(userId); + const allDevicesVerified = devices.every(device => { + const { deviceId } = device; + return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified(); + }); + if (!allDevicesVerified) { + this.setState({ + e2eStatus: "warning", + }); + return; + } + } + this.setState({ + e2eStatus: "verified", }); }, diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index ae29021e08..90bb3f3dcb 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -58,9 +58,20 @@ const _disambiguateDevices = (devices) => { } }; -const _getE2EStatus = (devices) => { - const hasUnverifiedDevice = devices.some((device) => device.isUnverified()); - return hasUnverifiedDevice ? "warning" : "verified"; +const _getE2EStatus = (cli, userId, devices) => { + if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) { + const hasUnverifiedDevice = devices.some((device) => device.isUnverified()); + return hasUnverifiedDevice ? "warning" : "verified"; + } + const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified(); + const allDevicesVerified = devices.every(device => { + const { deviceId } = device; + return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified(); + }); + if (allDevicesVerified) { + return userVerified ? "verified" : "normal"; + } + return "warning"; }; async function unverifyUser(matrixClient, userId) { @@ -1264,7 +1275,8 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room let e2eIcon; if (isRoomEncrypted && devices) { - e2eIcon = ; + const e2eStatus = _getE2EStatus(cli, user.userId, devices); + e2eIcon = ; } return ( diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js index d6baa30c8e..545d1fd7ed 100644 --- a/src/components/views/rooms/E2EIcon.js +++ b/src/components/views/rooms/E2EIcon.js @@ -17,24 +17,62 @@ limitations under the License. import classNames from 'classnames'; import { _t } from '../../../languageHandler'; import AccessibleButton from '../elements/AccessibleButton'; +import SettingsStore from '../../../settings/SettingsStore'; export default function(props) { + const { isUser } = props; + const isNormal = props.status === "normal"; const isWarning = props.status === "warning"; const isVerified = props.status === "verified"; const e2eIconClasses = classNames({ mx_E2EIcon: true, mx_E2EIcon_warning: isWarning, + mx_E2EIcon_normal: isNormal, mx_E2EIcon_verified: isVerified, }, props.className); let e2eTitle; - if (isWarning) { - e2eTitle = props.isUser ? - _t("Some devices for this user are not trusted") : - _t("Some devices in this encrypted room are not trusted"); - } else if (isVerified) { - e2eTitle = props.isUser ? - _t("All devices for this user are trusted") : - _t("All devices in this encrypted room are trusted"); + + const crossSigning = SettingsStore.isFeatureEnabled("feature_cross_signing"); + if (crossSigning && isUser) { + if (isWarning) { + e2eTitle = _t( + "This user has not verified all of their devices.", + ); + } else if (isNormal) { + e2eTitle = _t( + "You have not verified this user. " + + "This user has verified all of their devices.", + ); + } else if (isVerified) { + e2eTitle = _t( + "You have verified this user. " + + "This user has verified all of their devices.", + ); + } + } else if (crossSigning && !isUser) { + if (isWarning) { + e2eTitle = _t( + "Some users in this encrypted room are not verified by you or " + + "they have not verified their own devices.", + ); + } else if (isVerified) { + e2eTitle = _t( + "All users in this encrypted room are verified by you and " + + "they have verified their own devices.", + ); + } + } else if (!crossSigning && isUser) { + if (isWarning) { + e2eTitle = _t("Some devices for this user are not trusted"); + } else if (isVerified) { + e2eTitle = _t("All devices for this user are trusted"); + } + } else if (!crossSigning && !isUser) { + if (isWarning) { + e2eTitle = _t("Some devices in this encrypted room are not trusted"); + } else if (isVerified) { + e2eTitle = _t("All devices in this encrypted room are trusted"); + } } let style = null; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 80604e9090..f801c3a5c5 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -857,9 +857,14 @@ " (unsupported)": " (unsupported)", "Join as voice or video.": "Join as voice or video.", "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.", + "This user has not verified all of their devices.": "This user has not verified all of their devices.", + "You have not verified this user. This user has verified all of their devices.": "You have not verified this user. This user has verified all of their devices.", + "You have verified this user. This user has verified all of their devices.": "You have verified this user. This user has verified all of their devices.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Some users in this encrypted room are not verified by you or they have not verified their own devices.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "All users in this encrypted room are verified by you and they have verified their own devices.", "Some devices for this user are not trusted": "Some devices for this user are not trusted", - "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted", "All devices for this user are trusted": "All devices for this user are trusted", + "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted", "All devices in this encrypted room are trusted": "All devices in this encrypted room are trusted", "Edit message": "Edit message", "This event could not be displayed": "This event could not be displayed", From 5f8647ab8a952876c389a667db22c1ea9a18e8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Sat, 14 Dec 2019 08:23:04 +0000 Subject: [PATCH 035/239] Translated using Weblate (French) Currently translated at 100.0% (1994 of 1994 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 21ca482164..f4e2a86e77 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2007,5 +2007,6 @@ "Start using Key Backup with Secure Secret Storage": "Commencer à utiliser la sauvegarde de clés avec le coffre secret sécurisé", "Hide verified sessions": "Masquer les sessions vérifiées", "%(count)s verified sessions|other": "%(count)s sessions vérifiées", - "%(count)s verified sessions|one": "1 session vérifiée" + "%(count)s verified sessions|one": "1 session vérifiée", + "Close preview": "Fermer l’aperçu" } From ad6329a0b01e985b5197a58ed0bf5989d564456e Mon Sep 17 00:00:00 2001 From: Szimszon Date: Fri, 13 Dec 2019 21:00:52 +0000 Subject: [PATCH 036/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (1994 of 1994 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 50a19566b0..0b094d86af 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2003,5 +2003,11 @@ "Start using Key Backup with Secure Secret Storage": "Kulcs Mentés és Biztonsági Titok Tároló használatának megkezdése", "Hide verified sessions": "Ellenőrzött munkamenetek eltakarása", "%(count)s verified sessions|other": "%(count)s ellenőrzött munkamenet", - "%(count)s verified sessions|one": "1 ellenőrzött munkamenet" + "%(count)s verified sessions|one": "1 ellenőrzött munkamenet", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Visszaállítási kulcs a biztonsági tárolóban van elmentve, de ezen az eszközön ez a lehetőség nincs engedélyezve. Engedélyezd a kulcs mentés állapotának módosításához a kereszt-aláírást a Laborban.", + "Close preview": "Előnézet bezárása", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "A jelmondat megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "A visszaállítási kulcs megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Biztonsági tárolót fogunk használni, hogy tárolhassuk a kereszt-aláíráshoz tartozó azonosítót titkosított formában, amivel más eszközöket és üzenet kulcsokat lehet ellenőrizni. Védd a titkosított üzenetekhez való hozzáférést jelmondattal és azt tartsd titokban.", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "A biztonsági tároló beállítása nélkül ha kijelentkezel és egy másik eszközön lépsz be nem fogsz hozzáférni a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz." } From f67eedf8439591531273ad3165d513cdeed0206a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 15 Dec 2019 14:24:56 +0000 Subject: [PATCH 037/239] Fix keyboard handling including scroll into view, add aria roles --- src/components/views/elements/Dropdown.js | 95 ++++++++++++++++------- 1 file changed, 68 insertions(+), 27 deletions(-) diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js index 4c5e14b3ba..65be56f1f5 100644 --- a/src/components/views/elements/Dropdown.js +++ b/src/components/views/elements/Dropdown.js @@ -20,6 +20,7 @@ import PropTypes from 'prop-types'; import classnames from 'classnames'; import AccessibleButton from './AccessibleButton'; import { _t } from '../../../languageHandler'; +import {Key} from "../../../Keyboard"; class MenuOption extends React.Component { constructor(props) { @@ -48,9 +49,13 @@ class MenuOption extends React.Component { mx_Dropdown_option_highlight: this.props.highlighted, }); - return
    { this.props.children }
    ; @@ -66,6 +71,7 @@ MenuOption.propTypes = { dropdownKey: PropTypes.string, onClick: PropTypes.func.isRequired, onMouseEnter: PropTypes.func.isRequired, + inputRef: PropTypes.any, }; /* @@ -177,32 +183,43 @@ export default class Dropdown extends React.Component { } _onInputKeyPress(e) { - // This needs to be on the keypress event because otherwise - // it can't cancel the form submission - if (e.key == 'Enter') { - this.setState({ - expanded: false, - }); - this.props.onOptionChange(this.state.highlightedOption); + // This needs to be on the keypress event because otherwise it can't cancel the form submission + if (e.key === Key.ENTER) { e.preventDefault(); } } _onInputKeyUp(e) { - // These keys don't generate keypress events and so needs to - // be on keyup - if (e.key == 'Escape') { - this.setState({ - expanded: false, - }); - } else if (e.key == 'ArrowDown') { - this.setState({ - highlightedOption: this._nextOption(this.state.highlightedOption), - }); - } else if (e.key == 'ArrowUp') { - this.setState({ - highlightedOption: this._prevOption(this.state.highlightedOption), - }); + // These keys don't generate keypress events and so needs to be on keyup + switch (e.key) { + case Key.ENTER: + this.props.onOptionChange(this.state.highlightedOption); + // fallthrough + case Key.ESCAPE: + this.setState({ + expanded: false, + }); + break; + case Key.ARROW_DOWN: + this.setState({ + highlightedOption: this._nextOption(this.state.highlightedOption), + }); + break; + case Key.ARROW_UP: + this.setState({ + highlightedOption: this._prevOption(this.state.highlightedOption), + }); + break; + case Key.HOME: + this.setState({ + highlightedOption: this._firstOption(), + }); + break; + case Key.END: + this.setState({ + highlightedOption: this._lastOption(), + }); + break; } } @@ -250,13 +267,36 @@ export default class Dropdown extends React.Component { return keys[(index - 1) % keys.length]; } + _firstOption() { + const keys = Object.keys(this.childrenByKey); + return keys[0]; + } + + _lastOption() { + const keys = Object.keys(this.childrenByKey); + return keys[keys.length - 1]; + } + + _scrollIntoView(node) { + if (node) { + node.scrollIntoView({ + block: "nearest", + behavior: "auto", + }); + } + } + _getMenuOptions() { const options = React.Children.map(this.props.children, (child) => { + const highlighted = this.state.highlightedOption === child.key; return ( - { child } @@ -280,13 +320,14 @@ export default class Dropdown extends React.Component { if (this.state.expanded) { if (this.props.searchEnabled) { currentValue = ; } - menu =
    + menu =
    { this._getMenuOptions() }
    ; } @@ -313,7 +354,7 @@ export default class Dropdown extends React.Component { return
    { currentValue } - + { menu }
    ; From cecf581e04af046f4547f4d2d002a452ed127c5e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 15 Dec 2019 15:04:57 +0000 Subject: [PATCH 038/239] Make Combobox dropdown keyboard and screen reader accessible --- src/components/views/auth/CountryDropdown.js | 16 +++-- src/components/views/elements/Dropdown.js | 64 +++++++++++++++---- .../views/elements/LanguageDropdown.js | 12 +++- src/i18n/strings/en_EN.json | 2 + 4 files changed, 73 insertions(+), 21 deletions(-) diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js index d8aa88c798..567bcf59ef 100644 --- a/src/components/views/auth/CountryDropdown.js +++ b/src/components/views/auth/CountryDropdown.js @@ -21,6 +21,7 @@ import sdk from '../../../index'; import { COUNTRIES } from '../../../phonenumber'; import SdkConfig from "../../../SdkConfig"; +import { _t } from "../../../languageHandler"; const COUNTRIES_BY_ISO2 = {}; for (const c of COUNTRIES) { @@ -130,10 +131,17 @@ export default class CountryDropdown extends React.Component { // values between mounting and the initial value propgating const value = this.props.value || this.state.defaultCountry.iso2; - return { options } ; diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js index 65be56f1f5..72e6cf19b3 100644 --- a/src/components/views/elements/Dropdown.js +++ b/src/components/views/elements/Dropdown.js @@ -1,6 +1,7 @@ /* Copyright 2017 Vector Creations Ltd Copyright 2019 Michael Telatynski <7t3chguy@gmail.com> +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. @@ -15,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from 'react'; +import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import AccessibleButton from './AccessibleButton'; @@ -50,6 +51,7 @@ class MenuOption extends React.Component { }); return
    + return [
    { _t("No results") }
    ]; } @@ -319,24 +331,36 @@ export default class Dropdown extends React.Component { let menu; if (this.state.expanded) { if (this.props.searchEnabled) { - currentValue = ; + currentValue = ( + + ); } - menu =
    - { this._getMenuOptions() } -
    ; + menu = ( +
    + { this._getMenuOptions() } +
    + ); } if (!currentValue) { const selectedChild = this.props.getShortOption ? this.props.getShortOption(this.props.value) : this.childrenByKey[this.props.value]; - currentValue =
    + currentValue =
    { selectedChild }
    ; } @@ -352,7 +376,16 @@ export default class Dropdown extends React.Component { // Note the menu sits inside the AccessibleButton div so it's anchored // to the input, but overflows below it. The root contains both. return
    - + { currentValue } { menu } @@ -362,6 +395,7 @@ export default class Dropdown extends React.Component { } Dropdown.propTypes = { + id: PropTypes.string.isRequired, // The width that the dropdown should be. If specified, // the dropped-down part of the menu will be set to this // width. @@ -381,4 +415,6 @@ Dropdown.propTypes = { value: PropTypes.string, // negative for consistency with HTML disabled: PropTypes.bool, + // ARIA label + label: PropTypes.string.isRequired, }; diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js index 451c97d958..ebe26cfad8 100644 --- a/src/components/views/elements/LanguageDropdown.js +++ b/src/components/views/elements/LanguageDropdown.js @@ -21,6 +21,7 @@ import PropTypes from 'prop-types'; import sdk from '../../../index'; import * as languageHandler from '../../../languageHandler'; import SettingsStore from "../../../settings/SettingsStore"; +import { _t } from "../../../languageHandler"; function languageMatchesSearchQuery(query, language) { if (language.label.toUpperCase().indexOf(query.toUpperCase()) == 0) return true; @@ -105,9 +106,14 @@ export default class LanguageDropdown extends React.Component { value = this.props.value || language; } - return { options } ; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 80604e9090..17d589d00e 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1262,6 +1262,7 @@ "Rotate Right": "Rotate Right", "Rotate clockwise": "Rotate clockwise", "Download this file": "Download this file", + "Language Dropdown": "Language Dropdown", "Manage Integrations": "Manage Integrations", "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s", "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times", @@ -1627,6 +1628,7 @@ "User Status": "User Status", "powered by Matrix": "powered by Matrix", "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.", + "Country Dropdown": "Country Dropdown", "Custom Server Options": "Custom Server Options", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.", "To continue, please enter your password.": "To continue, please enter your password.", From 224ee05b62c2b3e818b7bcb19f4b7f13b7357162 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 15 Dec 2019 15:07:49 +0000 Subject: [PATCH 039/239] this is a combobox, HOME/END should pertain to the input, not selection --- src/components/views/elements/Dropdown.js | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js index 72e6cf19b3..9b4181fe68 100644 --- a/src/components/views/elements/Dropdown.js +++ b/src/components/views/elements/Dropdown.js @@ -221,16 +221,6 @@ export default class Dropdown extends React.Component { highlightedOption: this._prevOption(this.state.highlightedOption), }); break; - case Key.HOME: - this.setState({ - highlightedOption: this._firstOption(), - }); - break; - case Key.END: - this.setState({ - highlightedOption: this._lastOption(), - }); - break; } } @@ -278,16 +268,6 @@ export default class Dropdown extends React.Component { return keys[(index - 1) % keys.length]; } - _firstOption() { - const keys = Object.keys(this.childrenByKey); - return keys[0]; - } - - _lastOption() { - const keys = Object.keys(this.childrenByKey); - return keys[keys.length - 1]; - } - _scrollIntoView(node) { if (node) { node.scrollIntoView({ From 6dedc8d7bb4363f424fcc94fdc3d5e359db6236c Mon Sep 17 00:00:00 2001 From: Osoitz Date: Sun, 15 Dec 2019 15:03:22 +0000 Subject: [PATCH 040/239] Translated using Weblate (Basque) Currently translated at 100.0% (1994 of 1994 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 88 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 453f09bb25..b3e9a731ee 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1842,7 +1842,7 @@ "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s erabiltzaileak bideo-dei bat abiatu du. (Nabigatzaile honek ez du onartzen)", "Try out new ways to ignore people (experimental)": "Probatu jendea ez entzuteko modu berriak (esperimentala)", "Send verification requests in direct message, including a new verification UX in the member panel.": "Bidali egiaztatze eskariak mezu zuzenetan, kide paneleko egiaztatze interfaze berria barne.", - "Enable cross-signing to verify per-user instead of per-device (in development)": "Gaitu sinatze gurutzatua erabiltzaileko eta ez gailuko egiaztatzeko (garapenean)", + "Enable cross-signing to verify per-user instead of per-device (in development)": "Gaitu zeharkako sinadura erabiltzaileko eta ez gailuko egiaztatzeko (garapenean)", "Enable local event indexing and E2EE search (requires restart)": "Gaitu gertaera lokalen indexazioa eta E2EE bilaketa (berrabiarazi behar da)", "Match system theme": "Bat egin sistemako gaiarekin", "My Ban List": "Nire debeku-zerrenda", @@ -1923,5 +1923,89 @@ "Remove for everyone": "Kendu denentzat", "Remove for me": "Kendu niretzat", "Verification Request": "Egiaztaketa eskaria", - " (1/%(totalCount)s)": " (1/%(totalCount)s)" + " (1/%(totalCount)s)": " (1/%(totalCount)s)", + "Send cross-signing keys to homeserver": "Bidali zeharkako sinaduraren gakoak hasiera-zerbitzarira", + "Error upgrading room": "Errorea gela eguneratzean", + "Double check that your server supports the room version chosen and try again.": "Egiaztatu zure zerbitzariak aukeratutako gela bertsioa onartzen duela eta saiatu berriro.", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen erabiltzaileak debekatzen zituen araua kendu du", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen gelak debekatzen zituen araua kendu du", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen zerbitzariak debekatzen zituen araua kendu du", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datorren debeku arau bat kendu du", + "%(senderName)s updated an invalid ban rule": "%(senderName)s erabiltzaileak baliogabeko debeku arau bat eguneratu du", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen erabiltzaileak debekatzen dituen araua eguneratu du, arrazoia: %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen gelak debekatzen dituen araua eguneratu du, arrazoia: %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen zerbitzariak debekatzen dituen araua eguneratu du, arrazoia: %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datorren debeku arau bat eguneratu du, arrazoia: %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen erabiltzaileak debekatzen dituen araua sortu du, arrazoia: %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen gelak debekatzen dituen araua sortu du, arrazoia: %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen zerbitzariak debekatzen dituen araua sortu du, arrazoia: %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datorren debeku arau bat sortu du, arrazoia: %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak erabiltzaileak debekatzen dituen araua aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak gelak debekatzen dituen araua aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak zerbitzariak debekatzen dituen araua aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak debeku arau bat aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s", + "Cross-signing and secret storage are enabled.": "Zeharkako sinadura eta biltegi sekretua gaituta daude.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Zure kontuak zeharkako sinaduraren identitatea biltegi sekretuan du, baina gailu honek oraindik ez du fidagarritzat.", + "Cross-signing and secret storage are not yet set up.": "Zeharkako sinadura eta biltegi sekretua ez daude oraindik ezarrita.", + "Bootstrap cross-signing and secret storage": "Abiatu zeharkako sinadura eta biltegi sekretua", + "Cross-signing public keys:": "Zeharkako sinaduraren gako publikoak:", + "on device": "gailuan", + "not found": "ez da aurkitu", + "Cross-signing private keys:": "Zeharkako sinaduraren gako pribatuak:", + "in secret storage": "biltegi sekretuan", + "Secret storage public key:": "Biltegi sekretuko gako publikoa:", + "in account data": "kontuaren datuetan", + "not stored": "gorde gabe", + "Backup has a valid signature from this user": "Babes-kopiak erabiltzaile honen baliozko sinadura bat du", + "Backup has a invalid signature from this user": "Babes-kopiak erabiltzaile honen baliogabeko sinadura bat du", + "Backup has a signature from unknown user with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen erabiltzaile ezezagun baten sinadura du", + "Backup has a signature from unknown device with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen gailu ezezagun baten sinadura du", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Babes-kopiaren gakoa biltegi sekretuan gorde da, gaina ezaugarri hau ez dago aktibatuta gailu honetan. Gaitu zeharkako sinadura laborategian babes-kopiaren egoera aldatzeko.", + "Backup key stored: ": "Babes-kopiaren gakoa gordeta: ", + "Start using Key Backup with Secure Secret Storage": "Hasi gakoen babes-kopia erabiltzen biltegi sekretu seguruarekin", + "Cross-signing": "Zeharkako sinadura", + "This message cannot be decrypted": "Mezu hau ezin da deszifratu", + "Unencrypted": "Zifratu gabe", + "Close preview": "Itxi aurrebista", + " wants to chat": " erabiltzaileak txateatu nahi du", + "Start chatting": "Hasi txateatzen", + "Hide verified sessions": "Ezkutatu egiaztatutako saioak", + "%(count)s verified sessions|other": "%(count)s egiaztatutako saio", + "%(count)s verified sessions|one": "Egiaztatutako saio 1", + "Reactions": "Erreakzioak", + " reacted with %(content)s": " erabiltzaileak %(content)s batekin erreakzionatu du", + "Automatically invite users": "Gonbidatu erabiltzaileak automatikoki", + "Upgrade private room": "Eguneratu gela pribatua", + "Upgrade public room": "Eguneratu gela publikoa", + "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gela eguneratzea ekintza aurreratu bat da eta akatsen, falta diren ezaugarrien, edo segurtasun arazoen erruz gela ezegonkorra denean aholkatzen da.", + "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please report a bug.": "Orokorrean honek zerbitzariak gela nola prozesatzen duen da duen eragin bakarra. RIot-ekin arazoak badituzu, eman akats baten berri.", + "You'll upgrade this room from to .": "Gela hau bertsiotik bertsiora eguneratuko duzu.", + "Upgrade": "Eguneratu", + "Enter secret storage passphrase": "Sartu biltegi sekretuko pasaesaldia", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Ezin izan da biltegi sekretura sartu. Egiaztatu pasaesaldi zuzena idatzi duzula.", + "Warning: You should only access secret storage from a trusted computer.": "Abisua: Biltegi sekretura ordenagailu fidagarri batetik konektatu beharko zinateke beti.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinaduraren identitatea beste gailuak egiaztatzeko zure pasa-esaldia sartuz.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Zure pasa-esaldia ahaztu baduzu berreskuratze gakoa erabili dezakezu edo berreskuratze aukera berriak ezarri ditzakezu.", + "Enter secret storage recovery key": "Sartu biltegi sekretuko berreskuratze-gakoa", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Ezin izan da biltegi sekretura sartu. Egiaztatu berreskuratze-gako zuzena sartu duzula.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta zeharkako sinaduraren identitatea beste gailuak egiaztatzeko zure pasa-esaldia sartuz.", + "If you've forgotten your recovery key you can .": "Zure berreskuratze-gakoa ahaztu baduzu ditzakezu.", + "Warning: You should only set up key backup from a trusted computer.": "Abisua:: Gakoen babes-kopia fidagarria den gailu batetik egin beharko zenuke beti.", + "If you've forgotten your recovery key you can ": "Zure berreskuratze-gakoa ahaztu baduzu ditzakezu", + "Notification settings": "Jakinarazpenen ezarpenak", + "User Status": "Erabiltzaile-egoera", + "Warning: You should only set up secret storage from a trusted computer.": "Abisua: Biltegi sekretura ordenagailu fidagarri batetik konektatu beharko zinateke beti.", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Biltegi sekretua erabiliko dugu, aukeran, beste gailuak egiaztatzeko zure zeharkako sinaduraren identitatearen eta mezuen gakoen kopia zifratu bat zure zerbitzarian gordetzeko. Babestu zure mezu zifratuetara sarbidea pasa.esaldi batekin seguru mantentzeko.", + "Set up with a recovery key": "Ezarri berreskuratze gakoarekin", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Aukeran, berreskuratze pasa-esaldia ahazten baduzu, zure zifratutako mezuak berreskuratzeko erabili dezakezu.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Badaezpada, zure zifratutako mezuen historiala berreskuratzeko erabili dezakezu.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Gorde zure berreskuratze gakoa toki oso seguruan, esaterako pasahitz kudeatzaile batean (edo gordailu kutxan).", + "Your recovery key has been copied to your clipboard, paste it to:": "Zure berreskuratze gakoa arbelera kopiatu da, itsatsi hemen:", + "Your recovery key is in your Downloads folder.": "Zure berreskuratze gakoa zure Deskargak karpetan dago.", + "Your access to encrypted messages is now protected.": "Zure zifratutako mezuetara sarbidea babestuta dago.", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Mezu seguruen berreskuratzea ezartzen ez bada, ezin izango duzu zure zifratutako mezuen historiala edo beste gailuak egiaztatzeko zeharkako sinadura berreskuratu saioa amaitzen baduzu edo beste gailu bat erabiltzen baduzu.", + "Set up secret storage": "Ezarri biltegi sekretua", + "Secure your encrypted messages with a passphrase": "Babestu zure zifratutako mezuak pasa-esaldi batekin", + "Storing secrets...": "Sekretuak gordetzen...", + "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri" } From 460d4fc1507f4f767aa3e4dda1eefaa600dc2907 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Mon, 16 Dec 2019 02:58:49 +0000 Subject: [PATCH 041/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1994 of 1994 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 56b2c05d75..829af63542 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2007,5 +2007,6 @@ "Set up secret storage": "設定秘密儲存空間", "Secure your encrypted messages with a passphrase": "使用密碼保護您的加密訊息", "Storing secrets...": "正在儲存秘密……", - "Unable to set up secret storage": "無法設定秘密儲存空間" + "Unable to set up secret storage": "無法設定秘密儲存空間", + "Close preview": "關閉預覽" } From 671ec51c01e588c7eb3c1ccb6af7c4122278fa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= Date: Sun, 15 Dec 2019 20:24:45 +0000 Subject: [PATCH 042/239] Translated using Weblate (Czech) Currently translated at 98.4% (1962 of 1994 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/ --- src/i18n/strings/cs.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index b6a2dcdb18..4b69e2da82 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -510,8 +510,8 @@ "Flair": "Vztah ke komunitě", "Showing flair for these communities:": "Místnost má vztah k těmto komunitám:", "This room is not showing flair for any communities": "Tato místnost nemá vztah k žádné komunitě", - "URL previews are enabled by default for participants in this room.": "Náhledy URL adres jsou defaultně nastavené jako povolené pro členy této místnosti.", - "URL previews are disabled by default for participants in this room.": "Náhledy URL adres jsou defaultně nastavené jako zakázané pro členy této místnosti.", + "URL previews are enabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres povolené pro členy této místnosti.", + "URL previews are disabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres zakázané pro členy této místnosti.", "Invalid file%(extra)s": "Neplatný soubor%(extra)s", "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s %(integrationsUrl)s. Chcete pokračovat?", "To continue, please enter your password.": "Aby jste mohli pokračovat, zadejte prosím své heslo.", @@ -604,8 +604,8 @@ "You have entered an invalid address.": "Zadali jste neplatnou adresu.", "Confirm Removal": "Potvrdit odstranění", "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Opravdu chcete odstranit (smazat) tuto událost? V případě, že smažete název místnosti anebo změníte téma, je možné, že se změny neprovedou.", - "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID skupiny může obsahovat pouze znaky a-z, 0-9, or '=_-./'", - "Something went wrong whilst creating your community": "Něco se pokazilo v během vytváření vaší skupiny", + "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID skupiny může obsahovat pouze znaky a-z, 0-9, nebo '=_-./'", + "Something went wrong whilst creating your community": "Něco se pokazilo během vytváření vaší skupiny", "Unknown error": "Neznámá chyba", "Incorrect password": "Nesprávné heslo", "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Pokud si chcete ověřit, zda je zařízení skutečně důvěryhodné, kontaktujte vlastníka jiným způsobem (např. osobně anebo telefonicky) a zeptejte se ho na klíč, který má pro toto zařízení zobrazený v nastavení a zda se shoduje s klíčem zobrazeným níže:", @@ -1500,7 +1500,7 @@ "Do you want to join %(roomName)s?": "Chcete se přidat do místnosti %(roomName)s?", " invited you": " vás pozval", "You're previewing %(roomName)s. Want to join it?": "Prohlížíte si místnost %(roomName)s. Chcete se do ní přidat?", - "%(roomName)s can't be previewed. Do you want to join it?": "Místnost %(roomName)s si nelze jen tak prohlížet. Chcete se do ní přidat?", + "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s si nelze jen tak prohlížet. Chcete se do ní přidat?", "This room doesn't exist. Are you sure you're at the right place?": "Tato místnost neexistuje. Jste si jistí, že jste na správném místě?", "Try again later, or ask a room admin to check if you have access.": "Zkuste to znovu nebo se zeptejte administrátora aby zkontrolovat jestli máte přístup.", "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report.": "Při pokusu o připojení došlo k chybě: %(errcode)s. Pokud si myslíte, že je to bug, můžete ho nahlásit.", @@ -1807,7 +1807,7 @@ "View": "Zobrazit", "Find a room…": "Najít místnost…", "Find a room… (e.g. %(exampleRoom)s)": "Najít místnost… (například %(exampleRoom)s)", - "If you can't find the room you're looking for, ask for an invite or Create a new room.": "Pokud nemůžete nelézt místnost, kterou hledáte, napište o pozvánku nebo si jí Vytvořte.", + "If you can't find the room you're looking for, ask for an invite or Create a new room.": "Pokud nemůžete nelézt místnost, kterou hledáte, napište si o pozvánku nebo Vytvořte novou.", "Explore rooms": "Prohlížet místnosti", "Jump to first unread room.": "Skočit na první nepřečtenou místnost.", "Jump to first invite.": "Skočit na první pozvánku.", From ed5bfb7acf678cb68431c8147e3a43195ce89122 Mon Sep 17 00:00:00 2001 From: random Date: Mon, 16 Dec 2019 09:16:55 +0000 Subject: [PATCH 043/239] Translated using Weblate (Italian) Currently translated at 99.9% (1993 of 1994 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 2993fadf29..08be6d4c06 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -2005,5 +2005,6 @@ "Set up secret storage": "Imposta l'archivio segreto", "Secure your encrypted messages with a passphrase": "Proteggi i tuoi messaggi cifrati con una password", "Storing secrets...": "Memorizzo i segreti...", - "Unable to set up secret storage": "Impossibile impostare un archivio segreto" + "Unable to set up secret storage": "Impossibile impostare un archivio segreto", + "Close preview": "Chiudi anteprima" } From 9c4eb1d649f9887133651ea83643f7496994d202 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 10:03:40 +0000 Subject: [PATCH 044/239] clean up new code --- src/components/views/elements/Dropdown.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js index 9b4181fe68..67a8663b3e 100644 --- a/src/components/views/elements/Dropdown.js +++ b/src/components/views/elements/Dropdown.js @@ -178,7 +178,7 @@ export default class Dropdown extends React.Component { } } - _onMenuOptionClick(dropdownKey) { + _close() { this.setState({ expanded: false, }); @@ -186,6 +186,10 @@ export default class Dropdown extends React.Component { if (this._button.current) { this._button.current.focus(); } + } + + _onMenuOptionClick(dropdownKey) { + this._close(); this.props.onOptionChange(dropdownKey); } @@ -203,13 +207,7 @@ export default class Dropdown extends React.Component { this.props.onOptionChange(this.state.highlightedOption); // fallthrough case Key.ESCAPE: - this.setState({ - expanded: false, - }); - // their focus was on the input, its getting unmounted, move it to the button - if (this._button.current) { - this._button.current.focus(); - } + this._close(); break; case Key.ARROW_DOWN: this.setState({ From d64d90b704b56140cf897eb7f977defd78cb3c52 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 12:01:43 +0000 Subject: [PATCH 045/239] Fix aspect ratio on room/profile avatar preview --- res/css/views/settings/_ProfileSettings.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss index 432b713c1b..cf09fbf244 100644 --- a/res/css/views/settings/_ProfileSettings.scss +++ b/res/css/views/settings/_ProfileSettings.scss @@ -52,6 +52,10 @@ limitations under the License. border-radius: 4px; } +.mx_ProfileSettings_avatar img { + object-fit: cover; +} + .mx_ProfileSettings_avatar .mx_ProfileSettings_avatarOverlay_disabled { cursor: default; } From 85ade7e1a1060f3ae8afd41f4080a4ea81e88131 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 12:16:41 +0000 Subject: [PATCH 046/239] Switch to react-focus-lock for it to comprehend Portals --- package.json | 2 +- src/components/views/dialogs/BaseDialog.js | 29 +++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 2f35ab7750..8688fe42e6 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "file-saver": "^1.3.3", "filesize": "3.5.6", "flux": "2.1.1", - "focus-trap-react": "^3.0.5", + "react-focus-lock": "^2.2.1", "focus-visible": "^5.0.2", "fuse.js": "^2.2.0", "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js index d83ce46360..f7aae7c6da 100644 --- a/src/components/views/dialogs/BaseDialog.js +++ b/src/components/views/dialogs/BaseDialog.js @@ -1,6 +1,7 @@ /* Copyright 2017 Vector Creations Ltd Copyright 2018, 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. @@ -17,7 +18,7 @@ limitations under the License. import React from 'react'; import createReactClass from 'create-react-class'; -import FocusTrap from 'focus-trap-react'; +import FocusLock from 'react-focus-lock'; import PropTypes from 'prop-types'; import classNames from 'classnames'; @@ -121,20 +122,24 @@ export default createReactClass({ } return ( -
    { this.props.children } - + ); }, }); From 4a2217bb794f8fcc46e60b28d02f250d5e2ed1a2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 12:23:21 +0000 Subject: [PATCH 047/239] Regenerate yarn.lock --- yarn.lock | 68 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/yarn.lock b/yarn.lock index 85deedbfec..b8b877ab62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -85,6 +85,13 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb" integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g== +"@babel/runtime@^7.0.0": + version "7.7.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f" + integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw== + dependencies: + regenerator-runtime "^0.13.2" + "@babel/runtime@^7.1.2": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b" @@ -2536,6 +2543,11 @@ detect-libc@^1.0.2: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detect-node@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" + integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" @@ -3474,19 +3486,10 @@ flux@2.1.1: fbjs "0.1.0-alpha.7" immutable "^3.7.4" -focus-trap-react@^3.0.5: - version "3.1.4" - resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-3.1.4.tgz#e95f4aece5c493be4d3653dfccd5036d11ad24d5" - integrity sha512-uqMKMg9Xlny0LKHW0HqA7ncLafW57SxgeedjE7/Xt+NB7sdOBUG4eD/9sMsq1O0+7zD3palpniTs2n0PDLc3uA== - dependencies: - focus-trap "^2.0.1" - -focus-trap@^2.0.1: - version "2.4.6" - resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-2.4.6.tgz#332b475b317cec6a4a129f5307ce7ebc0da90b40" - integrity sha512-vWZTPtBU6pBoyWZDRZJHkXsyP2ZCZBHE3DRVXnSVdQKH/mcDtu9S5Kz8CUDyIqpfZfLEyI9rjKJLnc4Y40BRBg== - dependencies: - tabbable "^1.0.3" +focus-lock@^0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.6.tgz#98119a755a38cfdbeda0280eaa77e307eee850c7" + integrity sha512-Dx69IXGCq1qsUExWuG+5wkiMqVM/zGx/reXSJSLogECwp3x6KeNQZ+NAetgxEFpnC41rD8U3+jRCW68+LNzdtw== focus-visible@^5.0.2: version "5.0.2" @@ -6672,6 +6675,13 @@ react-beautiful-dnd@^4.0.1: redux-thunk "^2.2.0" reselect "^3.0.1" +react-clientside-effect@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837" + integrity sha512-nRmoyxeok5PBO6ytPvSjKp9xwXg9xagoTK1mMjwnQxqM9Hd7MNPl+LS1bOSOe+CV2+4fnEquc7H/S8QD3q697A== + dependencies: + "@babel/runtime" "^7.0.0" + react-dom@^16.4.2, react-dom@^16.9.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" @@ -6682,6 +6692,18 @@ react-dom@^16.4.2, react-dom@^16.9.0: prop-types "^15.6.2" scheduler "^0.18.0" +react-focus-lock@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.2.1.tgz#1d12887416925dc53481914b7cedd39494a3b24a" + integrity sha512-47g0xYcCTZccdzKRGufepY8oZ3W1Qg+2hn6u9SHZ0zUB6uz/4K4xJe7yYFNZ1qT6m+2JDm82F6QgKeBTbjW4PQ== + dependencies: + "@babel/runtime" "^7.0.0" + focus-lock "^0.6.6" + prop-types "^15.6.2" + react-clientside-effect "^1.2.2" + use-callback-ref "^1.2.1" + use-sidecar "^1.0.1" + "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594": version "2.1.5" resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/9cf17f63b7c0b0ec5f31df27da0f82f7238dc594" @@ -7999,11 +8021,6 @@ symbol-observable@^1.0.3: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -tabbable@^1.0.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.3.tgz#0e4ee376f3631e42d7977a074dbd2b3827843081" - integrity sha512-nOWwx35/JuDI4ONuF0ZTo6lYvI0fY0tZCH1ErzY2EXfu4az50ZyiUX8X073FLiZtmWUVlkRnuXsehjJgCw9tYg== - table@^5.0.0, table@^5.2.3: version "5.4.6" resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" @@ -8193,7 +8210,7 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e" integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q== -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== @@ -8422,6 +8439,19 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +use-callback-ref@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.1.tgz#898759ccb9e14be6c7a860abafa3ffbd826c89bb" + integrity sha512-C3nvxh0ZpaOxs9RCnWwAJ+7bJPwQI8LHF71LzbQ3BvzH5XkdtlkMadqElGevg5bYBDFip4sAnD4m06zAKebg1w== + +use-sidecar@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.2.tgz#e72f582a75842f7de4ef8becd6235a4720ad8af6" + integrity sha512-287RZny6m5KNMTb/Kq9gmjafi7lQL0YHO1lYolU6+tY1h9+Z3uCtkJJ3OSOq3INwYf2hBryCcDh4520AhJibMA== + dependencies: + detect-node "^2.0.4" + tslib "^1.9.3" + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" From 9fa2680dc6028627f9537b189dce468240c74a11 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 14:58:12 +0000 Subject: [PATCH 048/239] Implement new design for uploading/removing avatars --- res/css/_components.scss | 1 + res/css/views/settings/_AvatarSetting.scss | 82 ++++++++++++++++++ res/css/views/settings/_ProfileSettings.scss | 85 ------------------- .../room_settings/RoomProfileSettings.js | 68 +++++---------- .../views/settings/AvatarSetting.js | 61 +++++++++++++ .../views/settings/ProfileSettings.js | 52 +++++------- src/i18n/strings/en_EN.json | 11 +-- 7 files changed, 186 insertions(+), 174 deletions(-) create mode 100644 res/css/views/settings/_AvatarSetting.scss create mode 100644 src/components/views/settings/AvatarSetting.js diff --git a/res/css/_components.scss b/res/css/_components.scss index 529ce9ac85..233c781d7f 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -175,6 +175,7 @@ @import "./views/rooms/_Stickers.scss"; @import "./views/rooms/_TopUnreadMessagesBar.scss"; @import "./views/rooms/_WhoIsTypingTile.scss"; +@import "./views/settings/_AvatarSetting.scss"; @import "./views/settings/_CrossSigningPanel.scss"; @import "./views/settings/_DevicesPanel.scss"; @import "./views/settings/_EmailAddresses.scss"; diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss new file mode 100644 index 0000000000..32ece173cc --- /dev/null +++ b/res/css/views/settings/_AvatarSetting.scss @@ -0,0 +1,82 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_AvatarSetting_avatar { + width: 88px; + height: 88px; + margin-left: 13px; + position: relative; + + & > * { + width: 88px; + box-sizing: border-box; + } + + .mx_AccessibleButton.mx_AccessibleButton_kind_primary { + margin-top: 8px; + + div { + position: relative; + height: 12px; + width: 12px; + display: inline; + padding-right: 6px; // 0.5 * 12px + left: -6px; // 0.5 * 12px + top: 3px; + } + + div::before { + content: ''; + position: absolute; + height: 12px; + width: 12px; + + background-color: $button-primary-fg-color; + mask-repeat: no-repeat; + mask-size: contain; + mask-image: url('$(res)/img/feather-customised/upload.svg'); + } + } + + .mx_AccessibleButton.mx_AccessibleButton_kind_link_sm { + color: $button-danger-bg-color; + } + + & > img, + .mx_AvatarSetting_avatarPlaceholder { + display: block; + height: 88px; + border-radius: 4px; + } + + .mx_AvatarSetting_avatarPlaceholder::before { + background-color: $settings-profile-overlay-placeholder-fg-color; + mask: url("$(res)/img/feather-customised/user.svg"); + mask-repeat: no-repeat; + mask-size: 36px; + mask-position: center; + content: ''; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + } +} + +.mx_AvatarSetting_avatar .mx_AvatarSetting_avatarPlaceholder { + background-color: $settings-profile-placeholder-bg-color; +} diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss index 432b713c1b..58624d1597 100644 --- a/res/css/views/settings/_ProfileSettings.scss +++ b/res/css/views/settings/_ProfileSettings.scss @@ -38,91 +38,6 @@ limitations under the License. } } -.mx_ProfileSettings_avatar { - width: 88px; - height: 88px; - margin-left: 13px; - position: relative; -} - -.mx_ProfileSettings_avatar > * { - display: block; - width: 88px; - height: 88px; - border-radius: 4px; -} - -.mx_ProfileSettings_avatar .mx_ProfileSettings_avatarOverlay_disabled { - cursor: default; -} - -.mx_ProfileSettings_avatar .mx_ProfileSettings_avatarPlaceholder { - background-color: $settings-profile-placeholder-bg-color; -} - -.mx_ProfileSettings_avatarOverlay { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - display: none; - text-align: center; - vertical-align: middle; - font-size: 10px; - cursor: pointer; -} - -.mx_ProfileSettings_avatar:hover .mx_ProfileSettings_avatarOverlay:not(.mx_ProfileSettings_avatarOverlay_disabled) { - display: inline-block; - opacity: 0.5 !important; - color: $settings-profile-overlay-fg-color !important; - background-color: $settings-profile-overlay-bg-color !important; -} - -.mx_ProfileSettings_avatarOverlay_show { - display: inline-block; - opacity: 1; - color: $settings-profile-overlay-placeholder-fg-color; - background-color: $settings-profile-overlay-placeholder-bg-color; -} - -.mx_ProfileSettings_avatarOverlayText { - display: block; - margin-top: 17px; - margin-bottom: 8px; -} - -.mx_ProfileSettings_noAvatarText { - display: block; - margin: 34px auto auto; -} - -.mx_ProfileSettings_avatarOverlayImgContainer { - position: relative; - width: 14px; - height: 14px; - margin: auto; -} - -.mx_ProfileSettings_avatarOverlayImg::before { - background-color: $settings-profile-overlay-placeholder-fg-color; - mask: url("$(res)/img/feather-customised/upload.svg"); - mask-repeat: no-repeat; - mask-size: 14px; - mask-position: center; - content: ''; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; -} - -.mx_ProfileSettings_avatar:hover .mx_ProfileSettings_avatarOverlayImg::before { - background-color: $settings-profile-overlay-fg-color !important; -} - .mx_ProfileSettings_avatarUpload { display: none; } diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js index 76d2e5be84..ada2f093d1 100644 --- a/src/components/views/room_settings/RoomProfileSettings.js +++ b/src/components/views/room_settings/RoomProfileSettings.js @@ -19,8 +19,7 @@ import PropTypes from 'prop-types'; import {_t} from "../../../languageHandler"; import MatrixClientPeg from "../../../MatrixClientPeg"; import Field from "../elements/Field"; -import AccessibleButton from "../elements/AccessibleButton"; -import classNames from 'classnames'; +import sdk from "../../../index"; // TODO: Merge with ProfileSettings? export default class RoomProfileSettings extends React.Component { @@ -62,13 +61,20 @@ export default class RoomProfileSettings extends React.Component { this._avatarUpload = createRef(); } - _uploadAvatar = (e) => { - e.stopPropagation(); - e.preventDefault(); - + _uploadAvatar = () => { this._avatarUpload.current.click(); }; + _removeAvatar = () => { + // clear file upload field so same file can be selected + this._avatarUpload.current.value = ""; + this.setState({ + avatarUrl: undefined, + avatarFile: undefined, + enableProfileSave: true, + }); + }; + _saveProfile = async (e) => { e.stopPropagation(); e.preventDefault(); @@ -139,45 +145,8 @@ export default class RoomProfileSettings extends React.Component { }; render() { - // TODO: Why is rendering a box with an overlay so complicated? Can the DOM be reduced? - - let showOverlayAnyways = true; - let avatarElement =
    ; - if (this.state.avatarUrl) { - showOverlayAnyways = false; - avatarElement = {_t("Room; - } - - const avatarOverlayClasses = classNames({ - "mx_ProfileSettings_avatarOverlay": true, - "mx_ProfileSettings_avatarOverlay_show": showOverlayAnyways, - }); - let avatarHoverElement = ( -
    - {_t("Upload room avatar")} -
    -
    -
    -
    - ); - if (!this.state.canSetAvatar) { - if (!showOverlayAnyways) { - avatarHoverElement = null; - } else { - const disabledOverlayClasses = classNames({ - "mx_ProfileSettings_avatarOverlay": true, - "mx_ProfileSettings_avatarOverlay_show": true, - "mx_ProfileSettings_avatarOverlay_disabled": true, - }); - avatarHoverElement = ( -
    - {_t("No room avatar")} -
    - ); - } - } - + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + const AvatarSetting = sdk.getComponent('settings.AvatarSetting'); return (
    -
    - {avatarElement} - {avatarHoverElement} -
    +
    diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.js new file mode 100644 index 0000000000..c6495db362 --- /dev/null +++ b/src/components/views/settings/AvatarSetting.js @@ -0,0 +1,61 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from "react"; +import PropTypes from "prop-types"; + +import sdk from "../../../index"; +import {_t} from "../../../languageHandler"; + +const AvatarSetting = ({avatarUrl, avatarAltText, uploadAvatar, removeAvatar}) => { + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + + let avatarElement =
    ; + if (avatarUrl) { + avatarElement = {avatarAltText}; + } + + let uploadAvatarBtn; + if (uploadAvatar) { + // insert an empty div to be the host for a css mask containing the upload.svg + uploadAvatarBtn = +
     
    + {_t("Upload")} +     ; + } + + let removeAvatarBtn; + if (avatarUrl && removeAvatar) { + removeAvatarBtn = + {_t("Remove")} + ; + } + + return
    + { avatarElement } + { uploadAvatarBtn } + { removeAvatarBtn } +
    ; +}; + +AvatarSetting.propTypes = { + avatarUrl: PropTypes.string, + uploadAvatar: PropTypes.func, + removeAvatar: PropTypes.func, + avatarAltText: PropTypes.string.isRequired, +}; + +export default AvatarSetting; diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js index a878a8cc3f..f415508bba 100644 --- a/src/components/views/settings/ProfileSettings.js +++ b/src/components/views/settings/ProfileSettings.js @@ -18,10 +18,9 @@ import React, {createRef} from 'react'; import {_t} from "../../../languageHandler"; import MatrixClientPeg from "../../../MatrixClientPeg"; import Field from "../elements/Field"; -import AccessibleButton from "../elements/AccessibleButton"; -import classNames from 'classnames'; import {User} from "matrix-js-sdk"; import { getHostingLink } from '../../../utils/HostingLink'; +import sdk from "../../../index"; export default class ProfileSettings extends React.Component { constructor() { @@ -52,13 +51,20 @@ export default class ProfileSettings extends React.Component { this._avatarUpload = createRef(); } - _uploadAvatar = (e) => { - e.stopPropagation(); - e.preventDefault(); - + _uploadAvatar = () => { this._avatarUpload.current.click(); }; + _removeAvatar = () => { + // clear file upload field so same file can be selected + this._avatarUpload.current.value = ""; + this.setState({ + avatarUrl: undefined, + avatarFile: undefined, + enableProfileSave: true, + }); + }; + _saveProfile = async (e) => { e.stopPropagation(); e.preventDefault(); @@ -117,29 +123,6 @@ export default class ProfileSettings extends React.Component { }; render() { - // TODO: Why is rendering a box with an overlay so complicated? Can the DOM be reduced? - - let showOverlayAnyways = true; - let avatarElement =
    ; - if (this.state.avatarUrl) { - showOverlayAnyways = false; - avatarElement = {_t("Profile; - } - - const avatarOverlayClasses = classNames({ - "mx_ProfileSettings_avatarOverlay": true, - "mx_ProfileSettings_avatarOverlay_show": showOverlayAnyways, - }); - const avatarHoverElement = ( -
    - {_t("Upload profile picture")} -
    -
    -
    -
    - ); - const hostingSignupLink = getHostingLink('user-settings'); let hostingSignup = null; if (hostingSignupLink) { @@ -156,6 +139,8 @@ export default class ProfileSettings extends React.Component { ; } + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + const AvatarSetting = sdk.getComponent('settings.AvatarSetting'); return (
    -
    - {avatarElement} - {avatarHoverElement} -
    +
    diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index b9894152e1..9bccca14f4 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -499,6 +499,8 @@ "Pin": "Pin", "Decline (%(counter)s)": "Decline (%(counter)s)", "Accept to continue:": "Accept to continue:", + "Upload": "Upload", + "Remove": "Remove", "Failed to upload profile picture!": "Failed to upload profile picture!", "Upload new:": "Upload new:", "No display name": "No display name", @@ -597,10 +599,9 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", - "Profile picture": "Profile picture", - "Upload profile picture": "Upload profile picture", "Upgrade to your own domain": "Upgrade to your own domain", "Display Name": "Display Name", + "Profile picture": "Profile picture", "Save": "Save", "Identity Server URL must be HTTPS": "Identity Server URL must be HTTPS", "Not a valid Identity Server (status code %(code)s)": "Not a valid Identity Server (status code %(code)s)", @@ -691,7 +692,6 @@ "User rules": "User rules", "Close": "Close", "You have not ignored anyone.": "You have not ignored anyone.", - "Remove": "Remove", "You are currently ignoring:": "You are currently ignoring:", "You are not subscribed to any lists": "You are not subscribed to any lists", "Unsubscribe": "Unsubscribe", @@ -1097,11 +1097,9 @@ "Showing flair for these communities:": "Showing flair for these communities:", "This room is not showing flair for any communities": "This room is not showing flair for any communities", "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "Room avatar": "Room avatar", - "Upload room avatar": "Upload room avatar", - "No room avatar": "No room avatar", "Room Name": "Room Name", "Room Topic": "Room Topic", + "Room avatar": "Room avatar", "You have enabled URL previews by default.": "You have enabled URL previews by default.", "You have disabled URL previews by default.": "You have disabled URL previews by default.", "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", @@ -1545,7 +1543,6 @@ "Upload files (%(current)s of %(total)s)": "Upload files (%(current)s of %(total)s)", "Upload files": "Upload files", "Upload all": "Upload all", - "Upload": "Upload", "This file is too large to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "This file is too large to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.", "These files are too large to upload. The file size limit is %(limit)s.": "These files are too large to upload. The file size limit is %(limit)s.", "Some files are too large to be uploaded. The file size limit is %(limit)s.": "Some files are too large to be uploaded. The file size limit is %(limit)s.", From 5ab98e98993f6a869681f7115a6ff1ba806082ec Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 15:08:22 +0000 Subject: [PATCH 049/239] open ImageView when clicking on a set avatar --- res/css/views/settings/_AvatarSetting.scss | 4 ++++ .../room_settings/RoomProfileSettings.js | 1 + .../views/settings/AvatarSetting.js | 23 ++++++++++++++++--- .../views/settings/ProfileSettings.js | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss index 32ece173cc..5d3568e8b5 100644 --- a/res/css/views/settings/_AvatarSetting.scss +++ b/res/css/views/settings/_AvatarSetting.scss @@ -55,6 +55,10 @@ limitations under the License. color: $button-danger-bg-color; } + & > img { + cursor: pointer; + } + & > img, .mx_AvatarSetting_avatarPlaceholder { display: block; diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js index ada2f093d1..2093a31a28 100644 --- a/src/components/views/room_settings/RoomProfileSettings.js +++ b/src/components/views/room_settings/RoomProfileSettings.js @@ -162,6 +162,7 @@ export default class RoomProfileSettings extends React.Component {
    diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.js index c6495db362..51ef3a4302 100644 --- a/src/components/views/settings/AvatarSetting.js +++ b/src/components/views/settings/AvatarSetting.js @@ -14,18 +14,34 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from "react"; +import React, {useCallback} from "react"; import PropTypes from "prop-types"; import sdk from "../../../index"; import {_t} from "../../../languageHandler"; +import Modal from "../../../Modal"; -const AvatarSetting = ({avatarUrl, avatarAltText, uploadAvatar, removeAvatar}) => { +const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, removeAvatar}) => { const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + const openImageView = useCallback(() => { + const ImageView = sdk.getComponent("elements.ImageView"); + Modal.createDialog(ImageView, { + src: avatarUrl, + name: avatarName, + }, "mx_Dialog_lightbox"); + }, [avatarUrl, avatarName]); + let avatarElement =
    ; if (avatarUrl) { - avatarElement = {avatarAltText}; + avatarElement = ( + + ); } let uploadAvatarBtn; @@ -53,6 +69,7 @@ const AvatarSetting = ({avatarUrl, avatarAltText, uploadAvatar, removeAvatar}) = AvatarSetting.propTypes = { avatarUrl: PropTypes.string, + avatarName: PropTypes.string.isRequired, // name of user/room the avatar belongs to uploadAvatar: PropTypes.func, removeAvatar: PropTypes.func, avatarAltText: PropTypes.string.isRequired, diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js index f415508bba..480b414911 100644 --- a/src/components/views/settings/ProfileSettings.js +++ b/src/components/views/settings/ProfileSettings.js @@ -157,6 +157,7 @@ export default class ProfileSettings extends React.Component {
    From 6f5ac780facb72ab39d3cb5a6b53e735bfaa00ce Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 16:19:43 +0000 Subject: [PATCH 050/239] Use new image.svg placeholder for AvatarSetting in Rooms --- res/css/views/dialogs/_RoomSettingsDialog.scss | 8 ++++++++ res/img/feather-customised/image.svg | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 res/img/feather-customised/image.svg diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss index 723eb237ad..08839d8493 100644 --- a/res/css/views/dialogs/_RoomSettingsDialog.scss +++ b/res/css/views/dialogs/_RoomSettingsDialog.scss @@ -42,3 +42,11 @@ limitations under the License. padding-left: 40px; padding-right: 80px; } + +// show a different AvatarSetting placeholder for RoomProfileSettings which is basically a clone of ProfileSettings +.mx_RoomSettingsDialog .mx_AvatarSetting_avatar .mx_AvatarSetting_avatarPlaceholder::before { + mask: url("$(res)/img/feather-customised/image.svg"); + mask-repeat: no-repeat; + mask-size: 36px; + mask-position: center; +} diff --git a/res/img/feather-customised/image.svg b/res/img/feather-customised/image.svg new file mode 100644 index 0000000000..9690aecf36 --- /dev/null +++ b/res/img/feather-customised/image.svg @@ -0,0 +1,5 @@ + + + + + From 7b4ad61beafc9fa0029016a0587a1e2bd1974055 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 16:23:35 +0000 Subject: [PATCH 051/239] post-merge fix --- res/css/views/settings/_AvatarSetting.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss index 5d3568e8b5..35dba90f85 100644 --- a/res/css/views/settings/_AvatarSetting.scss +++ b/res/css/views/settings/_AvatarSetting.scss @@ -57,6 +57,7 @@ limitations under the License. & > img { cursor: pointer; + object-fit: cover; } & > img, From d28a892bb0ef6766a51ca8212757e608ac3a9c57 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 17:14:03 +0000 Subject: [PATCH 052/239] Stop using KeyboardEvent.keyCode as it is deprecated --- src/Keyboard.js | 69 +++++++------------ .../views/dialogs/EncryptedEventDialog.js | 4 +- src/components/structures/RoomSubList.js | 4 +- src/components/structures/RoomView.js | 8 +-- src/components/structures/ScrollPanel.js | 12 ++-- src/components/structures/SearchBox.js | 6 +- src/components/structures/TimelinePanel.js | 5 +- .../views/dialogs/AddressPickerDialog.js | 15 ++-- src/components/views/dialogs/BaseDialog.js | 4 +- src/components/views/dialogs/SetMxIdDialog.js | 4 +- .../views/elements/AccessibleButton.js | 10 +-- src/components/views/elements/ImageView.js | 3 +- src/components/views/rooms/ForwardMessage.js | 6 +- .../views/rooms/MessageComposerInput.js | 40 +++++------ src/components/views/rooms/SearchBar.js | 13 ++-- .../views/settings/IntegrationManager.js | 3 +- 16 files changed, 95 insertions(+), 111 deletions(-) diff --git a/src/Keyboard.js b/src/Keyboard.js index 453ddab1e2..478d75acc1 100644 --- a/src/Keyboard.js +++ b/src/Keyboard.js @@ -1,6 +1,7 @@ /* Copyright 2016 OpenMarket Ltd Copyright 2017 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. @@ -15,52 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* a selection of key codes, as used in KeyboardEvent.keyCode */ -export const KeyCode = { - BACKSPACE: 8, - TAB: 9, - ENTER: 13, - SHIFT: 16, - ESCAPE: 27, - SPACE: 32, - PAGE_UP: 33, - PAGE_DOWN: 34, - END: 35, - HOME: 36, - LEFT: 37, - UP: 38, - RIGHT: 39, - DOWN: 40, - DELETE: 46, - KEY_A: 65, - KEY_B: 66, - KEY_C: 67, - KEY_D: 68, - KEY_E: 69, - KEY_F: 70, - KEY_G: 71, - KEY_H: 72, - KEY_I: 73, - KEY_J: 74, - KEY_K: 75, - KEY_L: 76, - KEY_M: 77, - KEY_N: 78, - KEY_O: 79, - KEY_P: 80, - KEY_Q: 81, - KEY_R: 82, - KEY_S: 83, - KEY_T: 84, - KEY_U: 85, - KEY_V: 86, - KEY_W: 87, - KEY_X: 88, - KEY_Y: 89, - KEY_Z: 90, - KEY_BACKTICK: 223, // DO NOT USE THIS: browsers disagree on backtick 192 vs 223 -}; - export const Key = { HOME: "Home", END: "End", @@ -80,13 +35,35 @@ export const Key = { SHIFT: "Shift", CONTEXT_MENU: "ContextMenu", + COMMA: ",", LESS_THAN: "<", GREATER_THAN: ">", BACKTICK: "`", SPACE: " ", + A: "a", B: "b", + C: "c", + D: "d", + E: "e", + F: "f", + G: "g", + H: "h", I: "i", + J: "j", K: "k", + L: "l", + M: "m", + N: "n", + O: "o", + P: "p", + Q: "q", + R: "r", + S: "s", + T: "t", + U: "u", + V: "v", + W: "w", + X: "x", Y: "y", Z: "z", }; diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js index 145203136a..15bb1e046b 100644 --- a/src/async-components/views/dialogs/EncryptedEventDialog.js +++ b/src/async-components/views/dialogs/EncryptedEventDialog.js @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +import {Key} from "../../../Keyboard"; + const React = require("react"); import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; @@ -83,7 +85,7 @@ module.exports = createReactClass({ }, onKeyDown: function(e) { - if (e.keyCode === 27) { // escape + if (e.key === Key.ESCAPE) { e.stopPropagation(); e.preventDefault(); this.props.onFinished(false); diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 2fbd19c428..123ed7c4e1 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -25,7 +25,7 @@ import Unread from '../../Unread'; import * as RoomNotifs from '../../RoomNotifs'; import * as FormattingUtils from '../../utils/FormattingUtils'; import IndicatorScrollbar from './IndicatorScrollbar'; -import {Key, KeyCode} from '../../Keyboard'; +import {Key} from '../../Keyboard'; import { Group } from 'matrix-js-sdk'; import PropTypes from 'prop-types'; import RoomTile from "../views/rooms/RoomTile"; @@ -186,7 +186,7 @@ export default class RoomSubList extends React.PureComponent { dis.dispatch({ action: 'view_room', room_id: roomId, - clear_search: (ev && (ev.keyCode === KeyCode.ENTER || ev.keyCode === KeyCode.SPACE)), + clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)), }); }; diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 8c05acf60a..739519a2b3 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -44,7 +44,7 @@ import ObjectUtils from '../../ObjectUtils'; import * as Rooms from '../../Rooms'; import eventSearch from '../../Searching'; -import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard'; +import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard'; import MainSplit from './MainSplit'; import RightPanel from './RightPanel'; @@ -561,15 +561,15 @@ module.exports = createReactClass({ let handled = false; const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev); - switch (ev.keyCode) { - case KeyCode.KEY_D: + switch (ev.key) { + case Key.D: if (ctrlCmdOnly) { this.onMuteAudioClick(); handled = true; } break; - case KeyCode.KEY_E: + case Key.E: if (ctrlCmdOnly) { this.onMuteVideoClick(); handled = true; diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js index 17583a22ed..f289720542 100644 --- a/src/components/structures/ScrollPanel.js +++ b/src/components/structures/ScrollPanel.js @@ -17,7 +17,7 @@ limitations under the License. import React, {createRef} from "react"; import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; -import { KeyCode } from '../../Keyboard'; +import { Key } from '../../Keyboard'; import Timer from '../../utils/Timer'; import AutoHideScrollbar from "./AutoHideScrollbar"; @@ -532,26 +532,26 @@ module.exports = createReactClass({ * @param {object} ev the keyboard event */ handleScrollKey: function(ev) { - switch (ev.keyCode) { - case KeyCode.PAGE_UP: + switch (ev.key) { + case Key.PAGE_UP: if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { this.scrollRelative(-1); } break; - case KeyCode.PAGE_DOWN: + case Key.PAGE_DOWN: if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { this.scrollRelative(1); } break; - case KeyCode.HOME: + case Key.HOME: if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { this.scrollToTop(); } break; - case KeyCode.END: + case Key.END: if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { this.scrollToBottom(); } diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js index 0aa2e15f4c..9090152de8 100644 --- a/src/components/structures/SearchBox.js +++ b/src/components/structures/SearchBox.js @@ -18,7 +18,7 @@ limitations under the License. import React, {createRef} from 'react'; import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; -import { KeyCode } from '../../Keyboard'; +import { Key } from '../../Keyboard'; import dis from '../../dispatcher'; import { throttle } from 'lodash'; import AccessibleButton from '../../components/views/elements/AccessibleButton'; @@ -93,8 +93,8 @@ module.exports = createReactClass({ }, 200, {trailing: true, leading: true}), _onKeyDown: function(ev) { - switch (ev.keyCode) { - case KeyCode.ESCAPE: + switch (ev.key) { + case Key.ESCAPE: this._clearSearch("keyboard"); break; } diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index 41283b5308..9d929d313b 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -34,7 +34,7 @@ const dis = require("../../dispatcher"); const ObjectUtils = require('../../ObjectUtils'); const Modal = require("../../Modal"); const UserActivity = require("../../UserActivity"); -import { KeyCode } from '../../Keyboard'; +import {Key} from '../../Keyboard'; import Timer from '../../utils/Timer'; import shouldHideEvent from '../../shouldHideEvent'; import EditorStateTransfer from '../../utils/EditorStateTransfer'; @@ -942,8 +942,7 @@ const TimelinePanel = createReactClass({ // jump to the live timeline on ctrl-end, rather than the end of the // timeline window. - if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey && - ev.keyCode == KeyCode.END) { + if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey && ev.key === Key.END) { this.jumpToLiveTimeline(); } else { this._messagePanel.current.handleScrollKey(ev); diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 2be505a798..988d22b113 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -32,6 +32,7 @@ import IdentityAuthClient from '../../../IdentityAuthClient'; import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from '../../../utils/IdentityServerUtils'; import { abbreviateUrl } from '../../../utils/UrlUtils'; import {sleep} from "../../../utils/promise"; +import {Key} from "../../../Keyboard"; const TRUNCATE_QUERY_LIST = 40; const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200; @@ -142,27 +143,27 @@ module.exports = createReactClass({ }, onKeyDown: function(e) { - if (e.keyCode === 27) { // escape + if (e.key === Key.ESCAPE) { e.stopPropagation(); e.preventDefault(); this.props.onFinished(false); - } else if (e.keyCode === 38) { // up arrow + } else if (e.key === Key.ARROW_UP) { e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.moveSelectionUp(); - } else if (e.keyCode === 40) { // down arrow + } else if (e.key === Key.ARROW_DOWN) { e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.moveSelectionDown(); - } else if (this.state.suggestedList.length > 0 && (e.keyCode === 188 || e.keyCode === 13 || e.keyCode === 9)) { // comma or enter or tab + } else if (this.state.suggestedList.length > 0 && [Key.COMMA, Key.ENTER, Key.TAB].includes(e.key)) { e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.chooseSelection(); - } else if (this._textinput.current.value.length === 0 && this.state.selectedList.length && e.keyCode === 8) { // backspace + } else if (this._textinput.current.value.length === 0 && this.state.selectedList.length && e.key === Key.BACKSPACE) { e.stopPropagation(); e.preventDefault(); this.onDismissed(this.state.selectedList.length - 1)(); - } else if (e.keyCode === 13) { // enter + } else if (e.key === Key.ENTER) { e.stopPropagation(); e.preventDefault(); if (this._textinput.current.value === '') { @@ -171,7 +172,7 @@ module.exports = createReactClass({ } else { this._addAddressesToList([this._textinput.current.value]); } - } else if (e.keyCode === 188 || e.keyCode === 9) { // comma or tab + } else if (e.key === Key.COMMA || e.key === Key.TAB) { e.stopPropagation(); e.preventDefault(); this._addAddressesToList([this._textinput.current.value]); diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js index f7aae7c6da..6ba0b322c4 100644 --- a/src/components/views/dialogs/BaseDialog.js +++ b/src/components/views/dialogs/BaseDialog.js @@ -24,7 +24,7 @@ import classNames from 'classnames'; import { MatrixClient } from 'matrix-js-sdk'; -import { KeyCode } from '../../../Keyboard'; +import { Key } from '../../../Keyboard'; import AccessibleButton from '../elements/AccessibleButton'; import MatrixClientPeg from '../../../MatrixClientPeg'; import { _t } from "../../../languageHandler"; @@ -102,7 +102,7 @@ export default createReactClass({ if (this.props.onKeyDown) { this.props.onKeyDown(e); } - if (this.props.hasCancel && e.keyCode === KeyCode.ESCAPE) { + if (this.props.hasCancel && e.key === Key.ESCAPE) { e.stopPropagation(); e.preventDefault(); this.props.onFinished(false); diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js index 0294c1c700..b3c6cc9378 100644 --- a/src/components/views/dialogs/SetMxIdDialog.js +++ b/src/components/views/dialogs/SetMxIdDialog.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import sdk from '../../../index'; import MatrixClientPeg from '../../../MatrixClientPeg'; import classnames from 'classnames'; -import { KeyCode } from '../../../Keyboard'; +import { Key } from '../../../Keyboard'; import { _t } from '../../../languageHandler'; import { SAFE_LOCALPART_REGEX } from '../../../Registration'; @@ -101,7 +101,7 @@ export default createReactClass({ }, onKeyUp: function(ev) { - if (ev.keyCode === KeyCode.ENTER) { + if (ev.key === Key.ENTER) { this.onSubmit(); } }, diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js index 1ccb7d0796..d708a44ab2 100644 --- a/src/components/views/elements/AccessibleButton.js +++ b/src/components/views/elements/AccessibleButton.js @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { KeyCode } from '../../../Keyboard'; +import {Key} from '../../../Keyboard'; /** * AccessibleButton is a generic wrapper for any element that should be treated @@ -40,23 +40,23 @@ export default function AccessibleButton(props) { // Browsers handle space and enter keypresses differently and we are only adjusting to the // inconsistencies here restProps.onKeyDown = function(e) { - if (e.keyCode === KeyCode.ENTER) { + if (e.key === Key.ENTER) { e.stopPropagation(); e.preventDefault(); return onClick(e); } - if (e.keyCode === KeyCode.SPACE) { + if (e.key === Key.SPACE) { e.stopPropagation(); e.preventDefault(); } }; restProps.onKeyUp = function(e) { - if (e.keyCode === KeyCode.SPACE) { + if (e.key === Key.SPACE) { e.stopPropagation(); e.preventDefault(); return onClick(e); } - if (e.keyCode === KeyCode.ENTER) { + if (e.key === Key.ENTER) { e.stopPropagation(); e.preventDefault(); } diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js index b2f6d0abbb..2b27c27e78 100644 --- a/src/components/views/elements/ImageView.js +++ b/src/components/views/elements/ImageView.js @@ -28,6 +28,7 @@ const AccessibleButton = require('../../../components/views/elements/AccessibleB const Modal = require('../../../Modal'); const sdk = require('../../../index'); import { _t } from '../../../languageHandler'; +import {Key} from "../../../Keyboard"; export default class ImageView extends React.Component { static propTypes = { @@ -62,7 +63,7 @@ export default class ImageView extends React.Component { } onKeyDown = (ev) => { - if (ev.keyCode === 27) { // escape + if (ev.key === Key.ESCAPE) { ev.stopPropagation(); ev.preventDefault(); this.props.onFinished(); diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js index 4a6c560d2c..ac803bb23d 100644 --- a/src/components/views/rooms/ForwardMessage.js +++ b/src/components/views/rooms/ForwardMessage.js @@ -20,7 +20,7 @@ import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; import { _t } from '../../../languageHandler'; import dis from '../../../dispatcher'; -import { KeyCode } from '../../../Keyboard'; +import {Key} from '../../../Keyboard'; module.exports = createReactClass({ @@ -52,8 +52,8 @@ module.exports = createReactClass({ }, _onKeyDown: function(ev) { - switch (ev.keyCode) { - case KeyCode.ESCAPE: + switch (ev.key) { + case Key.ESCAPE: this.props.onCancelClick(); break; } diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index cc92f7c750..a5d8492d99 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -33,7 +33,7 @@ import classNames from 'classnames'; import MatrixClientPeg from '../../../MatrixClientPeg'; import type {MatrixClient} from 'matrix-js-sdk/lib/matrix'; import {processCommandInput} from '../../../SlashCommands'; -import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard'; +import { isOnlyCtrlOrCmdKeyEvent, Key} from '../../../Keyboard'; import Modal from '../../../Modal'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; @@ -608,12 +608,12 @@ export default class MessageComposerInput extends React.Component { // Navigate autocomplete list with arrow keys if (this.autocomplete.countCompletions() > 0) { if (!(ev.ctrlKey || ev.shiftKey || ev.altKey || ev.metaKey)) { - switch (ev.keyCode) { - case KeyCode.UP: + switch (ev.key) { + case Key.ARROW_UP: this.autocomplete.moveSelection(-1); ev.preventDefault(); return true; - case KeyCode.DOWN: + case Key.ARROW_DOWN: this.autocomplete.moveSelection(+1); ev.preventDefault(); return true; @@ -623,38 +623,38 @@ export default class MessageComposerInput extends React.Component { // skip void nodes - see // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095 - if (ev.keyCode === KeyCode.LEFT) { + if (ev.key === Key.ARROW_LEFT) { this.direction = 'Previous'; - } else if (ev.keyCode === KeyCode.RIGHT) { + } else if (ev.key === Key.ARROW_RIGHT) { this.direction = 'Next'; } - switch (ev.keyCode) { - case KeyCode.ENTER: + switch (ev.key) { + case Key.ENTER: return this.handleReturn(ev, change); - case KeyCode.BACKSPACE: + case Key.BACKSPACE: return this.onBackspace(ev, change); - case KeyCode.UP: + case Key.ARROW_UP: return this.onVerticalArrow(ev, true); - case KeyCode.DOWN: + case Key.ARROW_DOWN: return this.onVerticalArrow(ev, false); - case KeyCode.TAB: + case Key.TAB: return this.onTab(ev); - case KeyCode.ESCAPE: + case Key.ESCAPE: return this.onEscape(ev); - case KeyCode.SPACE: + case Key.SPACE: return this.onSpace(ev, change); } if (isOnlyCtrlOrCmdKeyEvent(ev)) { const ctrlCmdCommand = { // C-m => Toggles between rich text and markdown modes - [KeyCode.KEY_M]: 'toggle-mode', - [KeyCode.KEY_B]: 'bold', - [KeyCode.KEY_I]: 'italic', - [KeyCode.KEY_U]: 'underlined', - [KeyCode.KEY_J]: 'inline-code', - }[ev.keyCode]; + [Key.M]: 'toggle-mode', + [Key.B]: 'bold', + [Key.I]: 'italic', + [Key.U]: 'underlined', + [Key.J]: 'inline-code', + }[ev.key]; if (ctrlCmdCommand) { ev.preventDefault(); // to prevent clashing with Mac's minimize window diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js index 492c29a621..33697e8828 100644 --- a/src/components/views/rooms/SearchBar.js +++ b/src/components/views/rooms/SearchBar.js @@ -19,6 +19,7 @@ import createReactClass from 'create-react-class'; const classNames = require('classnames'); const AccessibleButton = require('../../../components/views/elements/AccessibleButton'); import { _t } from '../../../languageHandler'; +import {Key} from "../../../Keyboard"; module.exports = createReactClass({ displayName: 'SearchBar', @@ -42,11 +43,13 @@ module.exports = createReactClass({ }, onSearchChange: function(e) { - if (e.keyCode === 13) { // on enter... - this.onSearch(); - } - if (e.keyCode === 27) { // escape... - this.props.onCancelClick(); + switch (e.key) { + case Key.ENTER: + this.onSearch(); + break; + case Key.ESCAPE: + this.props.onCancelClick(); + break; } }, diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js index 1ab17ca8a0..e97d9d4c64 100644 --- a/src/components/views/settings/IntegrationManager.js +++ b/src/components/views/settings/IntegrationManager.js @@ -20,6 +20,7 @@ import PropTypes from 'prop-types'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; import dis from '../../../dispatcher'; +import {Key} from "../../../Keyboard"; export default class IntegrationManager extends React.Component { static propTypes = { @@ -52,7 +53,7 @@ export default class IntegrationManager extends React.Component { } onKeyDown = (ev) => { - if (ev.keyCode === 27) { // escape + if (ev.key === Key.ESCAPE) { ev.stopPropagation(); ev.preventDefault(); this.props.onFinished(); From 3b0f8233e8eb82b861e0a2f6bec4d1fb7afea788 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 17:22:00 +0000 Subject: [PATCH 053/239] delint --- src/components/views/dialogs/AddressPickerDialog.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 988d22b113..ede261b81b 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -143,6 +143,8 @@ module.exports = createReactClass({ }, onKeyDown: function(e) { + const textInput = this._textinput.current ? this._textinput.current.value : undefined; + if (e.key === Key.ESCAPE) { e.stopPropagation(); e.preventDefault(); @@ -159,23 +161,23 @@ module.exports = createReactClass({ e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.chooseSelection(); - } else if (this._textinput.current.value.length === 0 && this.state.selectedList.length && e.key === Key.BACKSPACE) { + } else if (textInput.length === 0 && this.state.selectedList.length && e.key === Key.BACKSPACE) { e.stopPropagation(); e.preventDefault(); this.onDismissed(this.state.selectedList.length - 1)(); } else if (e.key === Key.ENTER) { e.stopPropagation(); e.preventDefault(); - if (this._textinput.current.value === '') { + if (textInput === '') { // if there's nothing in the input box, submit the form this.onButtonClick(); } else { - this._addAddressesToList([this._textinput.current.value]); + this._addAddressesToList([textInput]); } } else if (e.key === Key.COMMA || e.key === Key.TAB) { e.stopPropagation(); e.preventDefault(); - this._addAddressesToList([this._textinput.current.value]); + this._addAddressesToList([textInput]); } }, From eaabe351d90de943d21dd990ce427e04e5ce2ba0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 16 Dec 2019 17:23:56 +0000 Subject: [PATCH 054/239] Stop trapping tab in AddressPickerDialog --- src/components/views/dialogs/AddressPickerDialog.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 2be505a798..ea7a0b626e 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -142,6 +142,8 @@ module.exports = createReactClass({ }, onKeyDown: function(e) { + const textInput = this._textinput.current ? this._textinput.current.value : undefined; + if (e.keyCode === 27) { // escape e.stopPropagation(); e.preventDefault(); @@ -158,23 +160,23 @@ module.exports = createReactClass({ e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.chooseSelection(); - } else if (this._textinput.current.value.length === 0 && this.state.selectedList.length && e.keyCode === 8) { // backspace + } else if (textInput.length === 0 && this.state.selectedList.length && e.keyCode === 8) { // backspace e.stopPropagation(); e.preventDefault(); this.onDismissed(this.state.selectedList.length - 1)(); } else if (e.keyCode === 13) { // enter e.stopPropagation(); e.preventDefault(); - if (this._textinput.current.value === '') { + if (textInput === '') { // if there's nothing in the input box, submit the form this.onButtonClick(); } else { - this._addAddressesToList([this._textinput.current.value]); + this._addAddressesToList([textInput]); } - } else if (e.keyCode === 188 || e.keyCode === 9) { // comma or tab + } else if (textInput && (e.keyCode === 188 || e.keyCode === 9)) { // comma or tab e.stopPropagation(); e.preventDefault(); - this._addAddressesToList([this._textinput.current.value]); + this._addAddressesToList([textInput]); } }, From eb5ebaf7547ddcc16e5500081b135862aab33b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Mon, 16 Dec 2019 12:19:22 +0000 Subject: [PATCH 055/239] Translated using Weblate (French) Currently translated at 100.0% (2001 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index f4e2a86e77..96f2337229 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2008,5 +2008,12 @@ "Hide verified sessions": "Masquer les sessions vérifiées", "%(count)s verified sessions|other": "%(count)s sessions vérifiées", "%(count)s verified sessions|one": "1 session vérifiée", - "Close preview": "Fermer l’aperçu" + "Close preview": "Fermer l’aperçu", + "This user has not verified all of their devices.": "Cet utilisateur n'a pas vérifié tous ses appareils.", + "You have not verified this user. This user has verified all of their devices.": "Vous n'avez pas vérifié cet utilisateur. Cet utilisateur a vérifié tous ses appareils.", + "You have verified this user. This user has verified all of their devices.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié tous ses appareils.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Certains utilisateurs dans ce salon chiffré n’ont pas été vérifiés par vous ou n’ont pas vérifié leurs propres appareils.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.", + "Language Dropdown": "Sélection de la langue", + "Country Dropdown": "Sélection du pays" } From b2a1a409613d0479cbf1b15498c6f69bd64cf173 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 16 Dec 2019 16:47:33 -0700 Subject: [PATCH 056/239] Fix room directory maintaining and error state Fixes https://github.com/vector-im/riot-web/issues/11665 We weren't clearing the error from a previous lookup, which effectively prevented the UI from working after an error happened. --- src/components/structures/RoomDirectory.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js index 4823b0976c..2c885f7eb2 100644 --- a/src/components/structures/RoomDirectory.js +++ b/src/components/structures/RoomDirectory.js @@ -270,6 +270,7 @@ module.exports = createReactClass({ roomServer: server, instanceId: instanceId, includeAll: includeAll, + error: null, }, this.refreshRoomList); // We also refresh the room list each time even though this // filtering is client-side. It hopefully won't be client side From 284a1fdde797e55e2a465a81a270a55a385d7aec Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Tue, 17 Dec 2019 03:40:47 +0000 Subject: [PATCH 057/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1998 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 829af63542..cea6d8d70d 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2008,5 +2008,12 @@ "Secure your encrypted messages with a passphrase": "使用密碼保護您的加密訊息", "Storing secrets...": "正在儲存秘密……", "Unable to set up secret storage": "無法設定秘密儲存空間", - "Close preview": "關閉預覽" + "Close preview": "關閉預覽", + "This user has not verified all of their devices.": "這個使用者尚未驗證所有裝置。", + "You have not verified this user. This user has verified all of their devices.": "您尚未驗證此使用者。此使用者已驗證所有裝置。", + "You have verified this user. This user has verified all of their devices.": "您已驗證此使用者。此使用者已驗證所有裝置。", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "在此已加密的聊天室中的某些使用者尚未被您驗證，或是他們尚未驗證他們的裝置。", + "All users in this encrypted room are verified by you and they have verified their own devices.": "在此已加密的聊天室中的所有使用者已被您驗證，他們也已驗證所有裝置。", + "Language Dropdown": "語言下拉式選單", + "Country Dropdown": "國家下拉式選單" } From a7a7a9cb2349d58d252624e48c31dc91d885fdd5 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Tue, 17 Dec 2019 05:48:28 +0000 Subject: [PATCH 058/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (1998 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 0b094d86af..0faf20937b 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2009,5 +2009,12 @@ "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "A jelmondat megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.", "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "A visszaállítási kulcs megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.", "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Biztonsági tárolót fogunk használni, hogy tárolhassuk a kereszt-aláíráshoz tartozó azonosítót titkosított formában, amivel más eszközöket és üzenet kulcsokat lehet ellenőrizni. Védd a titkosított üzenetekhez való hozzáférést jelmondattal és azt tartsd titokban.", - "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "A biztonsági tároló beállítása nélkül ha kijelentkezel és egy másik eszközön lépsz be nem fogsz hozzáférni a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz." + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "A biztonsági tároló beállítása nélkül ha kijelentkezel és egy másik eszközön lépsz be nem fogsz hozzáférni a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.", + "This user has not verified all of their devices.": "Ez a felhasználó még ellenőrizte az összes eszközét.", + "You have not verified this user. This user has verified all of their devices.": "Ezt a felhasználót még nem ellenőrizted. Minden eszközét ellenőrizte ez a felhasználó.", + "You have verified this user. This user has verified all of their devices.": "Ezt a felhasználót ellenőrizted. Minden eszközét ellenőrizte ez a felhasználó.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Néhány felhasználót még nem ellenőriztél ebben a titkosított szobában vagy még ők nem ellenőrizték az összes eszközüket.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Minden felhasználót ellenőriztél ebben a titkosított szobában és ők ellenőrizték az összes eszközüket.", + "Language Dropdown": "Nyelvválasztó lenyíló menü", + "Country Dropdown": "Ország lenyíló menü" } From 17463c401faa42dba7cdc50586cde8e42ad96b3d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 09:58:04 +0000 Subject: [PATCH 059/239] post-merge fix --- src/components/views/dialogs/AddressPickerDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index ede261b81b..f32cc40a96 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -174,7 +174,7 @@ module.exports = createReactClass({ } else { this._addAddressesToList([textInput]); } - } else if (e.key === Key.COMMA || e.key === Key.TAB) { + } else if (textInput && (e.key === Key.COMMA || e.key === Key.TAB)) { e.stopPropagation(); e.preventDefault(); this._addAddressesToList([textInput]); From c1133ebfc6f43e2fe5e4d0bd872e38383edac0b6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 14:05:51 +0000 Subject: [PATCH 060/239] null-guard useIsEncrypted --- src/components/views/right_panel/UserInfo.js | 4 ++-- src/hooks/useEventEmitter.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 90bb3f3dcb..d1d7aa0371 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -109,14 +109,14 @@ function openDMForUser(matrixClient, userId) { } function useIsEncrypted(cli, room) { - const [isEncrypted, setIsEncrypted] = useState(cli.isRoomEncrypted(room.roomId)); + const [isEncrypted, setIsEncrypted] = useState(room ? cli.isRoomEncrypted(room.roomId) : undefined); const update = useCallback((event) => { if (event.getType() === "m.room.encryption") { setIsEncrypted(cli.isRoomEncrypted(room.roomId)); } }, [cli, room]); - useEventEmitter(room.currentState, "RoomState.events", update); + useEventEmitter(room ? room.currentState : undefined, "RoomState.events", update); return isEncrypted; } diff --git a/src/hooks/useEventEmitter.js b/src/hooks/useEventEmitter.js index 56676bf871..7adc6ef2e3 100644 --- a/src/hooks/useEventEmitter.js +++ b/src/hooks/useEventEmitter.js @@ -28,6 +28,9 @@ export const useEventEmitter = (emitter, eventName, handler) => { useEffect( () => { + // allow disabling this hook by passing a falsy emitter + if (!emitter) return; + // Create event listener that calls handler function stored in ref const eventListener = event => savedHandler.current(event); From 213bc4c3ac610726331040460c309e6c1ea5035f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 14:28:18 +0000 Subject: [PATCH 061/239] Fix Field validation tooltip sticking if blurred before async validation resolved --- src/components/views/elements/Field.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js index 0a737d963a..bdbf32333e 100644 --- a/src/components/views/elements/Field.js +++ b/src/components/views/elements/Field.js @@ -66,10 +66,14 @@ export default class Field extends React.PureComponent { this.state = { valid: undefined, feedback: undefined, + focused: false, }; } onFocus = (ev) => { + this.setState({ + focused: true, + }); this.validate({ focused: true, }); @@ -88,6 +92,9 @@ export default class Field extends React.PureComponent { }; onBlur = (ev) => { + this.setState({ + focused: false, + }); this.validate({ focused: false, }); @@ -112,7 +119,8 @@ export default class Field extends React.PureComponent { allowEmpty, }); - if (feedback) { + // this method is async and we may have been blurred since validate was called so check + if (this.state.focused && feedback) { this.setState({ valid, feedback, From 0e86c2648d3c248650fdd4cec731331ea0a95039 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 14:36:20 +0000 Subject: [PATCH 062/239] improve comment --- src/components/views/elements/Field.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js index bdbf32333e..cee33205d7 100644 --- a/src/components/views/elements/Field.js +++ b/src/components/views/elements/Field.js @@ -119,7 +119,8 @@ export default class Field extends React.PureComponent { allowEmpty, }); - // this method is async and we may have been blurred since validate was called so check + // this method is async and so we may have been blurred since the method was called + // if we have then hide the feedback as withValidation does if (this.state.focused && feedback) { this.setState({ valid, From 7f78f55c94660368df8af43de1fda607dd813d44 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 15:14:01 +0000 Subject: [PATCH 063/239] Dropdown stop keyboard propagation if key handled --- src/components/views/elements/Dropdown.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js index 67a8663b3e..292cc67444 100644 --- a/src/components/views/elements/Dropdown.js +++ b/src/components/views/elements/Dropdown.js @@ -94,8 +94,6 @@ export default class Dropdown extends React.Component { this._onRootClick = this._onRootClick.bind(this); this._onDocumentClick = this._onDocumentClick.bind(this); this._onMenuOptionClick = this._onMenuOptionClick.bind(this); - this._onInputKeyPress = this._onInputKeyPress.bind(this); - this._onInputKeyUp = this._onInputKeyUp.bind(this); this._onInputChange = this._onInputChange.bind(this); this._collectRoot = this._collectRoot.bind(this); this._collectInputTextBox = this._collectInputTextBox.bind(this); @@ -193,19 +191,14 @@ export default class Dropdown extends React.Component { this.props.onOptionChange(dropdownKey); } - _onInputKeyPress(e) { - // This needs to be on the keypress event because otherwise it can't cancel the form submission - if (e.key === Key.ENTER) { - e.preventDefault(); - } - } + _onInputKeyDown = (e) => { + let handled = true; - _onInputKeyUp(e) { // These keys don't generate keypress events and so needs to be on keyup switch (e.key) { case Key.ENTER: this.props.onOptionChange(this.state.highlightedOption); - // fallthrough + // fallthrough case Key.ESCAPE: this._close(); break; @@ -219,6 +212,13 @@ export default class Dropdown extends React.Component { highlightedOption: this._prevOption(this.state.highlightedOption), }); break; + default: + handled = false; + } + + if (handled) { + e.preventDefault(); + e.stopPropagation(); } } @@ -314,8 +314,7 @@ export default class Dropdown extends React.Component { type="text" className="mx_Dropdown_option" ref={this._collectInputTextBox} - onKeyPress={this._onInputKeyPress} - onKeyUp={this._onInputKeyUp} + onKeyDown={this._onInputKeyDown} onChange={this._onInputChange} value={this.state.searchQuery} role="combobox" From 16181ff0ed1c527432d840efa41a669cd69083c1 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 17 Dec 2019 09:47:06 -0700 Subject: [PATCH 064/239] Fix right panel for multiple member info viewings Fixes https://github.com/vector-im/riot-web/issues/11663 Member info is special because it has parameters associated with it. What was happening was the RightPanelStore was seeing that it was already on member info and deciding to hide the pane instead. What we do now is consider any phase change with parameters (such as the user to pass to member info) as a proper phase change. --- src/stores/RightPanelStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js index 37e7498141..02775b847b 100644 --- a/src/stores/RightPanelStore.js +++ b/src/stores/RightPanelStore.js @@ -154,7 +154,7 @@ export default class RightPanelStore extends Store { }); } } else { - if (targetPhase === this._state.lastRoomPhase) { + if (targetPhase === this._state.lastRoomPhase && !payload.refireParams) { this._setState({ showRoomPanel: !this._state.showRoomPanel, }); From 2e8d66fa3635c6f7bd97be1362d4f5f86f42865b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 16:54:59 +0000 Subject: [PATCH 065/239] Null-guard member mention pills for rooms you have left (notif panel) --- src/components/views/elements/Pill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index 12830488b1..a065602f68 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -127,7 +127,7 @@ const Pill = createReactClass({ } break; case Pill.TYPE_USER_MENTION: { - const localMember = nextProps.room.getMember(resourceId); + const localMember = nextProps.room ? nextProps.room.getMember(resourceId) : undefined; member = localMember; if (!localMember) { member = new RoomMember(null, resourceId); From 937b32663c49c7cd69c211b83df52e56a61b352f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 17:26:12 +0000 Subject: [PATCH 066/239] Migrate away from Legacy React Contexts --- src/components/structures/EmbeddedPage.js | 8 +- src/components/structures/LeftPanel.js | 5 - src/components/structures/LoggedInView.js | 55 ++- src/components/structures/MatrixChat.js | 10 - src/components/structures/MyGroups.js | 9 +- src/components/structures/RightPanel.js | 18 +- src/components/structures/RoomDirectory.js | 11 +- src/components/structures/RoomView.js | 99 ++--- src/components/structures/TagPanel.js | 21 +- src/components/views/avatars/BaseAvatar.js | 10 +- .../avatars/MemberStatusMessageAvatar.js | 4 +- .../GroupInviteTileContextMenu.js | 4 +- .../context_menus/StatusMessageContextMenu.js | 4 +- .../views/context_menus/TagTileContextMenu.js | 8 +- src/components/views/dialogs/BaseDialog.js | 73 ++- .../views/dialogs/BugReportDialog.js | 4 +- .../views/dialogs/DeactivateAccountDialog.js | 4 +- .../views/dialogs/DevtoolsDialog.js | 131 +++--- .../views/dialogs/ReportEventDialog.js | 4 +- .../views/elements/EditableTextContainer.js | 6 +- src/components/views/elements/Flair.js | 13 +- src/components/views/elements/Pill.js | 34 +- src/components/views/elements/ReplyThread.js | 17 +- .../views/elements/SyntaxHighlight.js | 4 +- src/components/views/elements/TagTile.js | 10 +- .../views/groups/GroupInviteTile.js | 10 +- .../views/groups/GroupMemberInfo.js | 12 +- .../views/groups/GroupMemberTile.js | 8 +- src/components/views/groups/GroupRoomInfo.js | 8 +- src/components/views/groups/GroupRoomTile.js | 8 +- src/components/views/groups/GroupTile.js | 9 +- .../views/groups/GroupUserSettings.js | 9 +- src/components/views/messages/MFileBody.js | 10 +- src/components/views/messages/MImageBody.js | 20 +- .../views/messages/MessageActionBar.js | 10 +- .../views/messages/SenderProfile.js | 14 +- src/components/views/right_panel/UserInfo.js | 414 +++++++++--------- .../room_settings/RelatedGroupSettings.js | 11 +- .../views/rooms/BasicMessageComposer.js | 4 +- .../views/rooms/EditMessageComposer.js | 17 +- src/components/views/rooms/EventTile.js | 23 +- src/components/views/rooms/MemberInfo.js | 79 ++-- src/components/views/rooms/MessageComposer.js | 8 +- .../views/rooms/MessageComposerInput.js | 4 +- src/components/views/rooms/ReplyPreview.js | 4 +- .../views/rooms/SendMessageComposer.js | 16 +- .../views/rooms/SlateMessageComposer.js | 8 +- src/components/views/settings/DevicesPanel.js | 4 +- .../views/settings/DevicesPanelEntry.js | 4 +- .../tabs/room/GeneralRoomSettingsTab.js | 21 +- .../tabs/user/FlairUserSettingsTab.js | 17 - .../MatrixClientContext.js} | 18 +- src/contexts/RoomContext.js | 25 ++ .../structures/MessagePanel-test.js | 23 +- test/test-utils.js | 17 +- 55 files changed, 651 insertions(+), 750 deletions(-) rename src/{utils/withLegacyMatrixClient.js => contexts/MatrixClientContext.js} (51%) create mode 100644 src/contexts/RoomContext.js diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js index ecc01a443d..63767255e2 100644 --- a/src/components/structures/EmbeddedPage.js +++ b/src/components/structures/EmbeddedPage.js @@ -26,8 +26,8 @@ import sanitizeHtml from 'sanitize-html'; import sdk from '../../index'; import dis from '../../dispatcher'; import MatrixClientPeg from '../../MatrixClientPeg'; -import { MatrixClient } from 'matrix-js-sdk'; import classnames from 'classnames'; +import MatrixClientContext from "../../contexts/MatrixClientContext"; export default class EmbeddedPage extends React.PureComponent { static propTypes = { @@ -39,9 +39,7 @@ export default class EmbeddedPage extends React.PureComponent { scrollbar: PropTypes.bool, }; - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; + static contextType = MatrixClientContext; constructor(props) { super(props); @@ -104,7 +102,7 @@ export default class EmbeddedPage extends React.PureComponent { render() { // HACK: Workaround for the context's MatrixClient not updating. - const client = this.context.matrixClient || MatrixClientPeg.get(); + const client = this.context || MatrixClientPeg.get(); const isGuest = client ? client.isGuest() : true; const className = this.props.className; const classes = classnames({ diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index a0ad2b5c81..dd842be1ac 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -19,7 +19,6 @@ import React from 'react'; import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { MatrixClient } from 'matrix-js-sdk'; import { Key } from '../../Keyboard'; import sdk from '../../index'; import dis from '../../dispatcher'; @@ -39,10 +38,6 @@ const LeftPanel = createReactClass({ collapsed: PropTypes.bool.isRequired, }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), - }, - getInitialState: function() { return { searchFilter: '', diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js index df2eebd7c9..7261af3bf0 100644 --- a/src/components/structures/LoggedInView.js +++ b/src/components/structures/LoggedInView.js @@ -38,6 +38,7 @@ import TagOrderActions from '../../actions/TagOrderActions'; import RoomListActions from '../../actions/RoomListActions'; import ResizeHandle from '../views/elements/ResizeHandle'; import {Resizer, CollapseDistributor} from '../../resizer'; +import MatrixClientContext from "../../contexts/MatrixClientContext"; // We need to fetch each pinned message individually (if we don't already have it) // so each pinned message may trigger a request. Limit the number per room for sanity. // NB. this is just for server notices rather than pinned messages in general. @@ -77,21 +78,6 @@ const LoggedInView = createReactClass({ // and lots and lots of other stuff. }, - childContextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), - authCache: PropTypes.object, - }, - - getChildContext: function() { - return { - matrixClient: this._matrixClient, - authCache: { - auth: {}, - lastUpdate: 0, - }, - }; - }, - getInitialState: function() { return { // use compact timeline view @@ -631,21 +617,30 @@ const LoggedInView = createReactClass({ } return ( -
    - { topBar } - - -
    - - - { pageElement } -
    -     -
    + +
    + { topBar } + + +
    + + + { pageElement } +
    +     +
    +     ); }, }); diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 82a682f9ab..d9ff16d2f8 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -150,16 +150,6 @@ export default createReactClass({ makeRegistrationUrl: PropTypes.func.isRequired, }, - childContextTypes: { - appConfig: PropTypes.object, - }, - - getChildContext: function() { - return { - appConfig: this.props.config, - }; - }, - getInitialState: function() { const s = { // the master view we are showing. diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js index 63ae14ba09..d957e76dfb 100644 --- a/src/components/structures/MyGroups.js +++ b/src/components/structures/MyGroups.js @@ -17,12 +17,11 @@ limitations under the License. import React from 'react'; import createReactClass from 'create-react-class'; -import PropTypes from 'prop-types'; -import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../index'; import { _t } from '../../languageHandler'; import dis from '../../dispatcher'; import AccessibleButton from '../views/elements/AccessibleButton'; +import MatrixClientContext from "../../contexts/MatrixClientContext"; export default createReactClass({ displayName: 'MyGroups', @@ -34,8 +33,8 @@ export default createReactClass({ }; }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, + statics: { + contextType: MatrixClientContext, }, componentWillMount: function() { @@ -47,7 +46,7 @@ export default createReactClass({ }, _fetch: function() { - this.context.matrixClient.getJoinedGroups().then((result) => { + this.context.getJoinedGroups().then((result) => { this.setState({groups: result.groups, error: null}); }, (err) => { if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') { diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js index 1745c9d7dc..7bd3172faa 100644 --- a/src/components/structures/RightPanel.js +++ b/src/components/structures/RightPanel.js @@ -23,13 +23,13 @@ import PropTypes from 'prop-types'; import classNames from 'classnames'; import sdk from '../../index'; import dis from '../../dispatcher'; -import { MatrixClient } from 'matrix-js-sdk'; import RateLimitedFunc from '../../ratelimitedfunc'; import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker'; import GroupStore from '../../stores/GroupStore'; import SettingsStore from "../../settings/SettingsStore"; import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases"; import RightPanelStore from "../../stores/RightPanelStore"; +import MatrixClientContext from "../../contexts/MatrixClientContext"; export default class RightPanel extends React.Component { static get propTypes() { @@ -40,14 +40,10 @@ export default class RightPanel extends React.Component { }; } - static get contextTypes() { - return { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; - } + static contextType = MatrixClientContext; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { phase: this._getPhaseFromProps(), isUserPrivilegedInGroup: null, @@ -93,15 +89,15 @@ export default class RightPanel extends React.Component { componentWillMount() { this.dispatcherRef = dis.register(this.onAction); - const cli = this.context.matrixClient; + const cli = this.context; cli.on("RoomState.members", this.onRoomStateMember); this._initGroupStore(this.props.groupId); } componentWillUnmount() { dis.unregister(this.dispatcherRef); - if (this.context.matrixClient) { - this.context.matrixClient.removeListener("RoomState.members", this.onRoomStateMember); + if (this.context) { + this.context.removeListener("RoomState.members", this.onRoomStateMember); } this._unregisterGroupStore(this.props.groupId); } diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js index 2c885f7eb2..cec016c3cf 100644 --- a/src/components/structures/RoomDirectory.js +++ b/src/components/structures/RoomDirectory.js @@ -30,6 +30,7 @@ import PropTypes from 'prop-types'; import { _t } from '../../languageHandler'; import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils'; import Analytics from '../../Analytics'; +import MatrixClientContext from "../../contexts/MatrixClientContext"; const MAX_NAME_LENGTH = 80; const MAX_TOPIC_LENGTH = 160; @@ -65,16 +66,6 @@ module.exports = createReactClass({ }; }, - childContextTypes: { - matrixClient: PropTypes.object, - }, - - getChildContext: function() { - return { - matrixClient: MatrixClientPeg.get(), - }; - }, - componentWillMount: function() { this._unmounted = false; this.nextBatch = null; diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 739519a2b3..8d59e42c3e 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -28,7 +28,6 @@ import createReactClass from 'create-react-class'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import {Room} from "matrix-js-sdk"; import { _t } from '../../languageHandler'; import {RoomPermalinkCreator} from '../../utils/permalinks/Permalinks'; @@ -55,6 +54,7 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore"; import WidgetUtils from '../../utils/WidgetUtils'; import AccessibleButton from "../views/elements/AccessibleButton"; import RightPanelStore from "../../stores/RightPanelStore"; +import RoomContext from "../../contexts/RoomContext"; const DEBUG = false; let debuglog = function() {}; @@ -66,12 +66,6 @@ if (DEBUG) { debuglog = console.log.bind(console); } -const RoomContext = PropTypes.shape({ - canReact: PropTypes.bool.isRequired, - canReply: PropTypes.bool.isRequired, - room: PropTypes.instanceOf(Room), -}); - module.exports = createReactClass({ displayName: 'RoomView', propTypes: { @@ -169,21 +163,6 @@ module.exports = createReactClass({ }; }, - childContextTypes: { - room: RoomContext, - }, - - getChildContext: function() { - const {canReact, canReply, room} = this.state; - return { - room: { - canReact, - canReply, - room, - }, - }; - }, - componentWillMount: function() { this.dispatcherRef = dis.register(this.onAction); MatrixClientPeg.get().on("Room", this.onRoom); @@ -1989,45 +1968,47 @@ module.exports = createReactClass({ : null; return ( -
    - - - -
    - {auxPanel} -
    - {topUnreadMessagesBar} - {jumpToBottom} - {messagePanel} - {searchResultsPanel} -
    -
    -
    -
    - {statusBar} + +
    + + + +
    + {auxPanel} +
    + {topUnreadMessagesBar} + {jumpToBottom} + {messagePanel} + {searchResultsPanel}
    +
    +
    +
    + {statusBar} +
    +
    + {previewBar} + {messageComposer}
    - {previewBar} - {messageComposer} -
    -     -     -
    + + +
    + ); }, }); diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index a758092dc8..081796cb85 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -16,8 +16,6 @@ limitations under the License. import React from 'react'; import createReactClass from 'create-react-class'; -import PropTypes from 'prop-types'; -import { MatrixClient } from 'matrix-js-sdk'; import TagOrderStore from '../../stores/TagOrderStore'; import GroupActions from '../../actions/GroupActions'; @@ -28,12 +26,13 @@ import { _t } from '../../languageHandler'; import { Droppable } from 'react-beautiful-dnd'; import classNames from 'classnames'; +import MatrixClientContext from "../../contexts/MatrixClientContext"; const TagPanel = createReactClass({ displayName: 'TagPanel', - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), + statics: { + contextType: MatrixClientContext, }, getInitialState() { @@ -45,8 +44,8 @@ const TagPanel = createReactClass({ componentWillMount: function() { this.unmounted = false; - this.context.matrixClient.on("Group.myMembership", this._onGroupMyMembership); - this.context.matrixClient.on("sync", this._onClientSync); + this.context.on("Group.myMembership", this._onGroupMyMembership); + this.context.on("sync", this._onClientSync); this._tagOrderStoreToken = TagOrderStore.addListener(() => { if (this.unmounted) { @@ -58,13 +57,13 @@ const TagPanel = createReactClass({ }); }); // This could be done by anything with a matrix client - dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient)); + dis.dispatch(GroupActions.fetchJoinedGroups(this.context)); }, componentWillUnmount() { this.unmounted = true; - this.context.matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership); - this.context.matrixClient.removeListener("sync", this._onClientSync); + this.context.removeListener("Group.myMembership", this._onGroupMyMembership); + this.context.removeListener("sync", this._onClientSync); if (this._filterStoreToken) { this._filterStoreToken.remove(); } @@ -72,7 +71,7 @@ const TagPanel = createReactClass({ _onGroupMyMembership() { if (this.unmounted) return; - dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient)); + dis.dispatch(GroupActions.fetchJoinedGroups(this.context)); }, _onClientSync(syncState, prevState) { @@ -81,7 +80,7 @@ const TagPanel = createReactClass({ const reconnected = syncState !== "ERROR" && prevState !== syncState; if (reconnected) { // Load joined groups - dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient)); + dis.dispatch(GroupActions.fetchJoinedGroups(this.context)); } }, diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js index 82db78615e..51375eb3fa 100644 --- a/src/components/views/avatars/BaseAvatar.js +++ b/src/components/views/avatars/BaseAvatar.js @@ -19,10 +19,10 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import { MatrixClient } from 'matrix-js-sdk'; import AvatarLogic from '../../../Avatar'; import SettingsStore from "../../../settings/SettingsStore"; import AccessibleButton from '../elements/AccessibleButton'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; module.exports = createReactClass({ displayName: 'BaseAvatar', @@ -40,8 +40,8 @@ module.exports = createReactClass({ defaultToInitialLetter: PropTypes.bool, // true to add default url }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), + statics: { + contextType: MatrixClientContext, }, getDefaultProps: function() { @@ -59,12 +59,12 @@ module.exports = createReactClass({ componentDidMount() { this.unmounted = false; - this.context.matrixClient.on('sync', this.onClientSync); + this.context.on('sync', this.onClientSync); }, componentWillUnmount() { this.unmounted = true; - this.context.matrixClient.removeListener('sync', this.onClientSync); + this.context.removeListener('sync', this.onClientSync); }, componentWillReceiveProps: function(nextProps) { diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js index ed73dd33b9..245d869419 100644 --- a/src/components/views/avatars/MemberStatusMessageAvatar.js +++ b/src/components/views/avatars/MemberStatusMessageAvatar.js @@ -38,8 +38,8 @@ export default class MemberStatusMessageAvatar extends React.Component { resizeMethod: 'crop', }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { hasStatus: this.hasStatus, diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js index 3feffbc0d9..3c0fd081b4 100644 --- a/src/components/views/context_menus/GroupInviteTileContextMenu.js +++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js @@ -31,8 +31,8 @@ export default class GroupInviteTileContextMenu extends React.Component { onFinished: PropTypes.func, }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._onClickReject = this._onClickReject.bind(this); } diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js index 441220c95e..31ba788ec7 100644 --- a/src/components/views/context_menus/StatusMessageContextMenu.js +++ b/src/components/views/context_menus/StatusMessageContextMenu.js @@ -27,8 +27,8 @@ export default class StatusMessageContextMenu extends React.Component { user: PropTypes.object, }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { message: this.comittedStatusMessage, diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js index 1af0c9ae66..388d8aaf3d 100644 --- a/src/components/views/context_menus/TagTileContextMenu.js +++ b/src/components/views/context_menus/TagTileContextMenu.js @@ -17,12 +17,12 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; -import { MatrixClient } from 'matrix-js-sdk'; import { _t } from '../../../languageHandler'; import dis from '../../../dispatcher'; import TagOrderActions from '../../../actions/TagOrderActions'; import sdk from '../../../index'; import {MenuItem} from "../../structures/ContextMenu"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; export default class TagTileContextMenu extends React.Component { static propTypes = { @@ -31,9 +31,7 @@ export default class TagTileContextMenu extends React.Component { onFinished: PropTypes.func.isRequired, }; - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; + static contextType = MatrixClientContext; constructor() { super(); @@ -51,7 +49,7 @@ export default class TagTileContextMenu extends React.Component { } _onRemoveClick() { - dis.dispatch(TagOrderActions.removeTag(this.context.matrixClient, this.props.tag)); + dis.dispatch(TagOrderActions.removeTag(this.context, this.props.tag)); this.props.onFinished(); } diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js index 6ba0b322c4..a9f7fbf4b3 100644 --- a/src/components/views/dialogs/BaseDialog.js +++ b/src/components/views/dialogs/BaseDialog.js @@ -22,12 +22,11 @@ import FocusLock from 'react-focus-lock'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { MatrixClient } from 'matrix-js-sdk'; - import { Key } from '../../../Keyboard'; import AccessibleButton from '../elements/AccessibleButton'; import MatrixClientPeg from '../../../MatrixClientPeg'; import { _t } from "../../../languageHandler"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; /** * Basic container for modal dialogs. @@ -84,16 +83,6 @@ export default createReactClass({ }; }, - childContextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), - }, - - getChildContext: function() { - return { - matrixClient: this._matrixClient, - }; - }, - componentWillMount() { this._matrixClient = MatrixClientPeg.get(); }, @@ -122,36 +111,38 @@ export default createReactClass({ } return ( - -
    -
    - { this.props.title } + + +
    +
    + { this.props.title } +
    + { this.props.headerButton } + { cancelButton }
    - { this.props.headerButton } - { cancelButton } -
    - { this.props.children } - + { this.props.children } + + ); }, }); diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js index a3c4ad96ee..91d2bb5213 100644 --- a/src/components/views/dialogs/BugReportDialog.js +++ b/src/components/views/dialogs/BugReportDialog.js @@ -25,8 +25,8 @@ import Modal from '../../../Modal'; import { _t } from '../../../languageHandler'; export default class BugReportDialog extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { sendLogs: true, busy: false, diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js index 703ecaf092..fc7669e1fe 100644 --- a/src/components/views/dialogs/DeactivateAccountDialog.js +++ b/src/components/views/dialogs/DeactivateAccountDialog.js @@ -25,8 +25,8 @@ import * as Lifecycle from '../../../Lifecycle'; import { _t } from '../../../languageHandler'; export default class DeactivateAccountDialog extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._onOk = this._onOk.bind(this); this._onCancel = this._onCancel.bind(this); diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js index 9327e1e54e..c9ed71466d 100644 --- a/src/components/views/dialogs/DevtoolsDialog.js +++ b/src/components/views/dialogs/DevtoolsDialog.js @@ -16,23 +16,19 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; +import { Room } from "matrix-js-sdk"; + import sdk from '../../../index'; import SyntaxHighlight from '../elements/SyntaxHighlight'; import { _t } from '../../../languageHandler'; -import MatrixClientPeg from '../../../MatrixClientPeg'; import Field from "../elements/Field"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; -class DevtoolsComponent extends React.Component { - static contextTypes = { - roomId: PropTypes.string.isRequired, - }; -} - -class GenericEditor extends DevtoolsComponent { +class GenericEditor extends React.PureComponent { // static propTypes = {onBack: PropTypes.func.isRequired}; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._onChange = this._onChange.bind(this); this.onBack = this.onBack.bind(this); } @@ -67,12 +63,15 @@ class SendCustomEvent extends GenericEditor { static propTypes = { onBack: PropTypes.func.isRequired, + room: PropTypes.instanceOf(Room).isRequired, forceStateEvent: PropTypes.bool, inputs: PropTypes.object, }; - constructor(props, context) { - super(props, context); + static contextType = MatrixClientContext; + + constructor(props) { + super(props); this._send = this._send.bind(this); const {eventType, stateKey, evContent} = Object.assign({ @@ -91,11 +90,11 @@ class SendCustomEvent extends GenericEditor { } send(content) { - const cli = MatrixClientPeg.get(); + const cli = this.context; if (this.state.isStateEvent) { - return cli.sendStateEvent(this.context.roomId, this.state.eventType, content, this.state.stateKey); + return cli.sendStateEvent(this.props.room.roomId, this.state.eventType, content, this.state.stateKey); } else { - return cli.sendEvent(this.context.roomId, this.state.eventType, content); + return cli.sendEvent(this.props.room.roomId, this.state.eventType, content); } } @@ -154,13 +153,16 @@ class SendAccountData extends GenericEditor { static getLabel() { return _t('Send Account Data'); } static propTypes = { + room: PropTypes.instanceOf(Room).isRequired, isRoomAccountData: PropTypes.bool, forceMode: PropTypes.bool, inputs: PropTypes.object, }; - constructor(props, context) { - super(props, context); + static contextType = MatrixClientContext; + + constructor(props) { + super(props); this._send = this._send.bind(this); const {eventType, evContent} = Object.assign({ @@ -177,9 +179,9 @@ class SendAccountData extends GenericEditor { } send(content) { - const cli = MatrixClientPeg.get(); + const cli = this.context; if (this.state.isRoomAccountData) { - return cli.setRoomAccountData(this.context.roomId, this.state.eventType, content); + return cli.setRoomAccountData(this.props.room.roomId, this.state.eventType, content); } return cli.setAccountData(this.state.eventType, content); } @@ -234,7 +236,7 @@ class SendAccountData extends GenericEditor { const INITIAL_LOAD_TILES = 20; const LOAD_TILES_STEP_SIZE = 50; -class FilteredList extends React.Component { +class FilteredList extends React.PureComponent { static propTypes = { children: PropTypes.any, query: PropTypes.string, @@ -247,8 +249,8 @@ class FilteredList extends React.Component { return children.filter((child) => child.key.toLowerCase().includes(lcQuery)); } - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { filteredChildren: FilteredList.filterChildren(this.props.children, this.props.query), @@ -305,19 +307,20 @@ class FilteredList extends React.Component { } } -class RoomStateExplorer extends DevtoolsComponent { +class RoomStateExplorer extends React.PureComponent { static getLabel() { return _t('Explore Room State'); } - static propTypes = { onBack: PropTypes.func.isRequired, + room: PropTypes.instanceOf(Room).isRequired, }; - constructor(props, context) { - super(props, context); + static contextType = MatrixClientContext; - const room = MatrixClientPeg.get().getRoom(this.context.roomId); - this.roomStateEvents = room.currentState.events; + constructor(props) { + super(props); + + this.roomStateEvents = this.props.room.currentState.events; this.onBack = this.onBack.bind(this); this.editEv = this.editEv.bind(this); @@ -373,7 +376,7 @@ class RoomStateExplorer extends DevtoolsComponent { render() { if (this.state.event) { if (this.state.editing) { - return ; + return ; } return
    @@ -553,17 +562,20 @@ class AccountDataExplorer extends DevtoolsComponent { } } -class ServersInRoomList extends DevtoolsComponent { +class ServersInRoomList extends React.PureComponent { static getLabel() { return _t('View Servers in Room'); } static propTypes = { onBack: PropTypes.func.isRequired, + room: PropTypes.instanceOf(Room).isRequired, }; - constructor(props, context) { - super(props, context); + static contextType = MatrixClientContext; - const room = MatrixClientPeg.get().getRoom(this.context.roomId); + constructor(props) { + super(props); + + const room = this.props.room; const servers = new Set(); room.currentState.getStateEvents("m.room.member").forEach(ev => servers.add(ev.getSender().split(":")[1])); this.servers = Array.from(servers).map(s => @@ -602,19 +614,14 @@ const Entries = [ ServersInRoomList, ]; -export default class DevtoolsDialog extends React.Component { - static childContextTypes = { - roomId: PropTypes.string.isRequired, - // client: PropTypes.instanceOf(MatixClient), - }; - +export default class DevtoolsDialog extends React.PureComponent { static propTypes = { roomId: PropTypes.string.isRequired, onFinished: PropTypes.func.isRequired, }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.onBack = this.onBack.bind(this); this.onCancel = this.onCancel.bind(this); @@ -627,10 +634,6 @@ export default class DevtoolsDialog extends React.Component { this._unmounted = true; } - getChildContext() { - return { roomId: this.props.roomId }; - } - _setMode(mode) { return () => { this.setState({ mode }); @@ -654,15 +657,17 @@ export default class DevtoolsDialog extends React.Component { let body; if (this.state.mode) { - body =
    -
    { this.state.mode.getLabel() }
    -
    Room ID: { this.props.roomId }
    -
    - -
    ; + body = + {(cli) => +
    { this.state.mode.getLabel() }
    +
    Room ID: { this.props.roomId }
    +
    + + } + ; } else { const classes = "mx_DevTools_RoomStateExplorer_button"; - body =
    + body =
    { _t('Toolbox') }
    Room ID: { this.props.roomId }
    @@ -679,7 +684,7 @@ export default class DevtoolsDialog extends React.Component {
    -
    ; +     ; } const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js index 394e5ad47d..af140f6e18 100644 --- a/src/components/views/dialogs/ReportEventDialog.js +++ b/src/components/views/dialogs/ReportEventDialog.js @@ -30,8 +30,8 @@ export default class ReportEventDialog extends PureComponent { onFinished: PropTypes.func.isRequired, }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { reason: "", diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js index 5cba98470c..3d656e6b79 100644 --- a/src/components/views/elements/EditableTextContainer.js +++ b/src/components/views/elements/EditableTextContainer.js @@ -25,13 +25,13 @@ import sdk from '../../../index'; * Parent components should supply an 'onSubmit' callback which returns a * promise; a spinner is shown until the promise resolves. * - * The parent can also supply a 'getIntialValue' callback, which works in a + * The parent can also supply a 'getInitialValue' callback, which works in a * similarly asynchronous way. If this is not provided, the initial value is * taken from the 'initialValue' property. */ export default class EditableTextContainer extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._unmounted = false; this.state = { diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js index 0b9dabeae6..ef208bbea9 100644 --- a/src/components/views/elements/Flair.js +++ b/src/components/views/elements/Flair.js @@ -21,6 +21,7 @@ import PropTypes from 'prop-types'; import {MatrixClient} from 'matrix-js-sdk'; import FlairStore from '../../../stores/FlairStore'; import dis from '../../../dispatcher'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; class FlairAvatar extends React.Component { @@ -40,7 +41,7 @@ class FlairAvatar extends React.Component { } render() { - const httpUrl = this.context.matrixClient.mxcUrlToHttp( + const httpUrl = this.context.mxcUrlToHttp( this.props.groupProfile.avatarUrl, 16, 16, 'scale', false); const tooltip = this.props.groupProfile.name ? `${this.props.groupProfile.name} (${this.props.groupProfile.groupId})`: @@ -62,9 +63,7 @@ FlairAvatar.propTypes = { }), }; -FlairAvatar.contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, -}; +FlairAvatar.contextType = MatrixClientContext; export default class Flair extends React.Component { constructor() { @@ -92,7 +91,7 @@ export default class Flair extends React.Component { for (const groupId of groups) { let groupProfile = null; try { - groupProfile = await FlairStore.getGroupProfileCached(this.context.matrixClient, groupId); + groupProfile = await FlairStore.getGroupProfileCached(this.context, groupId); } catch (err) { console.error('Could not get profile for group', groupId, err); } @@ -134,6 +133,4 @@ Flair.propTypes = { groups: PropTypes.arrayOf(PropTypes.string), }; -Flair.contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, -}; +Flair.contextType = MatrixClientContext; diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index a065602f68..99005de03b 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -20,12 +20,13 @@ import createReactClass from 'create-react-class'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import classNames from 'classnames'; -import { Room, RoomMember, MatrixClient } from 'matrix-js-sdk'; +import { Room, RoomMember } from 'matrix-js-sdk'; import PropTypes from 'prop-types'; import MatrixClientPeg from '../../../MatrixClientPeg'; import { getDisplayAliasForRoom } from '../../../Rooms'; import FlairStore from "../../../stores/FlairStore"; import {getPrimaryPermalinkEntity} from "../../../utils/permalinks/Permalinks"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; // For URLs of matrix.to links in the timeline which have been reformatted by // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`) @@ -66,17 +67,6 @@ const Pill = createReactClass({ isSelected: PropTypes.bool, }, - - childContextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), - }, - - getChildContext() { - return { - matrixClient: this._matrixClient, - }; - }, - getInitialState() { return { // ID/alias of the room/user @@ -276,15 +266,17 @@ const Pill = createReactClass({ }); if (this.state.pillType) { - return this.props.inMessage ? - - { avatar } - { linkText } - : - - { avatar } - { linkText } - ; + return + { this.props.inMessage ? + + { avatar } + { linkText } + : + + { avatar } + { linkText } + } + ; } else { // Deliberately render nothing if the URL isn't recognised return null; diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js index 55fd028980..e7832efca7 100644 --- a/src/components/views/elements/ReplyThread.js +++ b/src/components/views/elements/ReplyThread.js @@ -21,10 +21,11 @@ import {_t} from '../../../languageHandler'; import PropTypes from 'prop-types'; import dis from '../../../dispatcher'; import {wantsDateSeparator} from '../../../DateUtils'; -import {MatrixEvent, MatrixClient} from 'matrix-js-sdk'; +import {MatrixEvent} from 'matrix-js-sdk'; import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks"; import SettingsStore from "../../../settings/SettingsStore"; import escapeHtml from "escape-html"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; // This component does no cycle detection, simply because the only way to make such a cycle would be to // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would @@ -38,12 +39,10 @@ export default class ReplyThread extends React.Component { permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired, }; - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, - }; + static contextType = MatrixClientContext; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { // The loaded events to be rendered as linear-replies @@ -187,7 +186,7 @@ export default class ReplyThread extends React.Component { componentWillMount() { this.unmounted = false; - this.room = this.context.matrixClient.getRoom(this.props.parentEv.getRoomId()); + this.room = this.context.getRoom(this.props.parentEv.getRoomId()); this.room.on("Room.redaction", this.onRoomRedaction); // same event handler as Room.redaction as for both we just do forceUpdate this.room.on("Room.redactionCancelled", this.onRoomRedaction); @@ -259,7 +258,7 @@ export default class ReplyThread extends React.Component { try { // ask the client to fetch the event we want using the context API, only interface to do so is to ask // for a timeline with that event, but once it is loaded we can use findEventById to look up the ev map - await this.context.matrixClient.getEventTimeline(this.room.getUnfilteredTimelineSet(), eventId); + await this.context.getEventTimeline(this.room.getUnfilteredTimelineSet(), eventId); } catch (e) { // if it fails catch the error and return early, there's no point trying to find the event in this case. // Return null as it is falsey and thus should be treated as an error (as the event cannot be resolved). @@ -300,7 +299,7 @@ export default class ReplyThread extends React.Component { } else if (this.state.loadedEv) { const ev = this.state.loadedEv; const Pill = sdk.getComponent('elements.Pill'); - const room = this.context.matrixClient.getRoom(ev.getRoomId()); + const room = this.context.getRoom(ev.getRoomId()); header =
    { _t('In reply to ', {}, { diff --git a/src/components/views/elements/SyntaxHighlight.js b/src/components/views/elements/SyntaxHighlight.js index 82b5ae572c..bce65cf1a9 100644 --- a/src/components/views/elements/SyntaxHighlight.js +++ b/src/components/views/elements/SyntaxHighlight.js @@ -24,8 +24,8 @@ export default class SyntaxHighlight extends React.Component { children: PropTypes.node, }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._ref = this._ref.bind(this); } diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js index 767980f0a0..c57d973086 100644 --- a/src/components/views/elements/TagTile.js +++ b/src/components/views/elements/TagTile.js @@ -20,7 +20,6 @@ import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; import classNames from 'classnames'; -import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import {_t} from '../../../languageHandler'; @@ -31,6 +30,7 @@ import FlairStore from '../../../stores/FlairStore'; import GroupStore from '../../../stores/GroupStore'; import TagOrderStore from '../../../stores/TagOrderStore'; import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; // A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents // a thing to click on for the user to filter the visible rooms in the RoomList to: @@ -46,8 +46,8 @@ export default createReactClass({ tag: PropTypes.string, }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, + statics: { + contextType: MatrixClientContext, }, getInitialState() { @@ -81,7 +81,7 @@ export default createReactClass({ _onFlairStoreUpdated() { if (this.unmounted) return; FlairStore.getGroupProfileCached( - this.context.matrixClient, + this.context, this.props.tag, ).then((profile) => { if (this.unmounted) return; @@ -145,7 +145,7 @@ export default createReactClass({ const name = profile.name || this.props.tag; const avatarHeight = 40; - const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp( + const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp( profile.avatarUrl, avatarHeight, avatarHeight, "crop", ) : null; diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js index a21b091145..c0d0d9eafe 100644 --- a/src/components/views/groups/GroupInviteTile.js +++ b/src/components/views/groups/GroupInviteTile.js @@ -19,13 +19,13 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import {_t} from '../../../languageHandler'; import classNames from 'classnames'; import MatrixClientPeg from "../../../MatrixClientPeg"; import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; // XXX this class copies a lot from RoomTile.js export default createReactClass({ @@ -35,8 +35,8 @@ export default createReactClass({ group: PropTypes.object.isRequired, }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), + statics: { + contextType: MatrixClientContext, }, getInitialState: function() { @@ -58,7 +58,7 @@ export default createReactClass({ onMouseEnter: function() { const state = {hover: true}; // Only allow non-guests to access the context menu - if (!this.context.matrixClient.isGuest()) { + if (!this.context.isGuest()) { state.badgeHover = true; } this.setState(state); @@ -118,7 +118,7 @@ export default createReactClass({ const groupName = this.props.group.name || this.props.group.groupId; const httpAvatarUrl = this.props.group.avatarUrl ? - this.context.matrixClient.mxcUrlToHttp(this.props.group.avatarUrl, 24, 24) : null; + this.context.mxcUrlToHttp(this.props.group.avatarUrl, 24, 24) : null; const av = ; diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js index 3dac90fc35..eb90cdc0f8 100644 --- a/src/components/views/groups/GroupMemberInfo.js +++ b/src/components/views/groups/GroupMemberInfo.js @@ -18,7 +18,6 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import { MatrixClient } from 'matrix-js-sdk'; import dis from '../../../dispatcher'; import Modal from '../../../Modal'; import sdk from '../../../index'; @@ -26,12 +25,13 @@ import { _t } from '../../../languageHandler'; import { GroupMemberType } from '../../../groups'; import GroupStore from '../../../stores/GroupStore'; import AccessibleButton from '../elements/AccessibleButton'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; module.exports = createReactClass({ displayName: 'GroupMemberInfo', - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), + statics: { + contextType: MatrixClientContext, }, propTypes: { @@ -85,7 +85,7 @@ module.exports = createReactClass({ _onKick: function() { const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); Modal.createDialog(ConfirmUserActionDialog, { - matrixClient: this.context.matrixClient, + matrixClient: this.context, groupMember: this.props.groupMember, action: this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community'), title: this.state.isUserInvited ? _t('Disinvite this user from community?') @@ -95,7 +95,7 @@ module.exports = createReactClass({ if (!proceed) return; this.setState({removingUser: true}); - this.context.matrixClient.removeUserFromGroup( + this.context.removeUserFromGroup( this.props.groupId, this.props.groupMember.userId, ).then(() => { // return to the user list @@ -171,7 +171,7 @@ module.exports = createReactClass({ const avatarUrl = this.props.groupMember.avatarUrl; let avatarElement; if (avatarUrl) { - const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl, 800, 800); + const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800); avatarElement = (
    ); diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js index c4b41d23ce..7a9ba9289b 100644 --- a/src/components/views/groups/GroupMemberTile.js +++ b/src/components/views/groups/GroupMemberTile.js @@ -19,10 +19,10 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import { GroupMemberType } from '../../../groups'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; export default createReactClass({ displayName: 'GroupMemberTile', @@ -36,8 +36,8 @@ export default createReactClass({ return {}; }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, + statics: { + contextType: MatrixClientContext, }, onClick: function(e) { @@ -53,7 +53,7 @@ export default createReactClass({ const EntityTile = sdk.getComponent('rooms.EntityTile'); const name = this.props.member.displayname || this.props.member.userId; - const avatarUrl = this.context.matrixClient.mxcUrlToHttp( + const avatarUrl = this.context.mxcUrlToHttp( this.props.member.avatarUrl, 36, 36, 'crop', ); diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js index f9f7324e23..d5b8759a67 100644 --- a/src/components/views/groups/GroupRoomInfo.js +++ b/src/components/views/groups/GroupRoomInfo.js @@ -17,18 +17,18 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import { MatrixClient } from 'matrix-js-sdk'; import dis from '../../../dispatcher'; import Modal from '../../../Modal'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; import GroupStore from '../../../stores/GroupStore'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; module.exports = createReactClass({ displayName: 'GroupRoomInfo', - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), + statics: { + contextType: MatrixClientContext, }, propTypes: { @@ -206,7 +206,7 @@ module.exports = createReactClass({ const avatarUrl = this.state.groupRoom.avatarUrl; let avatarElement; if (avatarUrl) { - const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl, 800, 800); + const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800); avatarElement = (
    ); diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js index ae325d4796..527e65d30c 100644 --- a/src/components/views/groups/GroupRoomTile.js +++ b/src/components/views/groups/GroupRoomTile.js @@ -17,10 +17,10 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import {MatrixClient} from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import { GroupRoomType } from '../../../groups'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; const GroupRoomTile = createReactClass({ displayName: 'GroupRoomTile', @@ -41,7 +41,7 @@ const GroupRoomTile = createReactClass({ render: function() { const BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const avatarUrl = this.context.matrixClient.mxcUrlToHttp( + const avatarUrl = this.context.mxcUrlToHttp( this.props.groupRoom.avatarUrl, 36, 36, 'crop', ); @@ -66,9 +66,7 @@ const GroupRoomTile = createReactClass({ }, }); -GroupRoomTile.contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, -}; +GroupRoomTile.contextType = MatrixClientContext; export default GroupRoomTile; diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js index 3b64c10a1e..a6447cdf14 100644 --- a/src/components/views/groups/GroupTile.js +++ b/src/components/views/groups/GroupTile.js @@ -22,6 +22,7 @@ import { Draggable, Droppable } from 'react-beautiful-dnd'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import FlairStore from '../../../stores/FlairStore'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; function nop() {} @@ -37,8 +38,8 @@ const GroupTile = createReactClass({ draggable: PropTypes.bool, }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, + statics: { + contextType: MatrixClientContext, }, getInitialState() { @@ -56,7 +57,7 @@ const GroupTile = createReactClass({ }, componentWillMount: function() { - FlairStore.getGroupProfileCached(this.context.matrixClient, this.props.groupId).then((profile) => { + FlairStore.getGroupProfileCached(this.context, this.props.groupId).then((profile) => { this.setState({profile}); }).catch((err) => { console.error('Error whilst getting cached profile for GroupTile', err); @@ -80,7 +81,7 @@ const GroupTile = createReactClass({ const descElement = this.props.showDescription ?
    { profile.shortDescription }
    :
    ; - const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp( + const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp( profile.avatarUrl, avatarHeight, avatarHeight, "crop") : null; let avatarElement = ( diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js index 3cd5731b99..297c0fbd30 100644 --- a/src/components/views/groups/GroupUserSettings.js +++ b/src/components/views/groups/GroupUserSettings.js @@ -15,17 +15,16 @@ limitations under the License. */ import React from 'react'; -import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; import sdk from '../../../index'; -import { MatrixClient } from 'matrix-js-sdk'; import { _t } from '../../../languageHandler'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; export default createReactClass({ displayName: 'GroupUserSettings', - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient), + statics: { + contextType: MatrixClientContext, }, getInitialState() { @@ -36,7 +35,7 @@ export default createReactClass({ }, componentWillMount: function() { - this.context.matrixClient.getJoinedGroups().then((result) => { + this.context.getJoinedGroups().then((result) => { this.setState({groups: result.groups || [], error: null}); }, (err) => { console.error(err); diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js index 552b1108d2..6045ec0571 100644 --- a/src/components/views/messages/MFileBody.js +++ b/src/components/views/messages/MFileBody.js @@ -26,6 +26,7 @@ import {decryptFile} from '../../../utils/DecryptFile'; import Tinter from '../../../Tinter'; import request from 'browser-request'; import Modal from '../../../Modal'; +import SdkConfig from "../../../SdkConfig"; // A cached tinted copy of require("../../../../res/img/download.svg") @@ -214,10 +215,6 @@ module.exports = createReactClass({ tileShape: PropTypes.string, }, - contextTypes: { - appConfig: PropTypes.object, - }, - /** * Extracts a human readable label for the file attachment to use as * link text. @@ -360,8 +357,9 @@ module.exports = createReactClass({ // If the attachment is encryped then put the link inside an iframe. let renderer_url = DEFAULT_CROSS_ORIGIN_RENDERER; - if (this.context.appConfig && this.context.appConfig.cross_origin_renderer_url) { - renderer_url = this.context.appConfig.cross_origin_renderer_url; + const appConfig = SdkConfig.get(); + if (appConfig && appConfig.cross_origin_renderer_url) { + renderer_url = appConfig.cross_origin_renderer_url; } renderer_url += "?origin=" + encodeURIComponent(window.location.origin); return ( diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 427056203d..dbe6636c6b 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -18,7 +18,6 @@ limitations under the License. import React, {createRef} from 'react'; import PropTypes from 'prop-types'; -import { MatrixClient } from 'matrix-js-sdk'; import MFileBody from './MFileBody'; import Modal from '../../../Modal'; @@ -26,6 +25,7 @@ import sdk from '../../../index'; import { decryptFile } from '../../../utils/DecryptFile'; import { _t } from '../../../languageHandler'; import SettingsStore from "../../../settings/SettingsStore"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; export default class MImageBody extends React.Component { static propTypes = { @@ -39,9 +39,7 @@ export default class MImageBody extends React.Component { maxImageHeight: PropTypes.number, }; - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; + static contextType = MatrixClientContext; constructor(props) { super(props); @@ -71,7 +69,7 @@ export default class MImageBody extends React.Component { componentWillMount() { this.unmounted = false; - this.context.matrixClient.on('sync', this.onClientSync); + this.context.on('sync', this.onClientSync); } // FIXME: factor this out and aplpy it to MVideoBody and MAudioBody too! @@ -174,7 +172,7 @@ export default class MImageBody extends React.Component { if (content.file !== undefined) { return this.state.decryptedUrl; } else { - return this.context.matrixClient.mxcUrlToHttp(content.url); + return this.context.mxcUrlToHttp(content.url); } } @@ -198,7 +196,7 @@ export default class MImageBody extends React.Component { // special case to return clientside sender-generated thumbnails for SVGs, if any, // given we deliberately don't thumbnail them serverside to prevent // billion lol attacks and similar - return this.context.matrixClient.mxcUrlToHttp( + return this.context.mxcUrlToHttp( content.info.thumbnail_url, thumbWidth, thumbHeight, @@ -221,7 +219,7 @@ export default class MImageBody extends React.Component { pixelRatio === 1.0 || (!info || !info.w || !info.h || !info.size) ) { - return this.context.matrixClient.mxcUrlToHttp(content.url, thumbWidth, thumbHeight); + return this.context.mxcUrlToHttp(content.url, thumbWidth, thumbHeight); } else { // we should only request thumbnails if the image is bigger than 800x600 // (or 1600x1200 on retina) otherwise the image in the timeline will just @@ -242,7 +240,7 @@ export default class MImageBody extends React.Component { // image is too large physically and bytewise to clutter our timeline so // we ask for a thumbnail, despite knowing that it will be max 800x600 // despite us being retina (as synapse doesn't do 1600x1200 thumbs yet). - return this.context.matrixClient.mxcUrlToHttp( + return this.context.mxcUrlToHttp( content.url, thumbWidth, thumbHeight, @@ -251,7 +249,7 @@ export default class MImageBody extends React.Component { // download the original image otherwise, so we can scale it client side // to take pixelRatio into account. // ( no width/height means we want the original image) - return this.context.matrixClient.mxcUrlToHttp( + return this.context.mxcUrlToHttp( content.url, ); } @@ -308,7 +306,7 @@ export default class MImageBody extends React.Component { componentWillUnmount() { this.unmounted = true; - this.context.matrixClient.removeListener('sync', this.onClientSync); + this.context.removeListener('sync', this.onClientSync); this._afterComponentWillUnmount(); if (this.state.decryptedUrl) { diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js index 81e806cf62..29ade3cb3f 100644 --- a/src/components/views/messages/MessageActionBar.js +++ b/src/components/views/messages/MessageActionBar.js @@ -25,7 +25,7 @@ import dis from '../../../dispatcher'; import Modal from '../../../Modal'; import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu'; import { isContentActionable, canEditContent } from '../../../utils/EventUtils'; -import {RoomContext} from "../../structures/RoomView"; +import RoomContext from "../../../contexts/RoomContext"; const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => { const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu(); @@ -117,9 +117,7 @@ export default class MessageActionBar extends React.PureComponent { onFocusChange: PropTypes.func, }; - static contextTypes = { - room: RoomContext, - }; + static contextType = RoomContext; componentDidMount() { this.props.mxEvent.on("Event.decrypted", this.onDecrypted); @@ -164,12 +162,12 @@ export default class MessageActionBar extends React.PureComponent { let editButton; if (isContentActionable(this.props.mxEvent)) { - if (this.context.room.canReact) { + if (this.context.canReact) { reactButton = ( ); } - if (this.context.room.canReply) { + if (this.context.canReply) { replyButton = { if (this.unmounted) return; this.setState({userGroups}); }); - this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents); + this.context.on('RoomState.events', this.onRoomStateEvents); }, componentWillUnmount() { this.unmounted = true; - this.context.matrixClient.removeListener('RoomState.events', this.onRoomStateEvents); + this.context.removeListener('RoomState.events', this.onRoomStateEvents); }, onRoomStateEvents(event) { @@ -71,7 +71,7 @@ export default createReactClass({ _updateRelatedGroups() { if (this.unmounted) return; - const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId()); + const room = this.context.getRoom(this.props.mxEvent.getRoomId()); if (!room) return; const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', ''); diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index d1d7aa0371..e952f8fad9 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, {useCallback, useMemo, useState, useEffect} from 'react'; +import React, {useCallback, useMemo, useState, useEffect, useContext} from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import {Group, RoomMember, User} from 'matrix-js-sdk'; @@ -37,9 +37,9 @@ import MultiInviter from "../../../utils/MultiInviter"; import GroupStore from "../../../stores/GroupStore"; import MatrixClientPeg from "../../../MatrixClientPeg"; import E2EIcon from "../rooms/E2EIcon"; -import withLegacyMatrixClient from "../../../utils/withLegacyMatrixClient"; import {useEventEmitter} from "../../../hooks/useEventEmitter"; import {textualPowerLevel} from '../../../Roles'; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; const _disambiguateDevices = (devices) => { const names = Object.create(null); @@ -203,7 +203,9 @@ function DevicesSection({devices, userId, loading}) { ); } -const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, isIgnored, canInvite, devices}) => { +const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => { + const cli = useContext(MatrixClientContext); + let ignoreButton = null; let insertPillButton = null; let inviteUserButton = null; @@ -336,7 +338,7 @@ const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, i
    ); -}); +}; const _warnSelfDemote = async () => { const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); @@ -404,7 +406,9 @@ const useRoomPowerLevels = (cli, room) => { return powerLevels; }; -const RoomKickButton = withLegacyMatrixClient(({matrixClient: cli, member, startUpdating, stopUpdating}) => { +const RoomKickButton = ({member, startUpdating, stopUpdating}) => { + const cli = useContext(MatrixClientContext); + const onKick = async () => { const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); const {finished} = Modal.createTrackedDialog( @@ -444,9 +448,11 @@ const RoomKickButton = withLegacyMatrixClient(({matrixClient: cli, member, start return { kickLabel } ; -}); +}; + +const RedactMessagesButton = ({member}) => { + const cli = useContext(MatrixClientContext); -const RedactMessagesButton = withLegacyMatrixClient(({matrixClient: cli, member}) => { const onRedactAllMessages = async () => { const {roomId, userId} = member; const room = cli.getRoom(roomId); @@ -517,9 +523,11 @@ const RedactMessagesButton = withLegacyMatrixClient(({matrixClient: cli, member} return { _t("Remove recent messages") } ; -}); +}; + +const BanToggleButton = ({member, startUpdating, stopUpdating}) => { + const cli = useContext(MatrixClientContext); -const BanToggleButton = withLegacyMatrixClient(({matrixClient: cli, member, startUpdating, stopUpdating}) => { const onBanOrUnban = async () => { const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); const {finished} = Modal.createTrackedDialog( @@ -573,207 +581,206 @@ const BanToggleButton = withLegacyMatrixClient(({matrixClient: cli, member, star return { label } ; -}); +}; -const MuteToggleButton = withLegacyMatrixClient( - ({matrixClient: cli, member, room, powerLevels, startUpdating, stopUpdating}) => { - const isMuted = _isMuted(member, powerLevels); - const onMuteToggle = async () => { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - const roomId = member.roomId; - const target = member.userId; +const MuteToggleButton = ({member, room, powerLevels, startUpdating, stopUpdating}) => { + const cli = useContext(MatrixClientContext); - // if muting self, warn as it may be irreversible - if (target === cli.getUserId()) { - try { - if (!(await _warnSelfDemote())) return; - } catch (e) { - console.error("Failed to warn about self demotion: ", e); - return; - } + const isMuted = _isMuted(member, powerLevels); + const onMuteToggle = async () => { + const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + const roomId = member.roomId; + const target = member.userId; + + // if muting self, warn as it may be irreversible + if (target === cli.getUserId()) { + try { + if (!(await _warnSelfDemote())) return; + } catch (e) { + console.error("Failed to warn about self demotion: ", e); + return; } + } - const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", ""); - if (!powerLevelEvent) return; + const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", ""); + if (!powerLevelEvent) return; - const powerLevels = powerLevelEvent.getContent(); - const levelToSend = ( - (powerLevels.events ? powerLevels.events["m.room.message"] : null) || - powerLevels.events_default - ); - let level; - if (isMuted) { // unmute - level = levelToSend; - } else { // mute - level = levelToSend - 1; - } - level = parseInt(level); + const powerLevels = powerLevelEvent.getContent(); + const levelToSend = ( + (powerLevels.events ? powerLevels.events["m.room.message"] : null) || + powerLevels.events_default + ); + let level; + if (isMuted) { // unmute + level = levelToSend; + } else { // mute + level = levelToSend - 1; + } + level = parseInt(level); - if (!isNaN(level)) { - startUpdating(); - cli.setPowerLevel(roomId, target, level, powerLevelEvent).then(() => { - // NO-OP; rely on the m.room.member event coming down else we could - // get out of sync if we force setState here! - console.log("Mute toggle success"); - }, function(err) { - console.error("Mute error: " + err); - Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, { - title: _t("Error"), - description: _t("Failed to mute user"), - }); - }).finally(() => { - stopUpdating(); + if (!isNaN(level)) { + startUpdating(); + cli.setPowerLevel(roomId, target, level, powerLevelEvent).then(() => { + // NO-OP; rely on the m.room.member event coming down else we could + // get out of sync if we force setState here! + console.log("Mute toggle success"); + }, function(err) { + console.error("Mute error: " + err); + Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, { + title: _t("Error"), + description: _t("Failed to mute user"), }); - } + }).finally(() => { + stopUpdating(); + }); + } + }; + + const classes = classNames("mx_UserInfo_field", { + mx_UserInfo_destructive: !isMuted, + }); + + const muteLabel = isMuted ? _t("Unmute") : _t("Mute"); + return + { muteLabel } + ; +}; + +const RoomAdminToolsContainer = ({room, children, member, startUpdating, stopUpdating, powerLevels}) => { + const cli = useContext(MatrixClientContext); + let kickButton; + let banButton; + let muteButton; + let redactButton; + + const editPowerLevel = ( + (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) || + powerLevels.state_default + ); + + const me = room.getMember(cli.getUserId()); + const isMe = me.userId === member.userId; + const canAffectUser = member.powerLevel < me.powerLevel || isMe; + + if (canAffectUser && me.powerLevel >= powerLevels.kick) { + kickButton = ; + } + if (me.powerLevel >= powerLevels.redact) { + redactButton = ( + + ); + } + if (canAffectUser && me.powerLevel >= powerLevels.ban) { + banButton = ; + } + if (canAffectUser && me.powerLevel >= editPowerLevel) { + muteButton = ( + + ); + } + + if (kickButton || banButton || muteButton || redactButton || children) { + return + { muteButton } + { kickButton } + { banButton } + { redactButton } + { children } + ; + } + + return
    ; +}; + +const GroupAdminToolsSection = ({children, groupId, groupMember, startUpdating, stopUpdating}) => { + const cli = useContext(MatrixClientContext); + + const [isPrivileged, setIsPrivileged] = useState(false); + const [isInvited, setIsInvited] = useState(false); + + // Listen to group store changes + useEffect(() => { + let unmounted = false; + + const onGroupStoreUpdated = () => { + if (unmounted) return; + setIsPrivileged(GroupStore.isUserPrivileged(groupId)); + setIsInvited(GroupStore.getGroupInvitedMembers(groupId).some( + (m) => m.userId === groupMember.userId, + )); }; - const classes = classNames("mx_UserInfo_field", { - mx_UserInfo_destructive: !isMuted, - }); + GroupStore.registerListener(groupId, onGroupStoreUpdated); + onGroupStoreUpdated(); + // Handle unmount + return () => { + unmounted = true; + GroupStore.unregisterListener(onGroupStoreUpdated); + }; + }, [groupId, groupMember.userId]); - const muteLabel = isMuted ? _t("Unmute") : _t("Mute"); - return - { muteLabel } - ; - }, -); + if (isPrivileged) { + const _onKick = async () => { + const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); + const {finished} = Modal.createDialog(ConfirmUserActionDialog, { + matrixClient: cli, + groupMember, + action: isInvited ? _t('Disinvite') : _t('Remove from community'), + title: isInvited ? _t('Disinvite this user from community?') + : _t('Remove this user from community?'), + danger: true, + }); -const RoomAdminToolsContainer = withLegacyMatrixClient( - ({matrixClient: cli, room, children, member, startUpdating, stopUpdating, powerLevels}) => { - let kickButton; - let banButton; - let muteButton; - let redactButton; + const [proceed] = await finished; + if (!proceed) return; - const editPowerLevel = ( - (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) || - powerLevels.state_default + startUpdating(); + cli.removeUserFromGroup(groupId, groupMember.userId).then(() => { + // return to the user list + dis.dispatch({ + action: "view_user", + member: null, + }); + }).catch((e) => { + const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, { + title: _t('Error'), + description: isInvited ? + _t('Failed to withdraw invitation') : + _t('Failed to remove user from community'), + }); + console.log(e); + }).finally(() => { + stopUpdating(); + }); + }; + + const kickButton = ( + + { isInvited ? _t('Disinvite') : _t('Remove from community') } + ); - const me = room.getMember(cli.getUserId()); - const isMe = me.userId === member.userId; - const canAffectUser = member.powerLevel < me.powerLevel || isMe; + // No make/revoke admin API yet + /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator"); + giveModButton = + {giveOpLabel} + ;*/ - if (canAffectUser && me.powerLevel >= powerLevels.kick) { - kickButton = ; - } - if (me.powerLevel >= powerLevels.redact) { - redactButton = ( - - ); - } - if (canAffectUser && me.powerLevel >= powerLevels.ban) { - banButton = ; - } - if (canAffectUser && me.powerLevel >= editPowerLevel) { - muteButton = ( - - ); - } + return + { kickButton } + { children } + ; + } - if (kickButton || banButton || muteButton || redactButton || children) { - return - { muteButton } - { kickButton } - { banButton } - { redactButton } - { children } - ; - } - - return
    ; - }, -); - -const GroupAdminToolsSection = withLegacyMatrixClient( - ({matrixClient: cli, children, groupId, groupMember, startUpdating, stopUpdating}) => { - const [isPrivileged, setIsPrivileged] = useState(false); - const [isInvited, setIsInvited] = useState(false); - - // Listen to group store changes - useEffect(() => { - let unmounted = false; - - const onGroupStoreUpdated = () => { - if (unmounted) return; - setIsPrivileged(GroupStore.isUserPrivileged(groupId)); - setIsInvited(GroupStore.getGroupInvitedMembers(groupId).some( - (m) => m.userId === groupMember.userId, - )); - }; - - GroupStore.registerListener(groupId, onGroupStoreUpdated); - onGroupStoreUpdated(); - // Handle unmount - return () => { - unmounted = true; - GroupStore.unregisterListener(onGroupStoreUpdated); - }; - }, [groupId, groupMember.userId]); - - if (isPrivileged) { - const _onKick = async () => { - const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); - const {finished} = Modal.createDialog(ConfirmUserActionDialog, { - matrixClient: cli, - groupMember, - action: isInvited ? _t('Disinvite') : _t('Remove from community'), - title: isInvited ? _t('Disinvite this user from community?') - : _t('Remove this user from community?'), - danger: true, - }); - - const [proceed] = await finished; - if (!proceed) return; - - startUpdating(); - cli.removeUserFromGroup(groupId, groupMember.userId).then(() => { - // return to the user list - dis.dispatch({ - action: "view_user", - member: null, - }); - }).catch((e) => { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, { - title: _t('Error'), - description: isInvited ? - _t('Failed to withdraw invitation') : - _t('Failed to remove user from community'), - }); - console.log(e); - }).finally(() => { - stopUpdating(); - }); - }; - - const kickButton = ( - - { isInvited ? _t('Disinvite') : _t('Remove from community') } - - ); - - // No make/revoke admin API yet - /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator"); - giveModButton = - {giveOpLabel} - ;*/ - - return - { kickButton } - { children } - ; - } - - return
    ; - }, -); + return
    ; +}; const GroupMember = PropTypes.shape({ userId: PropTypes.string.isRequired, @@ -849,7 +856,9 @@ function useRoomPermissions(cli, room, user) { return roomPermissions; } -const PowerLevelSection = withLegacyMatrixClient(({matrixClient: cli, user, room, roomPermissions, powerLevels}) => { +const PowerLevelSection = ({user, room, roomPermissions, powerLevels}) => { + const cli = useContext(MatrixClientContext); + const [isEditing, setEditing] = useState(false); if (room && user.roomId) { // is in room if (isEditing) { @@ -876,9 +885,11 @@ const PowerLevelSection = withLegacyMatrixClient(({matrixClient: cli, user, room } else { return null; } -}); +}; + +const PowerLevelEditor = ({user, room, roomPermissions, onFinished}) => { + const cli = useContext(MatrixClientContext); -const PowerLevelEditor = withLegacyMatrixClient(({matrixClient: cli, user, room, roomPermissions, onFinished}) => { const [isUpdating, setIsUpdating] = useState(false); const [selectedPowerLevel, setSelectedPowerLevel] = useState(parseInt(user.powerLevel, 10)); const [isDirty, setIsDirty] = useState(false); @@ -982,10 +993,11 @@ const PowerLevelEditor = withLegacyMatrixClient(({matrixClient: cli, user, room, {buttonOrSpinner}
    ); -}); +}; + +const UserInfo = ({user, groupId, roomId, onClose}) => { + const cli = useContext(MatrixClientContext); -// cli is injected by withLegacyMatrixClient -const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, roomId, onClose}) => { // Load room if we are given a room id and memoize it const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]); @@ -1320,7 +1332,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
    ); -}); +}; UserInfo.propTypes = { user: PropTypes.oneOfType([ diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js index c30f446f41..20118f4f44 100644 --- a/src/components/views/room_settings/RelatedGroupSettings.js +++ b/src/components/views/room_settings/RelatedGroupSettings.js @@ -16,11 +16,12 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; -import {MatrixEvent, MatrixClient} from 'matrix-js-sdk'; +import {MatrixEvent} from 'matrix-js-sdk'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; import Modal from '../../../Modal'; import ErrorDialog from "../dialogs/ErrorDialog"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; const GROUP_ID_REGEX = /\+\S+:\S+/; @@ -31,9 +32,7 @@ export default class RelatedGroupSettings extends React.Component { relatedGroupsEvent: PropTypes.instanceOf(MatrixEvent), }; - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; + static contextType = MatrixClientContext; static defaultProps = { canSetRelatedGroups: false, @@ -49,7 +48,7 @@ export default class RelatedGroupSettings extends React.Component { } updateGroups(newGroupsList) { - this.context.matrixClient.sendStateEvent(this.props.roomId, 'm.room.related_groups', { + this.context.sendStateEvent(this.props.roomId, 'm.room.related_groups', { groups: newGroupsList, }, '').catch((err) => { console.error(err); @@ -99,7 +98,7 @@ export default class RelatedGroupSettings extends React.Component { }; render() { - const localDomain = this.context.matrixClient.getDomain(); + const localDomain = this.context.getDomain(); const EditableItemList = sdk.getComponent('elements.EditableItemList'); return
    { @@ -190,7 +189,7 @@ export default class EditMessageComposer extends React.Component { if (this._isContentModified(newContent)) { const roomId = editedEvent.getRoomId(); this._cancelPreviousPendingEdit(); - this.context.matrixClient.sendMessage(roomId, editContent); + this.context.sendMessage(roomId, editContent); } // close the event editing and focus composer @@ -205,7 +204,7 @@ export default class EditMessageComposer extends React.Component { previousEdit.status === EventStatus.QUEUED || previousEdit.status === EventStatus.NOT_SENT )) { - this.context.matrixClient.cancelPendingEvent(previousEdit); + this.context.cancelPendingEvent(previousEdit); } } @@ -232,7 +231,7 @@ export default class EditMessageComposer extends React.Component { _createEditorModel() { const {editState} = this.props; const room = this._getRoom(); - const partCreator = new PartCreator(room, this.context.matrixClient); + const partCreator = new PartCreator(room, this.context); let parts; if (editState.hasEditorState()) { // if restoring state from a previous editor, diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 988482df7f..784c4071aa 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -31,10 +31,11 @@ const TextForEvent = require('../../../TextForEvent'); import dis from '../../../dispatcher'; import SettingsStore from "../../../settings/SettingsStore"; -import {EventStatus, MatrixClient} from 'matrix-js-sdk'; +import {EventStatus} from 'matrix-js-sdk'; import {formatTime} from "../../../DateUtils"; import MatrixClientPeg from '../../../MatrixClientPeg'; import {ALL_RULE_TYPES} from "../../../mjolnir/BanList"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; const ObjectUtils = require('../../../ObjectUtils'); @@ -222,8 +223,8 @@ module.exports = createReactClass({ }; }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, + statics: { + contextType: MatrixClientContext, }, componentWillMount: function() { @@ -237,7 +238,7 @@ module.exports = createReactClass({ componentDidMount: function() { this._suppressReadReceiptAnimation = false; - const client = this.context.matrixClient; + const client = this.context; client.on("deviceVerificationChanged", this.onDeviceVerificationChanged); this.props.mxEvent.on("Event.decrypted", this._onDecrypted); if (this.props.showReactions) { @@ -262,7 +263,7 @@ module.exports = createReactClass({ }, componentWillUnmount: function() { - const client = this.context.matrixClient; + const client = this.context; client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged); this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted); if (this.props.showReactions) { @@ -291,7 +292,7 @@ module.exports = createReactClass({ return; } - const verified = await this.context.matrixClient.isEventSenderVerified(mxEvent); + const verified = await this.context.isEventSenderVerified(mxEvent); this.setState({ verified: verified, }, () => { @@ -349,11 +350,11 @@ module.exports = createReactClass({ }, shouldHighlight: function() { - const actions = this.context.matrixClient.getPushActionsForEvent(this.props.mxEvent); + const actions = this.context.getPushActionsForEvent(this.props.mxEvent); if (!actions || !actions.tweaks) { return false; } // don't show self-highlights from another of our clients - if (this.props.mxEvent.getSender() === this.context.matrixClient.credentials.userId) { + if (this.props.mxEvent.getSender() === this.context.credentials.userId) { return false; } @@ -461,7 +462,7 @@ module.exports = createReactClass({ // Cancel any outgoing key request for this event and resend it. If a response // is received for the request with the required keys, the event could be // decrypted successfully. - this.context.matrixClient.cancelAndResendEventRoomKeyRequest(this.props.mxEvent); + this.context.cancelAndResendEventRoomKeyRequest(this.props.mxEvent); }, onPermalinkClicked: function(e) { @@ -494,7 +495,7 @@ module.exports = createReactClass({ } } - if (this.context.matrixClient.isRoomEncrypted(ev.getRoomId())) { + if (this.context.isRoomEncrypted(ev.getRoomId())) { // else if room is encrypted // and event is being encrypted or is not_sent (Unknown Devices/Network Error) if (ev.status === EventStatus.ENCRYPTING) { @@ -741,7 +742,7 @@ module.exports = createReactClass({ switch (this.props.tileShape) { case 'notif': { - const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId()); + const room = this.context.getRoom(this.props.mxEvent.getRoomId()); return (
    diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index 1a2c8e2212..cb8c5b8d49 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -31,7 +31,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; import classNames from 'classnames'; -import { MatrixClient } from 'matrix-js-sdk'; import dis from '../../../dispatcher'; import Modal from '../../../Modal'; import sdk from '../../../index'; @@ -48,7 +47,7 @@ import SettingsStore from "../../../settings/SettingsStore"; import E2EIcon from "./E2EIcon"; import AutoHideScrollbar from "../../structures/AutoHideScrollbar"; import MatrixClientPeg from "../../../MatrixClientPeg"; -import {EventTimeline} from "matrix-js-sdk"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; module.exports = createReactClass({ displayName: 'MemberInfo', @@ -76,13 +75,13 @@ module.exports = createReactClass({ }; }, - contextTypes: { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, + statics: { + contextType: MatrixClientContext, }, componentWillMount: function() { this._cancelDeviceList = null; - const cli = this.context.matrixClient; + const cli = this.context; // only display the devices list if our client supports E2E this._enableDevices = cli.isCryptoEnabled(); @@ -112,7 +111,7 @@ module.exports = createReactClass({ }, componentWillUnmount: function() { - const client = this.context.matrixClient; + const client = this.context; if (client) { client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged); client.removeListener("Room", this.onRoom); @@ -131,7 +130,7 @@ module.exports = createReactClass({ }, _checkIgnoreState: function() { - const isIgnoring = this.context.matrixClient.isUserIgnored(this.props.member.userId); + const isIgnoring = this.context.isUserIgnored(this.props.member.userId); this.setState({isIgnoring: isIgnoring}); }, @@ -163,7 +162,7 @@ module.exports = createReactClass({ // Promise.resolve to handle transition from static result to promise; can be removed // in future - Promise.resolve(this.context.matrixClient.getStoredDevicesForUser(userId)).then((devices) => { + Promise.resolve(this.context.getStoredDevicesForUser(userId)).then((devices) => { this.setState({ devices: devices, e2eStatus: this._getE2EStatus(devices), @@ -197,7 +196,7 @@ module.exports = createReactClass({ onRoomReceipt: function(receiptEvent, room) { // because if we read a notification, it will affect notification count // only bother updating if there's a receipt from us - if (findReadReceiptFromUserId(receiptEvent, this.context.matrixClient.credentials.userId)) { + if (findReadReceiptFromUserId(receiptEvent, this.context.credentials.userId)) { this.forceUpdate(); } }, @@ -242,7 +241,7 @@ module.exports = createReactClass({ let cancelled = false; this._cancelDeviceList = function() { cancelled = true; }; - const client = this.context.matrixClient; + const client = this.context; const self = this; client.downloadKeys([member.userId], true).then(() => { return client.getStoredDevicesForUser(member.userId); @@ -267,7 +266,7 @@ module.exports = createReactClass({ }, onIgnoreToggle: function() { - const ignoredUsers = this.context.matrixClient.getIgnoredUsers(); + const ignoredUsers = this.context.getIgnoredUsers(); if (this.state.isIgnoring) { const index = ignoredUsers.indexOf(this.props.member.userId); if (index !== -1) ignoredUsers.splice(index, 1); @@ -275,7 +274,7 @@ module.exports = createReactClass({ ignoredUsers.push(this.props.member.userId); } - this.context.matrixClient.setIgnoredUsers(ignoredUsers).then(() => { + this.context.setIgnoredUsers(ignoredUsers).then(() => { return this.setState({isIgnoring: !this.state.isIgnoring}); }); }, @@ -293,7 +292,7 @@ module.exports = createReactClass({ if (!proceed) return; this.setState({ updating: this.state.updating + 1 }); - this.context.matrixClient.kick( + this.context.kick( this.props.member.roomId, this.props.member.userId, reason || undefined, ).then(function() { @@ -329,11 +328,11 @@ module.exports = createReactClass({ this.setState({ updating: this.state.updating + 1 }); let promise; if (this.props.member.membership === 'ban') { - promise = this.context.matrixClient.unban( + promise = this.context.unban( this.props.member.roomId, this.props.member.userId, ); } else { - promise = this.context.matrixClient.ban( + promise = this.context.ban( this.props.member.roomId, this.props.member.userId, reason || undefined, ); @@ -360,7 +359,7 @@ module.exports = createReactClass({ onRedactAllMessages: async function() { const {roomId, userId} = this.props.member; - const room = this.context.matrixClient.getRoom(roomId); + const room = this.context.getRoom(roomId); if (!room) { return; } @@ -414,7 +413,7 @@ module.exports = createReactClass({ console.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`); await Promise.all(eventsToRedact.map(async event => { try { - await this.context.matrixClient.redactEvent(roomId, event.getId()); + await this.context.redactEvent(roomId, event.getId()); } catch (err) { // log and swallow errors console.error("Could not redact", event.getId()); @@ -446,11 +445,11 @@ module.exports = createReactClass({ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const roomId = this.props.member.roomId; const target = this.props.member.userId; - const room = this.context.matrixClient.getRoom(roomId); + const room = this.context.getRoom(roomId); if (!room) return; // if muting self, warn as it may be irreversible - if (target === this.context.matrixClient.getUserId()) { + if (target === this.context.getUserId()) { try { if (!(await this._warnSelfDemote())) return; } catch (e) { @@ -478,7 +477,7 @@ module.exports = createReactClass({ if (!isNaN(level)) { this.setState({ updating: this.state.updating + 1 }); - this.context.matrixClient.setPowerLevel(roomId, target, level, powerLevelEvent).then( + this.context.setPowerLevel(roomId, target, level, powerLevelEvent).then( function() { // NO-OP; rely on the m.room.member event coming down else we could // get out of sync if we force setState here! @@ -500,13 +499,13 @@ module.exports = createReactClass({ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const roomId = this.props.member.roomId; const target = this.props.member.userId; - const room = this.context.matrixClient.getRoom(roomId); + const room = this.context.getRoom(roomId); if (!room) return; const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", ""); if (!powerLevelEvent) return; - const me = room.getMember(this.context.matrixClient.credentials.userId); + const me = room.getMember(this.context.credentials.userId); if (!me) return; const defaultLevel = powerLevelEvent.getContent().users_default; @@ -515,7 +514,7 @@ module.exports = createReactClass({ // toggle the level const newLevel = this.state.isTargetMod ? defaultLevel : modLevel; this.setState({ updating: this.state.updating + 1 }); - this.context.matrixClient.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then( + this.context.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then( function() { // NO-OP; rely on the m.room.member event coming down else we could // get out of sync if we force setState here! @@ -550,7 +549,7 @@ module.exports = createReactClass({ danger: true, onFinished: (accepted) => { if (!accepted) return; - this.context.matrixClient.deactivateSynapseUser(this.props.member.userId).catch(e => { + this.context.deactivateSynapseUser(this.props.member.userId).catch(e => { console.error("Failed to deactivate user"); console.error(e); @@ -566,7 +565,7 @@ module.exports = createReactClass({ _applyPowerChange: function(roomId, target, powerLevel, powerLevelEvent) { this.setState({ updating: this.state.updating + 1 }); - this.context.matrixClient.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then( + this.context.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then( function() { // NO-OP; rely on the m.room.member event coming down else we could // get out of sync if we force setState here! @@ -587,7 +586,7 @@ module.exports = createReactClass({ onPowerChange: async function(powerLevel) { const roomId = this.props.member.roomId; const target = this.props.member.userId; - const room = this.context.matrixClient.getRoom(roomId); + const room = this.context.getRoom(roomId); if (!room) return; const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", ""); @@ -598,7 +597,7 @@ module.exports = createReactClass({ return; } - const myUserId = this.context.matrixClient.getUserId(); + const myUserId = this.context.getUserId(); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); // If we are changing our own PL it can only ever be decreasing, which we cannot reverse. @@ -650,9 +649,9 @@ module.exports = createReactClass({ _calculateOpsPermissions: async function(member) { let canDeactivate = false; - if (this.context.matrixClient) { + if (this.context) { try { - canDeactivate = await this.context.matrixClient.isSynapseAdministrator(); + canDeactivate = await this.context.isSynapseAdministrator(); } catch (e) { console.error(e); } @@ -665,13 +664,13 @@ module.exports = createReactClass({ }, muted: false, }; - const room = this.context.matrixClient.getRoom(member.roomId); + const room = this.context.getRoom(member.roomId); if (!room) return defaultPerms; const powerLevels = room.currentState.getStateEvents("m.room.power_levels", ""); if (!powerLevels) return defaultPerms; - const me = room.getMember(this.context.matrixClient.credentials.userId); + const me = room.getMember(this.context.credentials.userId); if (!me) return defaultPerms; const them = member; @@ -738,7 +737,7 @@ module.exports = createReactClass({ const avatarUrl = member.getMxcAvatarUrl(); if (!avatarUrl) return; - const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl); + const httpUrl = this.context.mxcUrlToHttp(avatarUrl); const ImageView = sdk.getComponent("elements.ImageView"); const params = { src: httpUrl, @@ -797,7 +796,7 @@ module.exports = createReactClass({ }, _renderUserOptions: function() { - const cli = this.context.matrixClient; + const cli = this.context; const member = this.props.member; let ignoreButton = null; @@ -905,9 +904,9 @@ module.exports = createReactClass({ let synapseDeactivateButton; let spinner; - if (this.props.member.userId !== this.context.matrixClient.credentials.userId) { + if (this.props.member.userId !== this.context.credentials.userId) { // TODO: Immutable DMs replaces a lot of this - const dmRoomMap = new DMRoomMap(this.context.matrixClient); + const dmRoomMap = new DMRoomMap(this.context); // dmRooms will not include dmRooms that we have been invited into but did not join. // Because DMRoomMap runs off account_data[m.direct] which is only set on join of dm room. // XXX: we potentially want DMs we have been invited to, to also show up here :L @@ -918,7 +917,7 @@ module.exports = createReactClass({ const tiles = []; for (const roomId of dmRooms) { - const room = this.context.matrixClient.getRoom(roomId); + const room = this.context.getRoom(roomId); if (room) { const myMembership = room.getMyMembership(); // not a DM room if we have are not joined @@ -1064,12 +1063,12 @@ module.exports = createReactClass({ } } - const room = this.context.matrixClient.getRoom(this.props.member.roomId); + const room = this.context.getRoom(this.props.member.roomId); const powerLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null; const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0; const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"]; - const hsUrl = this.context.matrixClient.baseUrl; + const hsUrl = this.context.baseUrl; let showPresence = true; if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) { showPresence = enablePresenceByHsUrl[hsUrl]; @@ -1108,7 +1107,7 @@ module.exports = createReactClass({
    ; - const isEncrypted = this.context.matrixClient.isRoomEncrypted(this.props.member.roomId); + const isEncrypted = this.context.isRoomEncrypted(this.props.member.roomId); if (this.state.e2eStatus && isEncrypted) { e2eIconElement = (); } @@ -1117,7 +1116,7 @@ module.exports = createReactClass({ const avatarUrl = this.props.member.getMxcAvatarUrl(); let avatarElement; if (avatarUrl) { - const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl, 800, 800); + const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800); avatarElement =
    ; diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 580e3b0d81..06e6834bec 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -107,8 +107,8 @@ class UploadButton extends React.Component { roomId: PropTypes.string.isRequired, } - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.onUploadClick = this.onUploadClick.bind(this); this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this); @@ -165,8 +165,8 @@ class UploadButton extends React.Component { } export default class MessageComposer extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.onInputStateChanged = this.onInputStateChanged.bind(this); this.onEvent = this.onEvent.bind(this); this._onRoomStateEvents = this._onRoomStateEvents.bind(this); diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index a5d8492d99..3d462647c8 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -141,8 +141,8 @@ export default class MessageComposerInput extends React.Component { autocomplete: Autocomplete; historyManager: SlateComposerHistoryManager; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'); diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js index caf8feeea2..af2ea640f5 100644 --- a/src/components/views/rooms/ReplyPreview.js +++ b/src/components/views/rooms/ReplyPreview.js @@ -35,8 +35,8 @@ export default class ReplyPreview extends React.Component { permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired, }; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.unmounted = false; this.state = { diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index af25155588..af7177ebc7 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -26,7 +26,6 @@ import { unescapeMessage, } from '../../../editor/serialize'; import {CommandPartCreator} from '../../../editor/parts'; -import {MatrixClient} from 'matrix-js-sdk'; import BasicMessageComposer from "./BasicMessageComposer"; import ReplyPreview from "./ReplyPreview"; import RoomViewStore from '../../../stores/RoomViewStore'; @@ -40,6 +39,7 @@ import Modal from '../../../Modal'; import {_t, _td} from '../../../languageHandler'; import ContentMessages from '../../../ContentMessages'; import {Key} from "../../../Keyboard"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) { const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent); @@ -89,12 +89,10 @@ export default class SendMessageComposer extends React.Component { permalinkCreator: PropTypes.object.isRequired, }; - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, - }; + static contextType = MatrixClientContext; - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.model = null; this._editorRef = null; this.currentlyComposedEditorState = null; @@ -245,7 +243,7 @@ export default class SendMessageComposer extends React.Component { const isReply = !!RoomViewStore.getQuotingEvent(); const {roomId} = this.props.room; const content = createMessageContent(this.model, this.props.permalinkCreator); - this.context.matrixClient.sendMessage(roomId, content); + this.context.sendMessage(roomId, content); if (isReply) { // Clear reply_to_event as we put the message into the queue // if the send fails, retry will handle resending. @@ -273,7 +271,7 @@ export default class SendMessageComposer extends React.Component { } componentWillMount() { - const partCreator = new CommandPartCreator(this.props.room, this.context.matrixClient); + const partCreator = new CommandPartCreator(this.props.room, this.context); const parts = this._restoreStoredEditorState(partCreator) || []; this.model = new EditorModel(parts, partCreator); this.dispatcherRef = dis.register(this.onAction); @@ -361,7 +359,7 @@ export default class SendMessageComposer extends React.Component { // from Finder) but more images copied from a different website // / word processor etc. ContentMessages.sharedInstance().sendContentListToRoom( - Array.from(clipboardData.files), this.props.room.roomId, this.context.matrixClient, + Array.from(clipboardData.files), this.props.room.roomId, this.context, ); } } diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js index ebd9017d73..2b68e0d338 100644 --- a/src/components/views/rooms/SlateMessageComposer.js +++ b/src/components/views/rooms/SlateMessageComposer.js @@ -137,8 +137,8 @@ class UploadButton extends React.Component { static propTypes = { roomId: PropTypes.string.isRequired, } - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.onUploadClick = this.onUploadClick.bind(this); this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this); @@ -193,8 +193,8 @@ class UploadButton extends React.Component { } export default class SlateMessageComposer extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this); this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this); this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this); diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js index cb5db10be4..cdde53b44b 100644 --- a/src/components/views/settings/DevicesPanel.js +++ b/src/components/views/settings/DevicesPanel.js @@ -25,8 +25,8 @@ import { _t } from '../../../languageHandler'; import Modal from '../../../Modal'; export default class DevicesPanel extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.state = { devices: undefined, diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js index 98ba29471d..533c15976b 100644 --- a/src/components/views/settings/DevicesPanelEntry.js +++ b/src/components/views/settings/DevicesPanelEntry.js @@ -23,8 +23,8 @@ import MatrixClientPeg from '../../../MatrixClientPeg'; import {formatDate} from '../../../DateUtils'; export default class DevicesPanelEntry extends React.Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this._unmounted = false; this.onDeviceToggled = this.onDeviceToggled.bind(this); diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js index 5d707fcf16..2e718b0b69 100644 --- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js +++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js @@ -18,22 +18,19 @@ import React from 'react'; import PropTypes from 'prop-types'; import {_t} from "../../../../../languageHandler"; import RoomProfileSettings from "../../../room_settings/RoomProfileSettings"; -import MatrixClientPeg from "../../../../../MatrixClientPeg"; import sdk from "../../../../.."; import AccessibleButton from "../../../elements/AccessibleButton"; -import {MatrixClient} from "matrix-js-sdk"; import dis from "../../../../../dispatcher"; import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch"; +import MatrixClientContext from "../../../../../contexts/MatrixClientContext"; export default class GeneralRoomSettingsTab extends React.Component { - static childContextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; - static propTypes = { roomId: PropTypes.string.isRequired, }; + static contextType = MatrixClientContext; + constructor() { super(); @@ -42,14 +39,8 @@ export default class GeneralRoomSettingsTab extends React.Component { }; } - getChildContext() { - return { - matrixClient: MatrixClientPeg.get(), - }; - } - componentWillMount() { - MatrixClientPeg.get().getRoomDirectoryVisibility(this.props.roomId).then((result => { + this.context.getRoomDirectoryVisibility(this.props.roomId).then((result => { this.setState({isRoomPublished: result.visibility === 'public'}); })); } @@ -59,7 +50,7 @@ export default class GeneralRoomSettingsTab extends React.Component { const newValue = !valueBefore; this.setState({isRoomPublished: newValue}); - MatrixClientPeg.get().setRoomDirectoryVisibility( + this.context.setRoomDirectoryVisibility( this.props.roomId, newValue ? 'public' : 'private', ).catch(() => { @@ -80,7 +71,7 @@ export default class GeneralRoomSettingsTab extends React.Component { const RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings"); const UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings"); - const client = MatrixClientPeg.get(); + const client = this.context; const room = client.getRoom(this.props.roomId); const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js index 0063a9a981..26e0033233 100644 --- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js @@ -17,25 +17,8 @@ limitations under the License. import React from 'react'; import {_t} from "../../../../../languageHandler"; import GroupUserSettings from "../../../groups/GroupUserSettings"; -import MatrixClientPeg from "../../../../../MatrixClientPeg"; -import PropTypes from "prop-types"; -import {MatrixClient} from "matrix-js-sdk"; export default class FlairUserSettingsTab extends React.Component { - static childContextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient), - }; - - constructor() { - super(); - } - - getChildContext() { - return { - matrixClient: MatrixClientPeg.get(), - }; - } - render() { return (
    diff --git a/src/utils/withLegacyMatrixClient.js b/src/contexts/MatrixClientContext.js similarity index 51% rename from src/utils/withLegacyMatrixClient.js rename to src/contexts/MatrixClientContext.js index af6a930a88..54a23ca132 100644 --- a/src/utils/withLegacyMatrixClient.js +++ b/src/contexts/MatrixClientContext.js @@ -14,18 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from "react"; -import PropTypes from "prop-types"; -import {MatrixClient} from "matrix-js-sdk"; +import { createContext } from "react"; -// Higher Order Component to allow use of legacy MatrixClient React Context -// in Functional Components which do not otherwise support legacy React Contexts -export default (Component) => class extends React.PureComponent { - static contextTypes = { - matrixClient: PropTypes.instanceOf(MatrixClient).isRequired, - }; - - render() { - return ; - } -}; +const MatrixClientContext = createContext(undefined); +MatrixClientContext.displayName = "MatrixClientContext"; +export default MatrixClientContext; diff --git a/src/contexts/RoomContext.js b/src/contexts/RoomContext.js new file mode 100644 index 0000000000..8613be195c --- /dev/null +++ b/src/contexts/RoomContext.js @@ -0,0 +1,25 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import { createContext } from "react"; + +const RoomContext = createContext({ + canReact: undefined, + canReply: undefined, + room: undefined, +}); +RoomContext.displayName = "RoomContext"; +export default RoomContext; diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js index 7c52512bc2..b7c7b4a396 100644 --- a/test/components/structures/MessagePanel-test.js +++ b/test/components/structures/MessagePanel-test.js @@ -36,27 +36,14 @@ const test_utils = require('test-utils'); const mockclock = require('mock-clock'); import Velocity from 'velocity-animate'; +import MatrixClientContext from "../../../src/contexts/MatrixClientContext"; +import RoomContext from "../../../src/contexts/RoomContext"; let client; const room = new Matrix.Room(); // wrap MessagePanel with a component which provides the MatrixClient in the context. const WrappedMessagePanel = createReactClass({ - childContextTypes: { - matrixClient: PropTypes.object, - room: PropTypes.object, - }, - - getChildContext: function() { - return { - matrixClient: client, - room: { - canReact: true, - canReply: true, - }, - }; - }, - getInitialState: function() { return { resizeNotifier: new EventEmitter(), @@ -64,7 +51,11 @@ const WrappedMessagePanel = createReactClass({ }, render: function() { - return ; + return + + + + ; }, }); diff --git a/test/test-utils.js b/test/test-utils.js index 64704fc610..047b727251 100644 --- a/test/test-utils.js +++ b/test/test-utils.js @@ -9,6 +9,7 @@ import jssdk from 'matrix-js-sdk'; import {makeType} from "../src/utils/TypeUtils"; import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils"; import ShallowRenderer from 'react-test-renderer/shallow'; +import MatrixClientContext from "../src/contexts/MatrixClientContext"; const MatrixEvent = jssdk.MatrixEvent; /** @@ -291,22 +292,16 @@ export function getDispatchForStore(store) { export function wrapInMatrixClientContext(WrappedComponent) { class Wrapper extends React.Component { - static childContextTypes = { - matrixClient: PropTypes.object, - } + constructor(props) { + super(props); - getChildContext() { - return { - matrixClient: this._matrixClient, - }; - } - - componentWillMount() { this._matrixClient = peg.get(); } render() { - return ; + return + + ; } } return Wrapper; From b094f0fe47b128d8854e644b3aa5aefdb7504465 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 17:31:29 +0000 Subject: [PATCH 067/239] delint --- src/components/views/elements/Dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js index 292cc67444..03ab8c5c68 100644 --- a/src/components/views/elements/Dropdown.js +++ b/src/components/views/elements/Dropdown.js @@ -198,7 +198,7 @@ export default class Dropdown extends React.Component { switch (e.key) { case Key.ENTER: this.props.onOptionChange(this.state.highlightedOption); - // fallthrough + // fallthrough case Key.ESCAPE: this._close(); break; From da4d72b3c455452d1b2782dd1957ee47b36c81d6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 17:34:03 +0000 Subject: [PATCH 068/239] delint --- src/components/views/elements/Flair.js | 1 - src/components/views/groups/GroupTile.js | 1 - src/components/views/right_panel/UserInfo.js | 2 -- src/components/views/rooms/EditMessageComposer.js | 1 - test/test-utils.js | 1 - 5 files changed, 6 deletions(-) diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js index ef208bbea9..0af772466b 100644 --- a/src/components/views/elements/Flair.js +++ b/src/components/views/elements/Flair.js @@ -18,7 +18,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {MatrixClient} from 'matrix-js-sdk'; import FlairStore from '../../../stores/FlairStore'; import dis from '../../../dispatcher'; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js index a6447cdf14..f3d7418a44 100644 --- a/src/components/views/groups/GroupTile.js +++ b/src/components/views/groups/GroupTile.js @@ -17,7 +17,6 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import {MatrixClient} from 'matrix-js-sdk'; import { Draggable, Droppable } from 'react-beautiful-dnd'; import sdk from '../../../index'; import dis from '../../../dispatcher'; diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index e952f8fad9..793a06bbaf 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -857,8 +857,6 @@ function useRoomPermissions(cli, room, user) { } const PowerLevelSection = ({user, room, roomPermissions, powerLevels}) => { - const cli = useContext(MatrixClientContext); - const [isEditing, setEditing] = useState(false); if (room && user.roomId) { // is in room if (isEditing) { diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js index 94ef00183e..43f378a1e0 100644 --- a/src/components/views/rooms/EditMessageComposer.js +++ b/src/components/views/rooms/EditMessageComposer.js @@ -26,7 +26,6 @@ import {findEditableEvent} from '../../../utils/EventUtils'; import {parseEvent} from '../../../editor/deserialize'; import {PartCreator} from '../../../editor/parts'; import EditorStateTransfer from '../../../utils/EditorStateTransfer'; -import {MatrixClient} from 'matrix-js-sdk'; import classNames from 'classnames'; import {EventStatus} from 'matrix-js-sdk'; import BasicMessageComposer from "./BasicMessageComposer"; diff --git a/test/test-utils.js b/test/test-utils.js index 047b727251..5c8c7f8a10 100644 --- a/test/test-utils.js +++ b/test/test-utils.js @@ -2,7 +2,6 @@ import sinon from 'sinon'; import React from 'react'; -import PropTypes from 'prop-types'; import peg from '../src/MatrixClientPeg'; import dis from '../src/dispatcher'; import jssdk from 'matrix-js-sdk'; From f3ca4c0b7cf04d5d6d0a3bbf5b7204211bf1d65a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 17:54:19 +0000 Subject: [PATCH 069/239] fix tests --- .../views/elements/MemberEventListSummary-test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js index a31cbdebb5..a25b2cb945 100644 --- a/test/components/views/elements/MemberEventListSummary-test.js +++ b/test/components/views/elements/MemberEventListSummary-test.js @@ -115,7 +115,8 @@ describe('MemberEventListSummary', function() { const renderer = new ShallowRenderer(); renderer.render(); - const result = renderer.getRenderOutput(); + const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper + const result = wrapper.props.children[0]; expect(result.props.children).toEqual([
    Expanded membership
    , @@ -137,7 +138,8 @@ describe('MemberEventListSummary', function() { const renderer = new ShallowRenderer(); renderer.render(); - const result = renderer.getRenderOutput(); + const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper + const result = wrapper.props.children[0]; expect(result.props.children).toEqual([
    Expanded membership
    , From 513ec30ef1fad097095fb65c0d0d29be3dcba5e3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 17 Dec 2019 18:02:45 +0000 Subject: [PATCH 070/239] Fix tests v2 --- test/components/views/elements/MemberEventListSummary-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js index a25b2cb945..906ba45711 100644 --- a/test/components/views/elements/MemberEventListSummary-test.js +++ b/test/components/views/elements/MemberEventListSummary-test.js @@ -116,7 +116,7 @@ describe('MemberEventListSummary', function() { const renderer = new ShallowRenderer(); renderer.render(); const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper - const result = wrapper.props.children[0]; + const result = wrapper.props.children; expect(result.props.children).toEqual([
    Expanded membership
    , @@ -139,7 +139,7 @@ describe('MemberEventListSummary', function() { const renderer = new ShallowRenderer(); renderer.render(); const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper - const result = wrapper.props.children[0]; + const result = wrapper.props.children; expect(result.props.children).toEqual([
    Expanded membership
    , From d35b01b63a5ed1f5d0da79f8872500ef6a7fedbc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 18 Dec 2019 15:40:19 +0000 Subject: [PATCH 071/239] Get rid of stripped-emoji.json in favour of an in-memory single truth source --- package.json | 1 - scripts/emoji-data-strip.js | 30 ------- src/HtmlUtils.js | 23 +----- src/autocomplete/EmojiProvider.js | 36 ++++---- src/autocomplete/QueryMatcher.js | 1 + .../views/emojipicker/EmojiPicker.js | 46 +---------- .../views/emojipicker/QuickReactions.js | 8 +- .../views/rooms/BasicMessageComposer.js | 5 +- .../views/rooms/MessageComposerInput.js | 4 +- src/emoji.js | 82 +++++++++++++++++++ src/stripped-emoji.json | 1 - 11 files changed, 115 insertions(+), 122 deletions(-) delete mode 100644 scripts/emoji-data-strip.js create mode 100644 src/emoji.js delete mode 100644 src/stripped-emoji.json diff --git a/package.json b/package.json index 8688fe42e6..7ef14e6635 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "build": "yarn reskindex && yarn start:init", "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files", - "emoji-data-strip": "node scripts/emoji-data-strip.js", "start": "yarn start:init && yarn start:all", "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn build:watch\" \"yarn reskindex:watch\"", "start:init": "babel src -d lib --source-maps --copy-files", diff --git a/scripts/emoji-data-strip.js b/scripts/emoji-data-strip.js deleted file mode 100644 index 1c3738cab1..0000000000 --- a/scripts/emoji-data-strip.js +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env node - -// This generates src/stripped-emoji.json as used by the EmojiProvider autocomplete -// provider. - -const EMOJIBASE = require('emojibase-data/en/compact.json'); - -const fs = require('fs'); - -const output = EMOJIBASE.map( - (datum) => { - const newDatum = { - name: datum.annotation, - shortname: `:${datum.shortcodes[0]}:`, - category: datum.group, - emoji_order: datum.order, - }; - if (datum.shortcodes.length > 1) { - newDatum.aliases = datum.shortcodes.slice(1).map(s => `:${s}:`); - } - if (datum.emoticon) { - newDatum.aliases_ascii = [ datum.emoticon ]; - } - return newDatum; - } -); - -// Write to a file in src. Changes should be checked into git. This file is copied by -// babel using --copy-files -fs.writeFileSync('./src/stripped-emoji.json', JSON.stringify(output)); diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index 2b7384a5aa..7cdff26a21 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -32,9 +32,9 @@ import classNames from 'classnames'; import MatrixClientPeg from './MatrixClientPeg'; import url from 'url'; -import EMOJIBASE from 'emojibase-data/en/compact.json'; import EMOJIBASE_REGEX from 'emojibase-regex'; import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks"; +import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji"; linkifyMatrix(linkify); @@ -58,8 +58,6 @@ const COLOR_REGEX = /^#[0-9a-fA-F]{6}$/; const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet']; -const VARIATION_SELECTOR = String.fromCharCode(0xFE0F); - /* * Return true if the given string contains emoji * Uses a much, much simpler regex than emojibase's so will give false @@ -71,21 +69,6 @@ function mightContainEmoji(str) { return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str); } -/** - * Find emoji data in emojibase by character. - * - * @param {String} char The emoji character - * @return {Object} The emoji data - */ -export function findEmojiData(char) { - // Check against both the char and the char with an empty variation selector - // appended because that's how emojibase stores its base emojis which have - // variations. - // See also https://github.com/vector-im/riot-web/issues/9785. - const emptyVariation = char + VARIATION_SELECTOR; - return EMOJIBASE.find(e => e.unicode === char || e.unicode === emptyVariation); -} - /** * Returns the shortcode for an emoji character. * @@ -93,7 +76,7 @@ export function findEmojiData(char) { * @return {String} The shortcode (such as :thumbup:) */ export function unicodeToShortcode(char) { - const data = findEmojiData(char); + const data = getEmojiFromUnicode(char); return (data && data.shortcodes ? `:${data.shortcodes[0]}:` : ''); } @@ -105,7 +88,7 @@ export function unicodeToShortcode(char) { */ export function shortcodeToUnicode(shortcode) { shortcode = shortcode.slice(1, shortcode.length - 1); - const data = EMOJIBASE.find(e => e.shortcodes && e.shortcodes.includes(shortcode)); + const data = SHORTCODE_TO_EMOJI.get(shortcode); return data ? data.unicode : null; } diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js index 1e39593022..7e30c8ca6a 100644 --- a/src/autocomplete/EmojiProvider.js +++ b/src/autocomplete/EmojiProvider.js @@ -2,6 +2,7 @@ Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd Copyright 2017, 2018 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. @@ -28,7 +29,7 @@ import SettingsStore from "../settings/SettingsStore"; import { shortcodeToUnicode } from '../HtmlUtils'; import EMOTICON_REGEX from 'emojibase-regex/emoticon'; -import EmojiData from '../stripped-emoji.json'; +import EMOJIBASE from 'emojibase-data/en/compact.json'; const LIMIT = 20; @@ -38,19 +39,15 @@ const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|:[+-\\w]*:?)$', ' // XXX: it's very unclear why we bother with this generated emojidata file. // all it means is that we end up bloating the bundle with precomputed stuff // which would be trivial to calculate and cache on demand. -const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sort( - (a, b) => { - if (a.category === b.category) { - return a.emoji_order - b.emoji_order; - } - return a.category - b.category; - }, -).map((a, index) => { +const EMOJI_SHORTNAMES = EMOJIBASE.sort((a, b) => { + if (a.group === b.group) { + return a.order - b.order; + } + return a.group - b.group; +}).map((emoji, index) => { return { - name: a.name, - shortname: a.shortname, - aliases: a.aliases ? a.aliases.join(' ') : '', - aliases_ascii: a.aliases_ascii ? a.aliases_ascii.join(' ') : '', + emoji, + shortname: `:${emoji.shortcodes[0]}:`, // Include the index so that we can preserve the original order _orderBy: index, }; @@ -69,12 +66,16 @@ export default class EmojiProvider extends AutocompleteProvider { constructor() { super(EMOJI_REGEX); this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, { - keys: ['aliases_ascii', 'shortname', 'aliases'], + keys: ['emoji.emoticon', 'shortname'], + funcs: [ + // (o) => `:${o.emoji.shortcodes[0]}:`, // shortname + (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases + ], // For matching against ascii equivalents shouldMatchWordsOnly: false, }); this.nameMatcher = new QueryMatcher(EMOJI_SHORTNAMES, { - keys: ['name'], + keys: ['emoji.annotation'], // For removing punctuation shouldMatchWordsOnly: true, }); @@ -96,7 +97,7 @@ export default class EmojiProvider extends AutocompleteProvider { const sorters = []; // make sure that emoticons come first - sorters.push((c) => score(matchedString, c.aliases_ascii)); + sorters.push((c) => score(matchedString, c.emoji.emoticon || "")); // then sort by score (Infinity if matchedString not in shortname) sorters.push((c) => score(matchedString, c.shortname)); @@ -110,8 +111,7 @@ export default class EmojiProvider extends AutocompleteProvider { sorters.push((c) => c._orderBy); completions = _sortBy(_uniq(completions), sorters); - completions = completions.map((result) => { - const { shortname } = result; + completions = completions.map(({shortname}) => { const unicode = shortcodeToUnicode(shortname); return { completion: unicode, diff --git a/src/autocomplete/QueryMatcher.js b/src/autocomplete/QueryMatcher.js index a28d3003cf..ef1605e7a6 100644 --- a/src/autocomplete/QueryMatcher.js +++ b/src/autocomplete/QueryMatcher.js @@ -71,6 +71,7 @@ export default class QueryMatcher { } for (const keyValue of keyValues) { + if (!keyValue) continue; // skip falsy keyValues const key = stripDiacritics(keyValue).toLowerCase(); if (!this._items.has(key)) { this._items.set(key, []); diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js index 0ec11c2b38..4d49b25100 100644 --- a/src/components/views/emojipicker/EmojiPicker.js +++ b/src/components/views/emojipicker/EmojiPicker.js @@ -16,54 +16,12 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; -import EMOJIBASE from 'emojibase-data/en/compact.json'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; import * as recent from './recent'; - -const EMOJIBASE_CATEGORY_IDS = [ - "people", // smileys - "people", // actually people - "control", // modifiers and such, not displayed in picker - "nature", - "foods", - "places", - "activity", - "objects", - "symbols", - "flags", -]; - -const DATA_BY_CATEGORY = { - "people": [], - "nature": [], - "foods": [], - "places": [], - "activity": [], - "objects": [], - "symbols": [], - "flags": [], -}; -const DATA_BY_EMOJI = {}; - -const VARIATION_SELECTOR = String.fromCharCode(0xFE0F); -EMOJIBASE.forEach(emoji => { - if (emoji.unicode.includes(VARIATION_SELECTOR)) { - // Clone data into variation-less version - emoji = Object.assign({}, emoji, { - unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""), - }); - } - DATA_BY_EMOJI[emoji.unicode] = emoji; - const categoryId = EMOJIBASE_CATEGORY_IDS[emoji.group]; - if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) { - DATA_BY_CATEGORY[categoryId].push(emoji); - } - // This is used as the string to match the query against when filtering emojis. - emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase(); -}); +import {DATA_BY_CATEGORY, getEmojiFromUnicode} from "../../../emoji"; export const CATEGORY_HEADER_HEIGHT = 22; export const EMOJI_HEIGHT = 37; @@ -91,7 +49,7 @@ class EmojiPicker extends React.Component { // Convert recent emoji characters to emoji data, removing unknowns. this.recentlyUsed = recent.get() - .map(unicode => DATA_BY_EMOJI[unicode]) + .map(unicode => getEmojiFromUnicode(unicode)) .filter(data => !!data); this.memoizedDataByCategory = { recent: this.recentlyUsed, diff --git a/src/components/views/emojipicker/QuickReactions.js b/src/components/views/emojipicker/QuickReactions.js index 8444fb2d9c..e4419e9f3a 100644 --- a/src/components/views/emojipicker/QuickReactions.js +++ b/src/components/views/emojipicker/QuickReactions.js @@ -19,15 +19,15 @@ import PropTypes from 'prop-types'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; -import { findEmojiData } from '../../../HtmlUtils'; +import {getEmojiFromUnicode} from "../../../emoji"; +// We use the variation-selector Heart in Quick Reactions for some reason const QUICK_REACTIONS = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"].map(emoji => { - const data = findEmojiData(emoji); + const data = getEmojiFromUnicode(emoji); if (!data) { throw new Error(`Emoji ${emoji} doesn't exist in emojibase`); } - // Prefer our unicode value for quick reactions (which does not have - // variation selectors). + // Prefer our unicode value for quick reactions as we sometimes use variation selectors. return Object.assign({}, data, { unicode: emoji }); }); diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js index c7659e89fb..b550644470 100644 --- a/src/components/views/rooms/BasicMessageComposer.js +++ b/src/components/views/rooms/BasicMessageComposer.js @@ -34,11 +34,11 @@ import {parsePlainTextMessage} from '../../../editor/deserialize'; import {renderModel} from '../../../editor/render'; import {Room} from 'matrix-js-sdk'; import TypingStore from "../../../stores/TypingStore"; -import EMOJIBASE from 'emojibase-data/en/compact.json'; import SettingsStore from "../../../settings/SettingsStore"; import EMOTICON_REGEX from 'emojibase-regex/emoticon'; import sdk from '../../../index'; import {Key} from "../../../Keyboard"; +import {EMOTICON_TO_EMOJI} from "../../../emoji"; const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$'); @@ -108,7 +108,8 @@ export default class BasicMessageEditor extends React.Component { const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(range.text); if (emoticonMatch) { const query = emoticonMatch[1].toLowerCase().replace("-", ""); - const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false); + const data = EMOTICON_TO_EMOJI.get(query); + if (data) { const {partCreator} = model; const hasPrecedingSpace = emoticonMatch[0][0] === " "; diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index a5d8492d99..dc8e8e439f 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -48,7 +48,6 @@ import Markdown from '../../../Markdown'; import MessageComposerStore from '../../../stores/MessageComposerStore'; import ContentMessages from '../../../ContentMessages'; -import EMOJIBASE from 'emojibase-data/en/compact.json'; import EMOTICON_REGEX from 'emojibase-regex/emoticon'; import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore"; @@ -61,6 +60,7 @@ import AccessibleButton from '../elements/AccessibleButton'; import {findEditableEvent} from '../../../utils/EventUtils'; import SlateComposerHistoryManager from "../../../SlateComposerHistoryManager"; import TypingStore from "../../../stores/TypingStore"; +import {EMOTICON_TO_EMOJI} from "../../../emoji"; const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$'); @@ -464,7 +464,7 @@ export default class MessageComposerInput extends React.Component { const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(text.slice(0, currentStartOffset)); if (emoticonMatch) { const query = emoticonMatch[1].toLowerCase().replace("-", ""); - const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false); + const data = EMOTICON_TO_EMOJI.get(query); // only perform replacement if we found a match, otherwise we would be not letting user type if (data) { diff --git a/src/emoji.js b/src/emoji.js new file mode 100644 index 0000000000..7b7a9c1bfe --- /dev/null +++ b/src/emoji.js @@ -0,0 +1,82 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import EMOJIBASE from 'emojibase-data/en/compact.json'; + +export const VARIATION_SELECTOR = String.fromCharCode(0xFE0F); + +// The unicode is stored without the variant selector +const UNICODE_TO_EMOJI = new Map(); // not exported as gets for it are handled by getEmojiFromUnicode +export const EMOTICON_TO_EMOJI = new Map(); +export const SHORTCODE_TO_EMOJI = new Map(); + +export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(unicode.replace(VARIATION_SELECTOR, "")); + +const EMOJIBASE_GROUP_ID_TO_CATEGORY = [ + "people", // smileys + "people", // actually people + "control", // modifiers and such, not displayed in picker + "nature", + "foods", + "places", + "activity", + "objects", + "symbols", + "flags", +]; + +export const DATA_BY_CATEGORY = { + "people": [], + "nature": [], + "foods": [], + "places": [], + "activity": [], + "objects": [], + "symbols": [], + "flags": [], +}; + +// Store various mappings from unicode/emoticon/shortcode to the Emoji objects +EMOJIBASE.forEach(emoji => { + if (emoji.unicode.includes(VARIATION_SELECTOR)) { + // Clone data into variation-less version + emoji = Object.assign({}, emoji, { + unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""), + }); + } + + const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group]; + if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) { + DATA_BY_CATEGORY[categoryId].push(emoji); + } + // This is used as the string to match the query against when filtering emojis + emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase(); + + // Add mapping from unicode to Emoji object + UNICODE_TO_EMOJI.set(emoji.unicode, emoji); + + if (emoji.emoticon) { + // Add mapping from emoticon to Emoji object + EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji); + } + + if (emoji.shortcodes) { + // Add mapping from each shortcode to Emoji object + emoji.shortcodes.forEach(shortcode => { + SHORTCODE_TO_EMOJI.set(shortcode, emoji); + }); + } +}); diff --git a/src/stripped-emoji.json b/src/stripped-emoji.json deleted file mode 100644 index 9d4308d24e..0000000000 --- a/src/stripped-emoji.json +++ /dev/null @@ -1 +0,0 @@ -[{"name":"grinning face","shortname":":gleeful:","category":0,"emoji_order":1},{"name":"grinning face with big eyes","shortname":":glad:","category":0,"emoji_order":2,"aliases":[":smile:"]},{"name":"grinning face with smiling eyes","shortname":":happy:","category":0,"emoji_order":3},{"name":"beaming face with smiling eyes","shortname":":blissful:","category":0,"emoji_order":4,"aliases":[":grin:"],"aliases_ascii":[":D"]},{"name":"grinning squinting face","shortname":":amused:","category":0,"emoji_order":5,"aliases":[":laugh:",":lol:"],"aliases_ascii":["xD"]},{"name":"grinning face with sweat","shortname":":embarassed:","category":0,"emoji_order":6},{"name":"rolling on the floor laughing","shortname":":entertained:","category":0,"emoji_order":7,"aliases":[":rofl:"],"aliases_ascii":[":'D"]},{"name":"face with tears of joy","shortname":":joyful:","category":0,"emoji_order":8,"aliases":[":haha:"],"aliases_ascii":[":')"]},{"name":"slightly smiling face","shortname":":pleased:","category":0,"emoji_order":9,"aliases_ascii":[":)"]},{"name":"upside-down face","shortname":":ecstatic:","category":0,"emoji_order":10,"aliases":[":upside_down:"]},{"name":"winking face","shortname":":coy:","category":0,"emoji_order":11,"aliases":[":wink:"],"aliases_ascii":[";)"]},{"name":"smiling face with smiling eyes","shortname":":blush:","category":0,"emoji_order":12,"aliases_ascii":[":>"]},{"name":"smiling face with halo","shortname":":innocent:","category":0,"emoji_order":13,"aliases":[":halo:"],"aliases_ascii":["o:)"]},{"name":"smiling face with hearts","shortname":":love:","category":0,"emoji_order":14},{"name":"smiling face with heart-eyes","shortname":":lovestruck:","category":0,"emoji_order":15},{"name":"star-struck","shortname":":starstruck:","category":0,"emoji_order":16},{"name":"face blowing a kiss","shortname":":flirty:","category":0,"emoji_order":17,"aliases_ascii":[":x"]},{"name":"kissing face","shortname":":kiss:","category":0,"emoji_order":18},{"name":"smiling face","shortname":":relaxed:","category":0,"emoji_order":20},{"name":"kissing face with closed eyes","shortname":":loving_kiss:","category":0,"emoji_order":21,"aliases_ascii":[":*"]},{"name":"kissing face with smiling eyes","shortname":":happy_kiss:","category":0,"emoji_order":22},{"name":"face savoring food","shortname":":yum:","category":0,"emoji_order":23,"aliases":[":savour:"]},{"name":"face with tongue","shortname":":playful:","category":0,"emoji_order":24,"aliases":[":tongue_out:"],"aliases_ascii":[":p"]},{"name":"winking face with tongue","shortname":":mischievous:","category":0,"emoji_order":25,"aliases_ascii":[";p"]},{"name":"zany face","shortname":":crazy:","category":0,"emoji_order":26},{"name":"squinting face with tongue","shortname":":facetious:","category":0,"emoji_order":27,"aliases":[":lmao:"],"aliases_ascii":["xp"]},{"name":"money-mouth face","shortname":":pretentious:","category":0,"emoji_order":28,"aliases":[":money_mouth:"]},{"name":"hugging face","shortname":":hugging:","category":0,"emoji_order":29},{"name":"face with hand over mouth","shortname":":gasp:","category":0,"emoji_order":30},{"name":"shushing face","shortname":":shushing:","category":0,"emoji_order":31},{"name":"thinking face","shortname":":curious:","category":0,"emoji_order":32,"aliases":[":thinking:"],"aliases_ascii":[":l"]},{"name":"zipper-mouth face","shortname":":silenced:","category":0,"emoji_order":33,"aliases":[":zipper_mouth:"],"aliases_ascii":[":z"]},{"name":"face with raised eyebrow","shortname":":contempt:","category":0,"emoji_order":34},{"name":"neutral face","shortname":":indifferent:","category":0,"emoji_order":35,"aliases":[":neutral:"],"aliases_ascii":[":|"]},{"name":"expressionless face","shortname":":apathetic:","category":0,"emoji_order":36,"aliases":[":expressionless:"]},{"name":"face without mouth","shortname":":vacant:","category":0,"emoji_order":37,"aliases":[":no_mouth:"],"aliases_ascii":[":#"]},{"name":"smirking face","shortname":":cocky:","category":0,"emoji_order":38,"aliases":[":smirk:"],"aliases_ascii":[":j"]},{"name":"unamused face","shortname":":unamused:","category":0,"emoji_order":39,"aliases_ascii":[":?"]},{"name":"face with rolling eyes","shortname":":disbelief:","category":0,"emoji_order":40},{"name":"grimacing face","shortname":":grimaced:","category":0,"emoji_order":41,"aliases_ascii":["8D"]},{"name":"lying face","shortname":":lying:","category":0,"emoji_order":42},{"name":"relieved face","shortname":":relieved:","category":0,"emoji_order":43},{"name":"pensive face","shortname":":pensive:","category":0,"emoji_order":44},{"name":"sleepy face","shortname":":sleepy:","category":0,"emoji_order":45},{"name":"drooling face","shortname":":drooling:","category":0,"emoji_order":46},{"name":"sleeping face","shortname":":exhausted:","category":0,"emoji_order":47,"aliases":[":sleeping:"]},{"name":"face with medical mask","shortname":":ill:","category":0,"emoji_order":48,"aliases":[":mask:"]},{"name":"face with thermometer","shortname":":sick:","category":0,"emoji_order":49},{"name":"face with head-bandage","shortname":":injured:","category":0,"emoji_order":50},{"name":"nauseated face","shortname":":nauseated:","category":0,"emoji_order":51,"aliases_ascii":["%("]},{"name":"face vomiting","shortname":":vomiting:","category":0,"emoji_order":52},{"name":"sneezing face","shortname":":sneezing:","category":0,"emoji_order":53},{"name":"hot face","shortname":":overheating:","category":0,"emoji_order":54},{"name":"cold face","shortname":":freezing:","category":0,"emoji_order":55},{"name":"woozy face","shortname":":woozy:","category":0,"emoji_order":56,"aliases_ascii":[":&"]},{"name":"dizzy face","shortname":":dizzy:","category":0,"emoji_order":57,"aliases_ascii":["xo"]},{"name":"exploding head","shortname":":shocked:","category":0,"emoji_order":58,"aliases":[":exploding_head:"]},{"name":"cowboy hat face","shortname":":cowboy:","category":0,"emoji_order":59},{"name":"partying face","shortname":":partying:","category":0,"emoji_order":60,"aliases":[":celebrating:"]},{"name":"smiling face with sunglasses","shortname":":confident:","category":0,"emoji_order":61,"aliases_ascii":["8)"]},{"name":"nerd face","shortname":":nerd:","category":0,"emoji_order":62,"aliases_ascii":[":B"]},{"name":"face with monocle","shortname":":monocle:","category":0,"emoji_order":63},{"name":"confused face","shortname":":confused:","category":0,"emoji_order":64,"aliases_ascii":[":/"]},{"name":"worried face","shortname":":worried:","category":0,"emoji_order":65},{"name":"slightly frowning face","shortname":":cheerless:","category":0,"emoji_order":66},{"name":"frowning face","shortname":":sad:","category":0,"emoji_order":68,"aliases":[":frowning:"],"aliases_ascii":[":("]},{"name":"face with open mouth","shortname":":surprised:","category":0,"emoji_order":69},{"name":"hushed face","shortname":":hushed:","category":0,"emoji_order":70},{"name":"astonished face","shortname":":astonished:","category":0,"emoji_order":71,"aliases_ascii":[":o"]},{"name":"flushed face","shortname":":flushed:","category":0,"emoji_order":72,"aliases_ascii":[":$"]},{"name":"pleading face","shortname":":pleading:","category":0,"emoji_order":73},{"name":"frowning face with open mouth","shortname":":bored:","category":0,"emoji_order":74},{"name":"anguished face","shortname":":anguished:","category":0,"emoji_order":75,"aliases":[":wtf:"],"aliases_ascii":[":s"]},{"name":"fearful face","shortname":":fearful:","category":0,"emoji_order":76},{"name":"anxious face with sweat","shortname":":cold_sweat:","category":0,"emoji_order":77,"aliases":[":anxious:",":frustrated:"]},{"name":"sad but relieved face","shortname":":hopeful:","category":0,"emoji_order":78},{"name":"crying face","shortname":":upset:","category":0,"emoji_order":79,"aliases":[":cry:"],"aliases_ascii":[":'("]},{"name":"loudly crying face","shortname":":distressed:","category":0,"emoji_order":80,"aliases":[":sob:"],"aliases_ascii":[":'o"]},{"name":"face screaming in fear","shortname":":frightened:","category":0,"emoji_order":81,"aliases":[":scream:"],"aliases_ascii":["Dx"]},{"name":"confounded face","shortname":":confounded:","category":0,"emoji_order":82,"aliases_ascii":["x("]},{"name":"persevering face","shortname":":persevered:","category":0,"emoji_order":83},{"name":"disappointed face","shortname":":disappointed:","category":0,"emoji_order":84},{"name":"downcast face with sweat","shortname":":shamed:","category":0,"emoji_order":85,"aliases_ascii":[":<"]},{"name":"weary face","shortname":":weary:","category":0,"emoji_order":86,"aliases_ascii":["D:"]},{"name":"tired face","shortname":":tired:","category":0,"emoji_order":87,"aliases_ascii":[":c"]},{"name":"yawning face","shortname":":yawn:","category":0,"emoji_order":88},{"name":"face with steam from nose","shortname":":annoyed:","category":0,"emoji_order":89,"aliases":[":hrmph:"]},{"name":"pouting face","shortname":":enraged:","category":0,"emoji_order":90,"aliases":[":pout:"],"aliases_ascii":[">:/"]},{"name":"angry face","shortname":":angry:","category":0,"emoji_order":91},{"name":"face with symbols on mouth","shortname":":censored:","category":0,"emoji_order":92,"aliases_ascii":[":@"]},{"name":"smiling face with horns","shortname":":imp:","category":0,"emoji_order":93,"aliases_ascii":[">:)"]},{"name":"angry face with horns","shortname":":angry_imp:","category":0,"emoji_order":94,"aliases_ascii":[">:("]},{"name":"skull","shortname":":skull:","category":0,"emoji_order":95},{"name":"skull and crossbones","shortname":":crossbones:","category":0,"emoji_order":97},{"name":"pile of poo","shortname":":poop:","category":0,"emoji_order":98},{"name":"clown face","shortname":":clown:","category":0,"emoji_order":99},{"name":"ogre","shortname":":ogre:","category":0,"emoji_order":100,"aliases_ascii":[">0)"]},{"name":"goblin","shortname":":goblin:","category":0,"emoji_order":101},{"name":"ghost","shortname":":ghost:","category":0,"emoji_order":102},{"name":"alien","shortname":":alien:","category":0,"emoji_order":103},{"name":"alien monster","shortname":":alien_monster:","category":0,"emoji_order":104,"aliases":[":space_invader:"]},{"name":"robot","shortname":":robot:","category":0,"emoji_order":105},{"name":"grinning cat","shortname":":smiling_cat:","category":0,"emoji_order":106},{"name":"grinning cat with smiling eyes","shortname":":grinning_cat:","category":0,"emoji_order":107},{"name":"cat with tears of joy","shortname":":joyful_cat:","category":0,"emoji_order":108},{"name":"smiling cat with heart-eyes","shortname":":lovestruck_cat:","category":0,"emoji_order":109},{"name":"cat with wry smile","shortname":":smirking_cat:","category":0,"emoji_order":110},{"name":"kissing cat","shortname":":kissing_cat:","category":0,"emoji_order":111,"aliases_ascii":[":3"]},{"name":"weary cat","shortname":":weary_cat:","category":0,"emoji_order":112},{"name":"crying cat","shortname":":crying_cat:","category":0,"emoji_order":113},{"name":"pouting cat","shortname":":pouting_cat:","category":0,"emoji_order":114},{"name":"see-no-evil monkey","shortname":":see_no_evil:","category":0,"emoji_order":115},{"name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":0,"emoji_order":116},{"name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":0,"emoji_order":117},{"name":"kiss mark","shortname":":kiss_lips:","category":0,"emoji_order":118},{"name":"love letter","shortname":":love_letter:","category":0,"emoji_order":119},{"name":"heart with arrow","shortname":":cupid:","category":0,"emoji_order":120},{"name":"heart with ribbon","shortname":":heart_ribbon:","category":0,"emoji_order":121},{"name":"sparkling heart","shortname":":sparkling_heart:","category":0,"emoji_order":122},{"name":"growing heart","shortname":":heartpulse:","category":0,"emoji_order":123},{"name":"beating heart","shortname":":heartbeat:","category":0,"emoji_order":124},{"name":"revolving hearts","shortname":":revolving_hearts:","category":0,"emoji_order":125},{"name":"two hearts","shortname":":two_hearts:","category":0,"emoji_order":126},{"name":"heart decoration","shortname":":heart_decoration:","category":0,"emoji_order":127},{"name":"heart exclamation","shortname":":heart_exclamation:","category":0,"emoji_order":129},{"name":"broken heart","shortname":":broken_heart:","category":0,"emoji_order":130,"aliases_ascii":[""]},{"name":"woman mage","shortname":":woman_mage:","category":1,"emoji_order":1375},{"name":"fairy","shortname":":fairy:","category":1,"emoji_order":1387},{"name":"man fairy","shortname":":man_fairy:","category":1,"emoji_order":1393},{"name":"woman fairy","shortname":":woman_fairy:","category":1,"emoji_order":1405},{"name":"vampire","shortname":":vampire:","category":1,"emoji_order":1417,"aliases_ascii":[":E"]},{"name":"man vampire","shortname":":man_vampire:","category":1,"emoji_order":1423},{"name":"woman vampire","shortname":":woman_vampire:","category":1,"emoji_order":1435},{"name":"merperson","shortname":":merperson:","category":1,"emoji_order":1447},{"name":"merman","shortname":":merman:","category":1,"emoji_order":1453},{"name":"mermaid","shortname":":mermaid:","category":1,"emoji_order":1465},{"name":"elf","shortname":":elf:","category":1,"emoji_order":1477},{"name":"man elf","shortname":":man_elf:","category":1,"emoji_order":1483},{"name":"woman elf","shortname":":woman_elf:","category":1,"emoji_order":1495},{"name":"genie","shortname":":genie:","category":1,"emoji_order":1507},{"name":"man genie","shortname":":man_genie:","category":1,"emoji_order":1508},{"name":"woman genie","shortname":":woman_genie:","category":1,"emoji_order":1510},{"name":"zombie","shortname":":zombie:","category":1,"emoji_order":1512,"aliases_ascii":["8#"]},{"name":"man zombie","shortname":":man_zombie:","category":1,"emoji_order":1513},{"name":"woman zombie","shortname":":woman_zombie:","category":1,"emoji_order":1515},{"name":"person getting massage","shortname":":person_getting_massage:","category":1,"emoji_order":1517},{"name":"man getting massage","shortname":":man_getting_face_massage:","category":1,"emoji_order":1523},{"name":"woman getting massage","shortname":":woman_getting_face_massage:","category":1,"emoji_order":1535},{"name":"person getting haircut","shortname":":person_getting_haircut:","category":1,"emoji_order":1547},{"name":"man getting haircut","shortname":":man_getting_haircut:","category":1,"emoji_order":1553},{"name":"woman getting haircut","shortname":":woman_getting_haircut:","category":1,"emoji_order":1565},{"name":"person walking","shortname":":person_walking:","category":1,"emoji_order":1577},{"name":"man walking","shortname":":man_walking:","category":1,"emoji_order":1583},{"name":"woman walking","shortname":":woman_walking:","category":1,"emoji_order":1595},{"name":"person standing","shortname":":person_standing:","category":1,"emoji_order":1607},{"name":"man standing","shortname":":man_standing:","category":1,"emoji_order":1613},{"name":"woman standing","shortname":":woman_standing:","category":1,"emoji_order":1625},{"name":"person kneeling","shortname":":person_kneeling:","category":1,"emoji_order":1637},{"name":"man kneeling","shortname":":man_kneeling:","category":1,"emoji_order":1643},{"name":"woman kneeling","shortname":":woman_kneeling:","category":1,"emoji_order":1655},{"name":"man with probing cane","shortname":":man_probing_cane:","category":1,"emoji_order":1667},{"name":"woman with probing cane","shortname":":woman_probing_cane:","category":1,"emoji_order":1673},{"name":"man in motorized wheelchair","shortname":":man_motor_wheelchair:","category":1,"emoji_order":1679},{"name":"woman in motorized wheelchair","shortname":":woman_motor_wheelchair:","category":1,"emoji_order":1685},{"name":"man in manual wheelchair","shortname":":man_wheelchair:","category":1,"emoji_order":1691},{"name":"woman in manual wheelchair","shortname":":woman_wheelchair:","category":1,"emoji_order":1697},{"name":"person running","shortname":":person_running:","category":1,"emoji_order":1703},{"name":"man running","shortname":":man_running:","category":1,"emoji_order":1709},{"name":"woman running","shortname":":woman_running:","category":1,"emoji_order":1721},{"name":"woman dancing","shortname":":dancer:","category":1,"emoji_order":1733,"aliases":[":woman_dancing:"]},{"name":"man dancing","shortname":":man_dancing:","category":1,"emoji_order":1739},{"name":"man in suit levitating","shortname":":levitate:","category":1,"emoji_order":1746},{"name":"people with bunny ears","shortname":":people_bunny_ears_partying:","category":1,"emoji_order":1752},{"name":"men with bunny ears","shortname":":men_bunny_ears_partying:","category":1,"emoji_order":1753},{"name":"women with bunny ears","shortname":":women_bunny_ears_partying:","category":1,"emoji_order":1755},{"name":"person in steamy room","shortname":":person_steamy_room:","category":1,"emoji_order":1757},{"name":"man in steamy room","shortname":":man_steamy_room:","category":1,"emoji_order":1763},{"name":"woman in steamy room","shortname":":woman_steamy_room:","category":1,"emoji_order":1775},{"name":"person climbing","shortname":":person_climbing:","category":1,"emoji_order":1787},{"name":"man climbing","shortname":":man_climbing:","category":1,"emoji_order":1793},{"name":"woman climbing","shortname":":woman_climbing:","category":1,"emoji_order":1805},{"name":"person fencing","shortname":":person_fencing:","category":1,"emoji_order":1817},{"name":"horse racing","shortname":":horse_racing:","category":1,"emoji_order":1818},{"name":"skier","shortname":":skier:","category":1,"emoji_order":1825},{"name":"snowboarder","shortname":":snowboarder:","category":1,"emoji_order":1826},{"name":"person golfing","shortname":":person_golfing:","category":1,"emoji_order":1833},{"name":"man golfing","shortname":":man_golfing:","category":1,"emoji_order":1839},{"name":"woman golfing","shortname":":woman_golfing:","category":1,"emoji_order":1853},{"name":"person surfing","shortname":":person_surfing:","category":1,"emoji_order":1867},{"name":"man surfing","shortname":":man_surfing:","category":1,"emoji_order":1873},{"name":"woman surfing","shortname":":woman_surfing:","category":1,"emoji_order":1885},{"name":"person rowing boat","shortname":":person_rowing_boat:","category":1,"emoji_order":1897},{"name":"man rowing boat","shortname":":man_rowing_boat:","category":1,"emoji_order":1903},{"name":"woman rowing boat","shortname":":woman_rowing_boat:","category":1,"emoji_order":1915},{"name":"person swimming","shortname":":person_swimming:","category":1,"emoji_order":1927},{"name":"man swimming","shortname":":man_swimming:","category":1,"emoji_order":1933},{"name":"woman swimming","shortname":":woman_swimming:","category":1,"emoji_order":1945},{"name":"person bouncing ball","shortname":":person_bouncing_ball:","category":1,"emoji_order":1958},{"name":"man bouncing ball","shortname":":man_bouncing_ball:","category":1,"emoji_order":1964},{"name":"woman bouncing ball","shortname":":woman_bouncing_ball:","category":1,"emoji_order":1978},{"name":"person lifting weights","shortname":":person_lifting_weights:","category":1,"emoji_order":1993},{"name":"man lifting weights","shortname":":man_lifting_weights:","category":1,"emoji_order":1999},{"name":"woman lifting weights","shortname":":woman_lifting_weights:","category":1,"emoji_order":2013},{"name":"person biking","shortname":":person_biking:","category":1,"emoji_order":2027},{"name":"man biking","shortname":":man_biking:","category":1,"emoji_order":2033},{"name":"woman biking","shortname":":woman_biking:","category":1,"emoji_order":2045},{"name":"person mountain biking","shortname":":person_mountain_biking:","category":1,"emoji_order":2057},{"name":"man mountain biking","shortname":":man_mountain_biking:","category":1,"emoji_order":2063},{"name":"woman mountain biking","shortname":":woman_mountain_biking:","category":1,"emoji_order":2075},{"name":"person cartwheeling","shortname":":person_cartwheel:","category":1,"emoji_order":2087},{"name":"man cartwheeling","shortname":":man_cartwheeling:","category":1,"emoji_order":2093},{"name":"woman cartwheeling","shortname":":woman_cartwheeling:","category":1,"emoji_order":2105},{"name":"people wrestling","shortname":":people_wrestling:","category":1,"emoji_order":2117},{"name":"men wrestling","shortname":":men_wrestling:","category":1,"emoji_order":2118},{"name":"women wrestling","shortname":":women_wrestling:","category":1,"emoji_order":2120},{"name":"person playing water polo","shortname":":person_water_polo:","category":1,"emoji_order":2122},{"name":"man playing water polo","shortname":":man_water_polo:","category":1,"emoji_order":2128},{"name":"woman playing water polo","shortname":":woman_water_polo:","category":1,"emoji_order":2140},{"name":"person playing handball","shortname":":person_handball:","category":1,"emoji_order":2152},{"name":"man playing handball","shortname":":man_handball:","category":1,"emoji_order":2158},{"name":"woman playing handball","shortname":":woman_handball:","category":1,"emoji_order":2170},{"name":"person juggling","shortname":":person_juggling:","category":1,"emoji_order":2182},{"name":"man juggling","shortname":":man_juggling:","category":1,"emoji_order":2188},{"name":"woman juggling","shortname":":woman_juggling:","category":1,"emoji_order":2200},{"name":"person in lotus position","shortname":":person_lotus_position:","category":1,"emoji_order":2212},{"name":"man in lotus position","shortname":":man_lotus_position:","category":1,"emoji_order":2218},{"name":"woman in lotus position","shortname":":woman_lotus_position:","category":1,"emoji_order":2230},{"name":"person taking bath","shortname":":bath:","category":1,"emoji_order":2242},{"name":"person in bed","shortname":":in_bed:","category":1,"emoji_order":2248},{"name":"people holding hands","shortname":":holding_hands_people:","category":1,"emoji_order":2254},{"name":"women holding hands","shortname":":holding_hands_ww:","category":1,"emoji_order":2270},{"name":"woman and man holding hands","shortname":":holding_hands_mw:","category":1,"emoji_order":2286,"aliases":[":holding_hands_wm:"]},{"name":"men holding hands","shortname":":holding_hands_mm:","category":1,"emoji_order":2312},{"name":"kiss","shortname":":couple:","category":1,"emoji_order":2328},{"name":"kiss: woman, man","shortname":":kiss_mw:","category":1,"emoji_order":2329,"aliases":[":kiss_wm:"]},{"name":"kiss: man, man","shortname":":kiss_mm:","category":1,"emoji_order":2331},{"name":"kiss: woman, woman","shortname":":kiss_ww:","category":1,"emoji_order":2333},{"name":"couple with heart","shortname":":couple_heart:","category":1,"emoji_order":2335},{"name":"couple with heart: woman, man","shortname":":couple_mw:","category":1,"emoji_order":2336,"aliases":[":couple_wm:"]},{"name":"couple with heart: man, man","shortname":":couple_mm:","category":1,"emoji_order":2338},{"name":"couple with heart: woman, woman","shortname":":couple_ww:","category":1,"emoji_order":2340},{"name":"family","shortname":":family:","category":1,"emoji_order":2342},{"name":"family: man, woman, boy","shortname":":family_mwb:","category":1,"emoji_order":2343},{"name":"family: man, woman, girl","shortname":":family_mwg:","category":1,"emoji_order":2344},{"name":"family: man, woman, girl, boy","shortname":":family_mwgb:","category":1,"emoji_order":2345},{"name":"family: man, woman, boy, boy","shortname":":family_mwbb:","category":1,"emoji_order":2346},{"name":"family: man, woman, girl, girl","shortname":":family_mwgg:","category":1,"emoji_order":2347},{"name":"family: man, man, boy","shortname":":family_mmb:","category":1,"emoji_order":2348},{"name":"family: man, man, girl","shortname":":family_mmg:","category":1,"emoji_order":2349},{"name":"family: man, man, girl, boy","shortname":":family_mmgb:","category":1,"emoji_order":2350},{"name":"family: man, man, boy, boy","shortname":":family_mmbb:","category":1,"emoji_order":2351},{"name":"family: man, man, girl, girl","shortname":":family_mmgg:","category":1,"emoji_order":2352},{"name":"family: woman, woman, boy","shortname":":family_wwb:","category":1,"emoji_order":2353},{"name":"family: woman, woman, girl","shortname":":family_wwg:","category":1,"emoji_order":2354},{"name":"family: woman, woman, girl, boy","shortname":":family_wwgb:","category":1,"emoji_order":2355},{"name":"family: woman, woman, boy, boy","shortname":":family_wwbb:","category":1,"emoji_order":2356},{"name":"family: woman, woman, girl, girl","shortname":":family_wwgg:","category":1,"emoji_order":2357},{"name":"family: man, boy","shortname":":family_mb:","category":1,"emoji_order":2358},{"name":"family: man, boy, boy","shortname":":family_mbb:","category":1,"emoji_order":2359},{"name":"family: man, girl","shortname":":family_mg:","category":1,"emoji_order":2360},{"name":"family: man, girl, boy","shortname":":family_mgb:","category":1,"emoji_order":2361},{"name":"family: man, girl, girl","shortname":":family_mgg:","category":1,"emoji_order":2362},{"name":"family: woman, boy","shortname":":family_wb:","category":1,"emoji_order":2363},{"name":"family: woman, boy, boy","shortname":":family_wbb:","category":1,"emoji_order":2364},{"name":"family: woman, girl","shortname":":family_wg:","category":1,"emoji_order":2365},{"name":"family: woman, girl, boy","shortname":":family_wgb:","category":1,"emoji_order":2366},{"name":"family: woman, girl, girl","shortname":":family_wgg:","category":1,"emoji_order":2367},{"name":"speaking head","shortname":":speaking_head:","category":1,"emoji_order":2369},{"name":"bust in silhouette","shortname":":bust_silhouette:","category":1,"emoji_order":2370},{"name":"busts in silhouette","shortname":":busts_silhouette:","category":1,"emoji_order":2371},{"name":"footprints","shortname":":footprints:","category":1,"emoji_order":2372},{"name":"light skin tone","shortname":":tone_light:","category":2,"emoji_order":2373,"aliases":[":tone1:"]},{"name":"medium-light skin tone","shortname":":tone_medium_light:","category":2,"emoji_order":2374,"aliases":[":tone2:"]},{"name":"medium skin tone","shortname":":tone_medium:","category":2,"emoji_order":2375,"aliases":[":tone3:"]},{"name":"medium-dark skin tone","shortname":":tone_medium_dark:","category":2,"emoji_order":2376,"aliases":[":tone4:"]},{"name":"dark skin tone","shortname":":tone_dark:","category":2,"emoji_order":2377,"aliases":[":tone5:"]},{"name":"red hair","shortname":":red_hair:","category":2,"emoji_order":2378},{"name":"curly hair","shortname":":curly_hair:","category":2,"emoji_order":2379},{"name":"white hair","shortname":":white_hair:","category":2,"emoji_order":2380},{"name":"bald","shortname":":bald:","category":2,"emoji_order":2381},{"name":"monkey face","shortname":":monkey_face:","category":3,"emoji_order":2382},{"name":"monkey","shortname":":monkey:","category":3,"emoji_order":2383},{"name":"gorilla","shortname":":gorilla:","category":3,"emoji_order":2384},{"name":"orangutan","shortname":":orangutan:","category":3,"emoji_order":2385},{"name":"dog face","shortname":":dog_face:","category":3,"emoji_order":2386},{"name":"dog","shortname":":dog:","category":3,"emoji_order":2387},{"name":"guide dog","shortname":":guide_dog:","category":3,"emoji_order":2388},{"name":"service dog","shortname":":service_dog:","category":3,"emoji_order":2389},{"name":"poodle","shortname":":poodle:","category":3,"emoji_order":2390},{"name":"wolf","shortname":":wolf_face:","category":3,"emoji_order":2391},{"name":"fox","shortname":":fox_face:","category":3,"emoji_order":2392},{"name":"raccoon","shortname":":raccoon:","category":3,"emoji_order":2393},{"name":"cat face","shortname":":cat_face:","category":3,"emoji_order":2394},{"name":"cat","shortname":":cat:","category":3,"emoji_order":2395},{"name":"lion","shortname":":lion_face:","category":3,"emoji_order":2396},{"name":"tiger face","shortname":":tiger_face:","category":3,"emoji_order":2397},{"name":"tiger","shortname":":tiger:","category":3,"emoji_order":2398},{"name":"leopard","shortname":":leopard:","category":3,"emoji_order":2399},{"name":"horse face","shortname":":horse_face:","category":3,"emoji_order":2400},{"name":"horse","shortname":":horse:","category":3,"emoji_order":2401},{"name":"unicorn","shortname":":unicorn_face:","category":3,"emoji_order":2402},{"name":"zebra","shortname":":zebra:","category":3,"emoji_order":2403},{"name":"deer","shortname":":deer:","category":3,"emoji_order":2404},{"name":"cow face","shortname":":cow_face:","category":3,"emoji_order":2405},{"name":"ox","shortname":":ox:","category":3,"emoji_order":2406},{"name":"water buffalo","shortname":":water_buffalo:","category":3,"emoji_order":2407},{"name":"cow","shortname":":cow:","category":3,"emoji_order":2408},{"name":"pig face","shortname":":pig_face:","category":3,"emoji_order":2409},{"name":"pig","shortname":":pig:","category":3,"emoji_order":2410},{"name":"boar","shortname":":boar:","category":3,"emoji_order":2411},{"name":"pig nose","shortname":":pig_nose:","category":3,"emoji_order":2412},{"name":"ram","shortname":":ram:","category":3,"emoji_order":2413},{"name":"ewe","shortname":":sheep:","category":3,"emoji_order":2414},{"name":"goat","shortname":":goat:","category":3,"emoji_order":2415},{"name":"camel","shortname":":camel:","category":3,"emoji_order":2416},{"name":"two-hump camel","shortname":":two_hump_camel:","category":3,"emoji_order":2417},{"name":"llama","shortname":":llama:","category":3,"emoji_order":2418},{"name":"giraffe","shortname":":giraffe:","category":3,"emoji_order":2419},{"name":"elephant","shortname":":elephant:","category":3,"emoji_order":2420},{"name":"rhinoceros","shortname":":rhino:","category":3,"emoji_order":2421},{"name":"hippopotamus","shortname":":hippo:","category":3,"emoji_order":2422},{"name":"mouse face","shortname":":mouse_face:","category":3,"emoji_order":2423},{"name":"mouse","shortname":":mouse:","category":3,"emoji_order":2424},{"name":"rat","shortname":":rat:","category":3,"emoji_order":2425},{"name":"hamster","shortname":":hamster_face:","category":3,"emoji_order":2426},{"name":"rabbit face","shortname":":rabbit_face:","category":3,"emoji_order":2427},{"name":"rabbit","shortname":":rabbit:","category":3,"emoji_order":2428},{"name":"chipmunk","shortname":":chipmunk:","category":3,"emoji_order":2430},{"name":"hedgehog","shortname":":hedgehog:","category":3,"emoji_order":2431},{"name":"bat","shortname":":bat:","category":3,"emoji_order":2432},{"name":"bear","shortname":":bear_face:","category":3,"emoji_order":2433},{"name":"koala","shortname":":koala_face:","category":3,"emoji_order":2434},{"name":"panda","shortname":":panda_face:","category":3,"emoji_order":2435},{"name":"sloth","shortname":":sloth:","category":3,"emoji_order":2436},{"name":"otter","shortname":":otter:","category":3,"emoji_order":2437},{"name":"skunk","shortname":":skunk:","category":3,"emoji_order":2438},{"name":"kangaroo","shortname":":kangaroo:","category":3,"emoji_order":2439},{"name":"badger","shortname":":badger:","category":3,"emoji_order":2440},{"name":"paw prints","shortname":":feet:","category":3,"emoji_order":2441},{"name":"turkey","shortname":":turkey:","category":3,"emoji_order":2442},{"name":"chicken","shortname":":chicken:","category":3,"emoji_order":2443},{"name":"rooster","shortname":":rooster:","category":3,"emoji_order":2444},{"name":"hatching chick","shortname":":hatching_chick:","category":3,"emoji_order":2445},{"name":"baby chick","shortname":":baby_chick:","category":3,"emoji_order":2446},{"name":"front-facing baby chick","shortname":":hatched_chick:","category":3,"emoji_order":2447},{"name":"bird","shortname":":bird:","category":3,"emoji_order":2448},{"name":"penguin","shortname":":penguin:","category":3,"emoji_order":2449},{"name":"dove","shortname":":dove:","category":3,"emoji_order":2451},{"name":"eagle","shortname":":eagle:","category":3,"emoji_order":2452},{"name":"duck","shortname":":duck:","category":3,"emoji_order":2453},{"name":"swan","shortname":":swan:","category":3,"emoji_order":2454},{"name":"owl","shortname":":owl:","category":3,"emoji_order":2455},{"name":"flamingo","shortname":":flamingo:","category":3,"emoji_order":2456},{"name":"peacock","shortname":":peacock:","category":3,"emoji_order":2457},{"name":"parrot","shortname":":parrot:","category":3,"emoji_order":2458},{"name":"frog","shortname":":frog_face:","category":3,"emoji_order":2459},{"name":"crocodile","shortname":":crocodile:","category":3,"emoji_order":2460},{"name":"turtle","shortname":":turtle:","category":3,"emoji_order":2461},{"name":"lizard","shortname":":lizard:","category":3,"emoji_order":2462},{"name":"snake","shortname":":snake:","category":3,"emoji_order":2463},{"name":"dragon face","shortname":":dragon_face:","category":3,"emoji_order":2464},{"name":"dragon","shortname":":dragon:","category":3,"emoji_order":2465},{"name":"sauropod","shortname":":sauropod:","category":3,"emoji_order":2466},{"name":"T-Rex","shortname":":trex:","category":3,"emoji_order":2467},{"name":"spouting whale","shortname":":spouting_whale:","category":3,"emoji_order":2468},{"name":"whale","shortname":":whale:","category":3,"emoji_order":2469},{"name":"dolphin","shortname":":dolphin:","category":3,"emoji_order":2470},{"name":"fish","shortname":":fish:","category":3,"emoji_order":2471},{"name":"tropical fish","shortname":":tropical_fish:","category":3,"emoji_order":2472},{"name":"blowfish","shortname":":blowfish:","category":3,"emoji_order":2473},{"name":"shark","shortname":":shark:","category":3,"emoji_order":2474},{"name":"octopus","shortname":":octopus:","category":3,"emoji_order":2475},{"name":"spiral shell","shortname":":shell:","category":3,"emoji_order":2476},{"name":"snail","shortname":":snail:","category":3,"emoji_order":2477},{"name":"butterfly","shortname":":butterfly:","category":3,"emoji_order":2478},{"name":"bug","shortname":":bug:","category":3,"emoji_order":2479},{"name":"ant","shortname":":ant:","category":3,"emoji_order":2480},{"name":"honeybee","shortname":":bee:","category":3,"emoji_order":2481},{"name":"lady beetle","shortname":":beetle:","category":3,"emoji_order":2482},{"name":"cricket","shortname":":cricket:","category":3,"emoji_order":2483},{"name":"spider","shortname":":spider:","category":3,"emoji_order":2485},{"name":"spider web","shortname":":spider_web:","category":3,"emoji_order":2487},{"name":"scorpion","shortname":":scorpion:","category":3,"emoji_order":2488},{"name":"mosquito","shortname":":mosquito:","category":3,"emoji_order":2489},{"name":"microbe","shortname":":microbe:","category":3,"emoji_order":2490,"aliases":[":germ:"]},{"name":"bouquet","shortname":":bouquet:","category":3,"emoji_order":2491},{"name":"cherry blossom","shortname":":cherry_blossom:","category":3,"emoji_order":2492},{"name":"white flower","shortname":":white_flower:","category":3,"emoji_order":2493},{"name":"rosette","shortname":":rosette:","category":3,"emoji_order":2495},{"name":"rose","shortname":":rose:","category":3,"emoji_order":2496},{"name":"wilted flower","shortname":":wilted_rose:","category":3,"emoji_order":2497},{"name":"hibiscus","shortname":":hibiscus:","category":3,"emoji_order":2498},{"name":"sunflower","shortname":":sunflower:","category":3,"emoji_order":2499},{"name":"blossom","shortname":":blossom:","category":3,"emoji_order":2500},{"name":"tulip","shortname":":tulip:","category":3,"emoji_order":2501},{"name":"seedling","shortname":":seedling:","category":3,"emoji_order":2502},{"name":"evergreen tree","shortname":":evergreen_tree:","category":3,"emoji_order":2503},{"name":"deciduous tree","shortname":":deciduous_tree:","category":3,"emoji_order":2504},{"name":"palm tree","shortname":":palm_tree:","category":3,"emoji_order":2505},{"name":"cactus","shortname":":cactus:","category":3,"emoji_order":2506},{"name":"sheaf of rice","shortname":":ear_of_rice:","category":3,"emoji_order":2507},{"name":"herb","shortname":":herb:","category":3,"emoji_order":2508},{"name":"shamrock","shortname":":shamrock:","category":3,"emoji_order":2510},{"name":"four leaf clover","shortname":":four_leaf_clover:","category":3,"emoji_order":2511},{"name":"maple leaf","shortname":":maple_leaf:","category":3,"emoji_order":2512},{"name":"fallen leaf","shortname":":fallen_leaf:","category":3,"emoji_order":2513},{"name":"leaf fluttering in wind","shortname":":leaves:","category":3,"emoji_order":2514},{"name":"grapes","shortname":":grapes:","category":4,"emoji_order":2515},{"name":"melon","shortname":":melon:","category":4,"emoji_order":2516},{"name":"watermelon","shortname":":watermelon:","category":4,"emoji_order":2517},{"name":"tangerine","shortname":":tangerine:","category":4,"emoji_order":2518},{"name":"lemon","shortname":":lemon:","category":4,"emoji_order":2519},{"name":"banana","shortname":":banana:","category":4,"emoji_order":2520},{"name":"pineapple","shortname":":pineapple:","category":4,"emoji_order":2521},{"name":"mango","shortname":":mango:","category":4,"emoji_order":2522},{"name":"red apple","shortname":":apple:","category":4,"emoji_order":2523},{"name":"green apple","shortname":":green_apple:","category":4,"emoji_order":2524},{"name":"pear","shortname":":pear:","category":4,"emoji_order":2525},{"name":"peach","shortname":":peach:","category":4,"emoji_order":2526},{"name":"cherries","shortname":":cherries:","category":4,"emoji_order":2527},{"name":"strawberry","shortname":":strawberry:","category":4,"emoji_order":2528},{"name":"kiwi fruit","shortname":":kiwi:","category":4,"emoji_order":2529},{"name":"tomato","shortname":":tomato:","category":4,"emoji_order":2530},{"name":"coconut","shortname":":coconut:","category":4,"emoji_order":2531},{"name":"avocado","shortname":":avocado:","category":4,"emoji_order":2532},{"name":"eggplant","shortname":":eggplant:","category":4,"emoji_order":2533},{"name":"potato","shortname":":potato:","category":4,"emoji_order":2534},{"name":"carrot","shortname":":carrot:","category":4,"emoji_order":2535},{"name":"ear of corn","shortname":":corn:","category":4,"emoji_order":2536},{"name":"hot pepper","shortname":":hot_pepper:","category":4,"emoji_order":2538},{"name":"cucumber","shortname":":cucumber:","category":4,"emoji_order":2539},{"name":"leafy green","shortname":":leafy_green:","category":4,"emoji_order":2540},{"name":"broccoli","shortname":":broccoli:","category":4,"emoji_order":2541},{"name":"garlic","shortname":":garlic:","category":4,"emoji_order":2542},{"name":"onion","shortname":":onion:","category":4,"emoji_order":2543},{"name":"mushroom","shortname":":mushroom:","category":4,"emoji_order":2544},{"name":"peanuts","shortname":":peanuts:","category":4,"emoji_order":2545},{"name":"chestnut","shortname":":chestnut:","category":4,"emoji_order":2546},{"name":"bread","shortname":":bread:","category":4,"emoji_order":2547},{"name":"croissant","shortname":":croissant:","category":4,"emoji_order":2548},{"name":"baguette bread","shortname":":french_bread:","category":4,"emoji_order":2549},{"name":"pretzel","shortname":":pretzel:","category":4,"emoji_order":2550},{"name":"bagel","shortname":":bagel:","category":4,"emoji_order":2551},{"name":"pancakes","shortname":":pancakes:","category":4,"emoji_order":2552},{"name":"waffle","shortname":":waffle:","category":4,"emoji_order":2553},{"name":"cheese wedge","shortname":":cheese:","category":4,"emoji_order":2554},{"name":"meat on bone","shortname":":meat_on_bone:","category":4,"emoji_order":2555},{"name":"poultry leg","shortname":":poultry_leg:","category":4,"emoji_order":2556},{"name":"cut of meat","shortname":":cut_of_meat:","category":4,"emoji_order":2557},{"name":"bacon","shortname":":bacon:","category":4,"emoji_order":2558},{"name":"hamburger","shortname":":hamburger:","category":4,"emoji_order":2559},{"name":"french fries","shortname":":fries:","category":4,"emoji_order":2560},{"name":"pizza","shortname":":pizza:","category":4,"emoji_order":2561},{"name":"hot dog","shortname":":hotdog:","category":4,"emoji_order":2562},{"name":"sandwich","shortname":":sandwich:","category":4,"emoji_order":2563},{"name":"taco","shortname":":taco:","category":4,"emoji_order":2564},{"name":"burrito","shortname":":burrito:","category":4,"emoji_order":2565},{"name":"stuffed flatbread","shortname":":stuffed_flatbread:","category":4,"emoji_order":2566},{"name":"falafel","shortname":":falafel:","category":4,"emoji_order":2567},{"name":"egg","shortname":":egg:","category":4,"emoji_order":2568},{"name":"cooking","shortname":":cooking:","category":4,"emoji_order":2569},{"name":"shallow pan of food","shortname":":shallow_pan_of_food:","category":4,"emoji_order":2570},{"name":"pot of food","shortname":":stew:","category":4,"emoji_order":2571},{"name":"bowl with spoon","shortname":":bowl_spoon:","category":4,"emoji_order":2572},{"name":"green salad","shortname":":salad:","category":4,"emoji_order":2573},{"name":"popcorn","shortname":":popcorn:","category":4,"emoji_order":2574},{"name":"butter","shortname":":butter:","category":4,"emoji_order":2575},{"name":"salt","shortname":":salt:","category":4,"emoji_order":2576},{"name":"canned food","shortname":":canned_food:","category":4,"emoji_order":2577},{"name":"bento box","shortname":":bento:","category":4,"emoji_order":2578},{"name":"rice cracker","shortname":":rice_cracker:","category":4,"emoji_order":2579},{"name":"rice ball","shortname":":rice_ball:","category":4,"emoji_order":2580},{"name":"cooked rice","shortname":":rice:","category":4,"emoji_order":2581},{"name":"curry rice","shortname":":curry:","category":4,"emoji_order":2582},{"name":"steaming bowl","shortname":":ramen:","category":4,"emoji_order":2583},{"name":"spaghetti","shortname":":spaghetti:","category":4,"emoji_order":2584},{"name":"roasted sweet potato","shortname":":sweet_potato:","category":4,"emoji_order":2585},{"name":"oden","shortname":":oden:","category":4,"emoji_order":2586},{"name":"sushi","shortname":":sushi:","category":4,"emoji_order":2587},{"name":"fried shrimp","shortname":":fried_shrimp:","category":4,"emoji_order":2588},{"name":"fish cake with swirl","shortname":":fish_cake:","category":4,"emoji_order":2589},{"name":"moon cake","shortname":":moon_cake:","category":4,"emoji_order":2590},{"name":"dango","shortname":":dango:","category":4,"emoji_order":2591},{"name":"dumpling","shortname":":dumpling:","category":4,"emoji_order":2592},{"name":"fortune cookie","shortname":":fortune_cookie:","category":4,"emoji_order":2593},{"name":"takeout box","shortname":":takeout_box:","category":4,"emoji_order":2594},{"name":"crab","shortname":":crab:","category":4,"emoji_order":2595},{"name":"lobster","shortname":":lobster:","category":4,"emoji_order":2596},{"name":"shrimp","shortname":":shrimp:","category":4,"emoji_order":2597},{"name":"squid","shortname":":squid:","category":4,"emoji_order":2598},{"name":"oyster","shortname":":oyster:","category":4,"emoji_order":2599},{"name":"soft ice cream","shortname":":icecream:","category":4,"emoji_order":2600},{"name":"shaved ice","shortname":":shaved_ice:","category":4,"emoji_order":2601},{"name":"ice cream","shortname":":ice_cream:","category":4,"emoji_order":2602},{"name":"doughnut","shortname":":doughnut:","category":4,"emoji_order":2603},{"name":"cookie","shortname":":cookie:","category":4,"emoji_order":2604},{"name":"birthday cake","shortname":":birthday:","category":4,"emoji_order":2605},{"name":"shortcake","shortname":":cake:","category":4,"emoji_order":2606},{"name":"cupcake","shortname":":cupcake:","category":4,"emoji_order":2607},{"name":"pie","shortname":":pie:","category":4,"emoji_order":2608},{"name":"chocolate bar","shortname":":chocolate_bar:","category":4,"emoji_order":2609},{"name":"candy","shortname":":candy:","category":4,"emoji_order":2610},{"name":"lollipop","shortname":":lollipop:","category":4,"emoji_order":2611},{"name":"custard","shortname":":custard:","category":4,"emoji_order":2612},{"name":"honey pot","shortname":":honey_pot:","category":4,"emoji_order":2613},{"name":"baby bottle","shortname":":baby_bottle:","category":4,"emoji_order":2614},{"name":"glass of milk","shortname":":milk:","category":4,"emoji_order":2615},{"name":"hot beverage","shortname":":coffee:","category":4,"emoji_order":2616},{"name":"teacup without handle","shortname":":tea:","category":4,"emoji_order":2617},{"name":"sake","shortname":":sake:","category":4,"emoji_order":2618},{"name":"bottle with popping cork","shortname":":champagne:","category":4,"emoji_order":2619},{"name":"wine glass","shortname":":wine_glass:","category":4,"emoji_order":2620},{"name":"cocktail glass","shortname":":cocktail:","category":4,"emoji_order":2621},{"name":"tropical drink","shortname":":tropical_drink:","category":4,"emoji_order":2622},{"name":"beer mug","shortname":":beer:","category":4,"emoji_order":2623},{"name":"clinking beer mugs","shortname":":beers:","category":4,"emoji_order":2624},{"name":"clinking glasses","shortname":":champagne_glass:","category":4,"emoji_order":2625},{"name":"tumbler glass","shortname":":tumbler_glass:","category":4,"emoji_order":2626},{"name":"cup with straw","shortname":":cup_straw:","category":4,"emoji_order":2627},{"name":"beverage box","shortname":":beverage_box:","category":4,"emoji_order":2628,"aliases":[":juice_box:"]},{"name":"mate","shortname":":mate:","category":4,"emoji_order":2629,"aliases":[":yerba_mate:"]},{"name":"ice","shortname":":ice:","category":4,"emoji_order":2630},{"name":"chopsticks","shortname":":chopsticks:","category":4,"emoji_order":2631},{"name":"fork and knife with plate","shortname":":fork_knife_plate:","category":4,"emoji_order":2633},{"name":"fork and knife","shortname":":utensils:","category":4,"emoji_order":2634},{"name":"spoon","shortname":":spoon:","category":4,"emoji_order":2635},{"name":"kitchen knife","shortname":":knife:","category":4,"emoji_order":2636},{"name":"amphora","shortname":":amphora:","category":4,"emoji_order":2637},{"name":"globe showing Europe-Africa","shortname":":earth_africa:","category":5,"emoji_order":2638},{"name":"globe showing Americas","shortname":":earth_americas:","category":5,"emoji_order":2639},{"name":"globe showing Asia-Australia","shortname":":earth_asia:","category":5,"emoji_order":2640},{"name":"globe with meridians","shortname":":globe:","category":5,"emoji_order":2641},{"name":"world map","shortname":":map:","category":5,"emoji_order":2643},{"name":"map of Japan","shortname":":japan:","category":5,"emoji_order":2644},{"name":"compass","shortname":":compass:","category":5,"emoji_order":2645},{"name":"snow-capped mountain","shortname":":snowy_mountain:","category":5,"emoji_order":2647},{"name":"mountain","shortname":":mountain:","category":5,"emoji_order":2649},{"name":"volcano","shortname":":volcano:","category":5,"emoji_order":2650},{"name":"mount fuji","shortname":":mount_fuji:","category":5,"emoji_order":2651},{"name":"camping","shortname":":camping:","category":5,"emoji_order":2653},{"name":"beach with umbrella","shortname":":beach:","category":5,"emoji_order":2655},{"name":"desert","shortname":":desert:","category":5,"emoji_order":2657},{"name":"desert island","shortname":":island:","category":5,"emoji_order":2659},{"name":"national park","shortname":":park:","category":5,"emoji_order":2661},{"name":"stadium","shortname":":stadium:","category":5,"emoji_order":2663},{"name":"classical building","shortname":":classical_building:","category":5,"emoji_order":2665},{"name":"building construction","shortname":":construction_site:","category":5,"emoji_order":2667},{"name":"brick","shortname":":brick:","category":5,"emoji_order":2668},{"name":"houses","shortname":":homes:","category":5,"emoji_order":2670},{"name":"derelict house","shortname":":house_abandoned:","category":5,"emoji_order":2672},{"name":"house","shortname":":house:","category":5,"emoji_order":2673},{"name":"house with garden","shortname":":house_garden:","category":5,"emoji_order":2674},{"name":"office building","shortname":":office:","category":5,"emoji_order":2675},{"name":"Japanese post office","shortname":":ja_post_office:","category":5,"emoji_order":2676},{"name":"post office","shortname":":post_office:","category":5,"emoji_order":2677},{"name":"hospital","shortname":":hospital:","category":5,"emoji_order":2678},{"name":"bank","shortname":":bank:","category":5,"emoji_order":2679},{"name":"hotel","shortname":":hotel:","category":5,"emoji_order":2680},{"name":"love hotel","shortname":":love_hotel:","category":5,"emoji_order":2681},{"name":"convenience store","shortname":":convenience_store:","category":5,"emoji_order":2682},{"name":"school","shortname":":school:","category":5,"emoji_order":2683},{"name":"department store","shortname":":department_store:","category":5,"emoji_order":2684},{"name":"factory","shortname":":factory:","category":5,"emoji_order":2685},{"name":"Japanese castle","shortname":":japanese_castle:","category":5,"emoji_order":2686},{"name":"castle","shortname":":castle:","category":5,"emoji_order":2687,"aliases":[":european_castle:"]},{"name":"wedding","shortname":":wedding:","category":5,"emoji_order":2688},{"name":"Tokyo tower","shortname":":tokyo_tower:","category":5,"emoji_order":2689},{"name":"Statue of Liberty","shortname":":statue_of_liberty:","category":5,"emoji_order":2690},{"name":"church","shortname":":church:","category":5,"emoji_order":2691},{"name":"mosque","shortname":":mosque:","category":5,"emoji_order":2692},{"name":"hindu temple","shortname":":hindu_temple:","category":5,"emoji_order":2693},{"name":"synagogue","shortname":":synagogue:","category":5,"emoji_order":2694},{"name":"shinto shrine","shortname":":shinto_shrine:","category":5,"emoji_order":2696},{"name":"kaaba","shortname":":kaaba:","category":5,"emoji_order":2697},{"name":"fountain","shortname":":fountain:","category":5,"emoji_order":2698},{"name":"tent","shortname":":tent:","category":5,"emoji_order":2699},{"name":"foggy","shortname":":foggy:","category":5,"emoji_order":2700},{"name":"night with stars","shortname":":night_stars:","category":5,"emoji_order":2701},{"name":"cityscape","shortname":":cityscape:","category":5,"emoji_order":2703},{"name":"sunrise over mountains","shortname":":sunrise_over_mountains:","category":5,"emoji_order":2704},{"name":"sunrise","shortname":":sunrise:","category":5,"emoji_order":2705},{"name":"cityscape at dusk","shortname":":dusk:","category":5,"emoji_order":2706},{"name":"sunset","shortname":":sunset:","category":5,"emoji_order":2707},{"name":"bridge at night","shortname":":bridge_at_night:","category":5,"emoji_order":2708},{"name":"hot springs","shortname":":hotsprings:","category":5,"emoji_order":2710},{"name":"carousel horse","shortname":":carousel_horse:","category":5,"emoji_order":2711},{"name":"ferris wheel","shortname":":ferris_wheel:","category":5,"emoji_order":2712},{"name":"roller coaster","shortname":":roller_coaster:","category":5,"emoji_order":2713},{"name":"barber pole","shortname":":barber:","category":5,"emoji_order":2714},{"name":"circus tent","shortname":":circus_tent:","category":5,"emoji_order":2715},{"name":"locomotive","shortname":":steam_locomotive:","category":5,"emoji_order":2716},{"name":"railway car","shortname":":railway_car:","category":5,"emoji_order":2717},{"name":"high-speed train","shortname":":bullettrain_side:","category":5,"emoji_order":2718},{"name":"bullet train","shortname":":bullettrain:","category":5,"emoji_order":2719},{"name":"train","shortname":":train:","category":5,"emoji_order":2720},{"name":"metro","shortname":":metro:","category":5,"emoji_order":2721},{"name":"light rail","shortname":":light_rail:","category":5,"emoji_order":2722},{"name":"station","shortname":":station:","category":5,"emoji_order":2723},{"name":"tram","shortname":":tram:","category":5,"emoji_order":2724},{"name":"monorail","shortname":":monorail:","category":5,"emoji_order":2725},{"name":"mountain railway","shortname":":mountain_railway:","category":5,"emoji_order":2726},{"name":"tram car","shortname":":tram_car:","category":5,"emoji_order":2727},{"name":"bus","shortname":":bus:","category":5,"emoji_order":2728},{"name":"oncoming bus","shortname":":oncoming_bus:","category":5,"emoji_order":2729},{"name":"trolleybus","shortname":":trolleybus:","category":5,"emoji_order":2730},{"name":"minibus","shortname":":minibus:","category":5,"emoji_order":2731},{"name":"ambulance","shortname":":ambulance:","category":5,"emoji_order":2732},{"name":"fire engine","shortname":":fire_engine:","category":5,"emoji_order":2733},{"name":"police car","shortname":":police_car:","category":5,"emoji_order":2734},{"name":"oncoming police car","shortname":":oncoming_police_car:","category":5,"emoji_order":2735},{"name":"taxi","shortname":":taxi:","category":5,"emoji_order":2736},{"name":"oncoming taxi","shortname":":oncoming_taxi:","category":5,"emoji_order":2737},{"name":"automobile","shortname":":red_car:","category":5,"emoji_order":2738},{"name":"oncoming automobile","shortname":":oncoming_automobile:","category":5,"emoji_order":2739},{"name":"sport utility vehicle","shortname":":blue_car:","category":5,"emoji_order":2740},{"name":"delivery truck","shortname":":truck:","category":5,"emoji_order":2741},{"name":"articulated lorry","shortname":":lorry:","category":5,"emoji_order":2742},{"name":"tractor","shortname":":tractor:","category":5,"emoji_order":2743},{"name":"racing car","shortname":":race_car:","category":5,"emoji_order":2745},{"name":"motorcycle","shortname":":motorcycle:","category":5,"emoji_order":2747},{"name":"motor scooter","shortname":":motor_scooter:","category":5,"emoji_order":2748},{"name":"manual wheelchair","shortname":":wheelchair:","category":5,"emoji_order":2749},{"name":"motorized wheelchair","shortname":":motor_wheelchair:","category":5,"emoji_order":2750},{"name":"auto rickshaw","shortname":":auto_rickshaw:","category":5,"emoji_order":2751},{"name":"bicycle","shortname":":bike:","category":5,"emoji_order":2752},{"name":"kick scooter","shortname":":scooter:","category":5,"emoji_order":2753},{"name":"skateboard","shortname":":skateboard:","category":5,"emoji_order":2754},{"name":"bus stop","shortname":":bus_stop:","category":5,"emoji_order":2755},{"name":"motorway","shortname":":motorway:","category":5,"emoji_order":2757},{"name":"railway track","shortname":":railway_track:","category":5,"emoji_order":2759},{"name":"oil drum","shortname":":oil_drum:","category":5,"emoji_order":2761},{"name":"fuel pump","shortname":":fuel_pump:","category":5,"emoji_order":2762},{"name":"police car light","shortname":":rotating_light:","category":5,"emoji_order":2763,"aliases":[":police_light:"]},{"name":"horizontal traffic light","shortname":":traffic_light:","category":5,"emoji_order":2764},{"name":"vertical traffic light","shortname":":vertical_traffic_light:","category":5,"emoji_order":2765},{"name":"stop sign","shortname":":stop_sign:","category":5,"emoji_order":2766,"aliases":[":octagonal_sign:"]},{"name":"construction","shortname":":construction:","category":5,"emoji_order":2767},{"name":"anchor","shortname":":anchor:","category":5,"emoji_order":2768},{"name":"sailboat","shortname":":sailboat:","category":5,"emoji_order":2769},{"name":"canoe","shortname":":canoe:","category":5,"emoji_order":2770},{"name":"speedboat","shortname":":speedboat:","category":5,"emoji_order":2771},{"name":"passenger ship","shortname":":cruise_ship:","category":5,"emoji_order":2773},{"name":"ferry","shortname":":ferry:","category":5,"emoji_order":2775},{"name":"motor boat","shortname":":motorboat:","category":5,"emoji_order":2777},{"name":"ship","shortname":":ship:","category":5,"emoji_order":2778},{"name":"airplane","shortname":":airplane:","category":5,"emoji_order":2780},{"name":"small airplane","shortname":":small_airplane:","category":5,"emoji_order":2782},{"name":"airplane departure","shortname":":airplane_departure:","category":5,"emoji_order":2783},{"name":"airplane arrival","shortname":":airplane_arriving:","category":5,"emoji_order":2784},{"name":"parachute","shortname":":parachute:","category":5,"emoji_order":2785},{"name":"seat","shortname":":seat:","category":5,"emoji_order":2786},{"name":"helicopter","shortname":":helicopter:","category":5,"emoji_order":2787},{"name":"suspension railway","shortname":":suspension_railway:","category":5,"emoji_order":2788},{"name":"mountain cableway","shortname":":mountain_cableway:","category":5,"emoji_order":2789},{"name":"aerial tramway","shortname":":aerial_tramway:","category":5,"emoji_order":2790},{"name":"satellite","shortname":":satellite:","category":5,"emoji_order":2792},{"name":"rocket","shortname":":rocket:","category":5,"emoji_order":2793},{"name":"flying saucer","shortname":":flying_saucer:","category":5,"emoji_order":2794},{"name":"bellhop bell","shortname":":bellhop:","category":5,"emoji_order":2796},{"name":"luggage","shortname":":luggage:","category":5,"emoji_order":2797},{"name":"hourglass done","shortname":":hourglass:","category":5,"emoji_order":2798},{"name":"hourglass not done","shortname":":hourglass_flowing:","category":5,"emoji_order":2799},{"name":"watch","shortname":":watch:","category":5,"emoji_order":2800},{"name":"alarm clock","shortname":":alarm_clock:","category":5,"emoji_order":2801},{"name":"stopwatch","shortname":":stopwatch:","category":5,"emoji_order":2803},{"name":"timer clock","shortname":":timer:","category":5,"emoji_order":2805},{"name":"mantelpiece clock","shortname":":clock:","category":5,"emoji_order":2807},{"name":"twelve o’clock","shortname":":clock12:","category":5,"emoji_order":2808},{"name":"twelve-thirty","shortname":":clock1230:","category":5,"emoji_order":2809},{"name":"one o’clock","shortname":":clock1:","category":5,"emoji_order":2810},{"name":"one-thirty","shortname":":clock130:","category":5,"emoji_order":2811},{"name":"two o’clock","shortname":":clock2:","category":5,"emoji_order":2812},{"name":"two-thirty","shortname":":clock230:","category":5,"emoji_order":2813},{"name":"three o’clock","shortname":":clock3:","category":5,"emoji_order":2814},{"name":"three-thirty","shortname":":clock330:","category":5,"emoji_order":2815},{"name":"four o’clock","shortname":":clock4:","category":5,"emoji_order":2816},{"name":"four-thirty","shortname":":clock430:","category":5,"emoji_order":2817},{"name":"five o’clock","shortname":":clock5:","category":5,"emoji_order":2818},{"name":"five-thirty","shortname":":clock530:","category":5,"emoji_order":2819},{"name":"six o’clock","shortname":":clock6:","category":5,"emoji_order":2820},{"name":"six-thirty","shortname":":clock630:","category":5,"emoji_order":2821},{"name":"seven o’clock","shortname":":clock7:","category":5,"emoji_order":2822},{"name":"seven-thirty","shortname":":clock730:","category":5,"emoji_order":2823},{"name":"eight o’clock","shortname":":clock8:","category":5,"emoji_order":2824},{"name":"eight-thirty","shortname":":clock830:","category":5,"emoji_order":2825},{"name":"nine o’clock","shortname":":clock9:","category":5,"emoji_order":2826},{"name":"nine-thirty","shortname":":clock930:","category":5,"emoji_order":2827},{"name":"ten o’clock","shortname":":clock10:","category":5,"emoji_order":2828},{"name":"ten-thirty","shortname":":clock1030:","category":5,"emoji_order":2829},{"name":"eleven o’clock","shortname":":clock11:","category":5,"emoji_order":2830},{"name":"eleven-thirty","shortname":":clock1130:","category":5,"emoji_order":2831},{"name":"new moon","shortname":":new_moon:","category":5,"emoji_order":2832},{"name":"waxing crescent moon","shortname":":waxing_crescent_moon:","category":5,"emoji_order":2833},{"name":"first quarter moon","shortname":":first_quarter_moon:","category":5,"emoji_order":2834},{"name":"waxing gibbous moon","shortname":":waxing_gibbous_moon:","category":5,"emoji_order":2835},{"name":"full moon","shortname":":full_moon:","category":5,"emoji_order":2836},{"name":"waning gibbous moon","shortname":":waning_gibbous_moon:","category":5,"emoji_order":2837},{"name":"last quarter moon","shortname":":last_quarter_moon:","category":5,"emoji_order":2838},{"name":"waning crescent moon","shortname":":waning_crescent_moon:","category":5,"emoji_order":2839},{"name":"crescent moon","shortname":":crescent_moon:","category":5,"emoji_order":2840},{"name":"new moon face","shortname":":new_moon_face:","category":5,"emoji_order":2841},{"name":"first quarter moon face","shortname":":first_quarter_moon_face:","category":5,"emoji_order":2842},{"name":"last quarter moon face","shortname":":last_quarter_moon_face:","category":5,"emoji_order":2843},{"name":"thermometer","shortname":":thermometer:","category":5,"emoji_order":2845},{"name":"sun","shortname":":sun:","category":5,"emoji_order":2847},{"name":"full moon face","shortname":":full_moon_face:","category":5,"emoji_order":2848},{"name":"sun with face","shortname":":sun_face:","category":5,"emoji_order":2849},{"name":"ringed planet","shortname":":ringed_planet:","category":5,"emoji_order":2850,"aliases":[":saturn:"]},{"name":"star","shortname":":star:","category":5,"emoji_order":2851},{"name":"glowing star","shortname":":star2:","category":5,"emoji_order":2852,"aliases":[":glowing_star:"]},{"name":"shooting star","shortname":":star3:","category":5,"emoji_order":2853,"aliases":[":shooting_star:"]},{"name":"milky way","shortname":":milky_way:","category":5,"emoji_order":2854},{"name":"cloud","shortname":":cloud:","category":5,"emoji_order":2856},{"name":"sun behind cloud","shortname":":partly_sunny:","category":5,"emoji_order":2857},{"name":"cloud with lightning and rain","shortname":":storm:","category":5,"emoji_order":2859},{"name":"sun behind small cloud","shortname":":overcast:","category":5,"emoji_order":2861},{"name":"sun behind large cloud","shortname":":cloudy:","category":5,"emoji_order":2863},{"name":"sun behind rain cloud","shortname":":sunshower:","category":5,"emoji_order":2865},{"name":"cloud with rain","shortname":":rain:","category":5,"emoji_order":2867},{"name":"cloud with snow","shortname":":snow:","category":5,"emoji_order":2869},{"name":"cloud with lightning","shortname":":lightning:","category":5,"emoji_order":2871},{"name":"tornado","shortname":":tornado:","category":5,"emoji_order":2873},{"name":"fog","shortname":":fog:","category":5,"emoji_order":2875},{"name":"wind face","shortname":":wind_face:","category":5,"emoji_order":2877},{"name":"cyclone","shortname":":cyclone:","category":5,"emoji_order":2878},{"name":"rainbow","shortname":":rainbow:","category":5,"emoji_order":2879},{"name":"closed umbrella","shortname":":closed_umbrella:","category":5,"emoji_order":2880},{"name":"umbrella","shortname":":umbrella:","category":5,"emoji_order":2882},{"name":"umbrella with rain drops","shortname":":umbrella_rain:","category":5,"emoji_order":2883},{"name":"umbrella on ground","shortname":":beach_umbrella:","category":5,"emoji_order":2885},{"name":"high voltage","shortname":":zap:","category":5,"emoji_order":2886,"aliases":[":high_voltage:"]},{"name":"snowflake","shortname":":snowflake:","category":5,"emoji_order":2888},{"name":"snowman","shortname":":snowy_snowman:","category":5,"emoji_order":2890},{"name":"snowman without snow","shortname":":snowman:","category":5,"emoji_order":2891},{"name":"comet","shortname":":comet:","category":5,"emoji_order":2893},{"name":"fire","shortname":":fire:","category":5,"emoji_order":2894},{"name":"droplet","shortname":":droplet:","category":5,"emoji_order":2895},{"name":"water wave","shortname":":ocean:","category":5,"emoji_order":2896},{"name":"jack-o-lantern","shortname":":jack_o_lantern:","category":6,"emoji_order":2897},{"name":"Christmas tree","shortname":":christmas_tree:","category":6,"emoji_order":2898,"aliases":[":xmas_tree:"]},{"name":"fireworks","shortname":":fireworks:","category":6,"emoji_order":2899},{"name":"sparkler","shortname":":sparkler:","category":6,"emoji_order":2900},{"name":"firecracker","shortname":":firecracker:","category":6,"emoji_order":2901},{"name":"sparkles","shortname":":sparkles:","category":6,"emoji_order":2902},{"name":"balloon","shortname":":balloon:","category":6,"emoji_order":2903},{"name":"party popper","shortname":":tada:","category":6,"emoji_order":2904,"aliases":[":party:"]},{"name":"confetti ball","shortname":":confetti_ball:","category":6,"emoji_order":2905},{"name":"tanabata tree","shortname":":tanabata_tree:","category":6,"emoji_order":2906},{"name":"pine decoration","shortname":":bamboo:","category":6,"emoji_order":2907,"aliases":[":pine_decor:"]},{"name":"Japanese dolls","shortname":":dolls:","category":6,"emoji_order":2908},{"name":"carp streamer","shortname":":carp_streamer:","category":6,"emoji_order":2909},{"name":"wind chime","shortname":":wind_chime:","category":6,"emoji_order":2910},{"name":"moon viewing ceremony","shortname":":moon_ceremony:","category":6,"emoji_order":2911,"aliases":[":rice_scene:"]},{"name":"red envelope","shortname":":red_envelope:","category":6,"emoji_order":2912},{"name":"ribbon","shortname":":ribbon:","category":6,"emoji_order":2913},{"name":"wrapped gift","shortname":":gift:","category":6,"emoji_order":2914},{"name":"reminder ribbon","shortname":":reminder_ribbon:","category":6,"emoji_order":2916},{"name":"admission tickets","shortname":":tickets:","category":6,"emoji_order":2918,"aliases":[":admission:"]},{"name":"ticket","shortname":":ticket:","category":6,"emoji_order":2919},{"name":"military medal","shortname":":military_medal:","category":6,"emoji_order":2921},{"name":"trophy","shortname":":trophy:","category":6,"emoji_order":2922},{"name":"sports medal","shortname":":medal:","category":6,"emoji_order":2923},{"name":"1st place medal","shortname":":first_place:","category":6,"emoji_order":2924},{"name":"2nd place medal","shortname":":second_place:","category":6,"emoji_order":2925},{"name":"3rd place medal","shortname":":third_place:","category":6,"emoji_order":2926},{"name":"soccer ball","shortname":":soccer:","category":6,"emoji_order":2927},{"name":"baseball","shortname":":baseball:","category":6,"emoji_order":2928},{"name":"softball","shortname":":softball:","category":6,"emoji_order":2929},{"name":"basketball","shortname":":basketball:","category":6,"emoji_order":2930},{"name":"volleyball","shortname":":volleyball:","category":6,"emoji_order":2931},{"name":"american football","shortname":":football:","category":6,"emoji_order":2932},{"name":"rugby football","shortname":":rugby:","category":6,"emoji_order":2933},{"name":"tennis","shortname":":tennis:","category":6,"emoji_order":2934},{"name":"flying disc","shortname":":flying_disc:","category":6,"emoji_order":2935},{"name":"bowling","shortname":":bowling:","category":6,"emoji_order":2936},{"name":"cricket game","shortname":":cricket_game:","category":6,"emoji_order":2937},{"name":"field hockey","shortname":":field_hockey:","category":6,"emoji_order":2938},{"name":"ice hockey","shortname":":hockey:","category":6,"emoji_order":2939},{"name":"lacrosse","shortname":":lacrosse:","category":6,"emoji_order":2940},{"name":"ping pong","shortname":":ping_pong:","category":6,"emoji_order":2941},{"name":"badminton","shortname":":badminton:","category":6,"emoji_order":2942},{"name":"boxing glove","shortname":":boxing_glove:","category":6,"emoji_order":2943},{"name":"martial arts uniform","shortname":":gi:","category":6,"emoji_order":2944,"aliases":[":martial_arts_uniform:"]},{"name":"goal net","shortname":":goal:","category":6,"emoji_order":2945},{"name":"flag in hole","shortname":":golf:","category":6,"emoji_order":2946},{"name":"ice skate","shortname":":ice_skate:","category":6,"emoji_order":2948},{"name":"fishing pole","shortname":":fishing_pole:","category":6,"emoji_order":2949},{"name":"diving mask","shortname":":diving_mask:","category":6,"emoji_order":2950,"aliases":[":scuba_mask:"]},{"name":"running shirt","shortname":":running_shirt:","category":6,"emoji_order":2951},{"name":"skis","shortname":":ski:","category":6,"emoji_order":2952},{"name":"sled","shortname":":sled:","category":6,"emoji_order":2953},{"name":"curling stone","shortname":":curling_stone:","category":6,"emoji_order":2954},{"name":"direct hit","shortname":":dart:","category":6,"emoji_order":2955},{"name":"yo-yo","shortname":":yoyo:","category":6,"emoji_order":2956},{"name":"kite","shortname":":kite:","category":6,"emoji_order":2957},{"name":"pool 8 ball","shortname":":8ball:","category":6,"emoji_order":2958},{"name":"crystal ball","shortname":":crystal_ball:","category":6,"emoji_order":2959},{"name":"nazar amulet","shortname":":nazar_amulet:","category":6,"emoji_order":2960},{"name":"video game","shortname":":video_game:","category":6,"emoji_order":2961},{"name":"joystick","shortname":":joystick:","category":6,"emoji_order":2963},{"name":"slot machine","shortname":":slot_machine:","category":6,"emoji_order":2964},{"name":"game die","shortname":":game_die:","category":6,"emoji_order":2965},{"name":"puzzle piece","shortname":":jigsaw:","category":6,"emoji_order":2966,"aliases":[":puzzle_piece:"]},{"name":"teddy bear","shortname":":teddy_bear:","category":6,"emoji_order":2967},{"name":"spade suit","shortname":":spades:","category":6,"emoji_order":2969},{"name":"heart suit","shortname":":hearts:","category":6,"emoji_order":2971},{"name":"diamond suit","shortname":":diamonds:","category":6,"emoji_order":2973},{"name":"club suit","shortname":":clubs:","category":6,"emoji_order":2975},{"name":"chess pawn","shortname":":chess_pawn:","category":6,"emoji_order":2977},{"name":"joker","shortname":":black_joker:","category":6,"emoji_order":2978},{"name":"mahjong red dragon","shortname":":mahjong:","category":6,"emoji_order":2979},{"name":"flower playing cards","shortname":":flower_cards:","category":6,"emoji_order":2980},{"name":"performing arts","shortname":":performing_arts:","category":6,"emoji_order":2981},{"name":"framed picture","shortname":":frame_photo:","category":6,"emoji_order":2983},{"name":"artist palette","shortname":":art:","category":6,"emoji_order":2984,"aliases":[":palette:"]},{"name":"thread","shortname":":spool:","category":6,"emoji_order":2985},{"name":"yarn","shortname":":yarn:","category":6,"emoji_order":2986},{"name":"glasses","shortname":":glasses:","category":7,"emoji_order":2987},{"name":"sunglasses","shortname":":sunglasses:","category":7,"emoji_order":2989},{"name":"goggles","shortname":":goggles:","category":7,"emoji_order":2990},{"name":"lab coat","shortname":":lab_coat:","category":7,"emoji_order":2991},{"name":"safety vest","shortname":":safety_vest:","category":7,"emoji_order":2992},{"name":"necktie","shortname":":necktie:","category":7,"emoji_order":2993,"aliases":[":tie:"]},{"name":"t-shirt","shortname":":shirt:","category":7,"emoji_order":2994},{"name":"jeans","shortname":":jeans:","category":7,"emoji_order":2995},{"name":"scarf","shortname":":scarf:","category":7,"emoji_order":2996},{"name":"gloves","shortname":":gloves:","category":7,"emoji_order":2997},{"name":"coat","shortname":":coat:","category":7,"emoji_order":2998},{"name":"socks","shortname":":socks:","category":7,"emoji_order":2999},{"name":"dress","shortname":":dress:","category":7,"emoji_order":3000},{"name":"kimono","shortname":":kimono:","category":7,"emoji_order":3001},{"name":"sari","shortname":":sari:","category":7,"emoji_order":3002},{"name":"one-piece swimsuit","shortname":":one_piece_swimsuit:","category":7,"emoji_order":3003},{"name":"briefs","shortname":":briefs:","category":7,"emoji_order":3004},{"name":"shorts","shortname":":shorts:","category":7,"emoji_order":3005},{"name":"bikini","shortname":":bikini:","category":7,"emoji_order":3006},{"name":"woman’s clothes","shortname":":blouse:","category":7,"emoji_order":3007,"aliases":[":womans_clothes:"]},{"name":"purse","shortname":":purse:","category":7,"emoji_order":3008},{"name":"handbag","shortname":":handbag:","category":7,"emoji_order":3009},{"name":"clutch bag","shortname":":pouch:","category":7,"emoji_order":3010,"aliases":[":clutch_bag:"]},{"name":"shopping bags","shortname":":shopping_bags:","category":7,"emoji_order":3012},{"name":"backpack","shortname":":backpack:","category":7,"emoji_order":3013},{"name":"man’s shoe","shortname":":dress_shoe:","category":7,"emoji_order":3014,"aliases":[":mans_shoe:"]},{"name":"running shoe","shortname":":sneaker:","category":7,"emoji_order":3015,"aliases":[":athletic_shoe:"]},{"name":"hiking boot","shortname":":hiking_boot:","category":7,"emoji_order":3016},{"name":"flat shoe","shortname":":flat_shoe:","category":7,"emoji_order":3017},{"name":"high-heeled shoe","shortname":":high_heel:","category":7,"emoji_order":3018},{"name":"woman’s sandal","shortname":":womans_sandal:","category":7,"emoji_order":3019},{"name":"ballet shoes","shortname":":ballet_shoes:","category":7,"emoji_order":3020},{"name":"woman’s boot","shortname":":womans_boot:","category":7,"emoji_order":3021},{"name":"crown","shortname":":crown:","category":7,"emoji_order":3022},{"name":"woman’s hat","shortname":":womans_hat:","category":7,"emoji_order":3023},{"name":"top hat","shortname":":top_hat:","category":7,"emoji_order":3024},{"name":"graduation cap","shortname":":graduation_cap:","category":7,"emoji_order":3025},{"name":"billed cap","shortname":":billed_cap:","category":7,"emoji_order":3026},{"name":"rescue worker’s helmet","shortname":":helmet_cross:","category":7,"emoji_order":3028},{"name":"prayer beads","shortname":":prayer_beads:","category":7,"emoji_order":3029},{"name":"lipstick","shortname":":lipstick:","category":7,"emoji_order":3030},{"name":"ring","shortname":":ring:","category":7,"emoji_order":3031},{"name":"gem stone","shortname":":gem:","category":7,"emoji_order":3032},{"name":"muted speaker","shortname":":mute:","category":7,"emoji_order":3033,"aliases":[":no_sound:"]},{"name":"speaker low volume","shortname":":speaker:","category":7,"emoji_order":3034,"aliases":[":low_sound:"]},{"name":"speaker medium volume","shortname":":sound:","category":7,"emoji_order":3035},{"name":"speaker high volume","shortname":":loud_sound:","category":7,"emoji_order":3036},{"name":"loudspeaker","shortname":":loudspeaker:","category":7,"emoji_order":3037},{"name":"megaphone","shortname":":megaphone:","category":7,"emoji_order":3038},{"name":"postal horn","shortname":":postal_horn:","category":7,"emoji_order":3039},{"name":"bell","shortname":":bell:","category":7,"emoji_order":3040},{"name":"bell with slash","shortname":":no_bell:","category":7,"emoji_order":3041},{"name":"musical score","shortname":":musical_score:","category":7,"emoji_order":3042},{"name":"musical note","shortname":":musical_note:","category":7,"emoji_order":3043},{"name":"musical notes","shortname":":musical_notes:","category":7,"emoji_order":3044},{"name":"studio microphone","shortname":":studio_microphone:","category":7,"emoji_order":3046},{"name":"level slider","shortname":":level_slider:","category":7,"emoji_order":3048},{"name":"control knobs","shortname":":control_knobs:","category":7,"emoji_order":3050},{"name":"microphone","shortname":":microphone:","category":7,"emoji_order":3051},{"name":"headphone","shortname":":headphones:","category":7,"emoji_order":3052},{"name":"radio","shortname":":radio:","category":7,"emoji_order":3053},{"name":"saxophone","shortname":":saxophone:","category":7,"emoji_order":3054},{"name":"guitar","shortname":":guitar:","category":7,"emoji_order":3055},{"name":"musical keyboard","shortname":":musical_keyboard:","category":7,"emoji_order":3056},{"name":"trumpet","shortname":":trumpet:","category":7,"emoji_order":3057},{"name":"violin","shortname":":violin:","category":7,"emoji_order":3058},{"name":"banjo","shortname":":banjo:","category":7,"emoji_order":3059},{"name":"drum","shortname":":drum:","category":7,"emoji_order":3060},{"name":"mobile phone","shortname":":mobile:","category":7,"emoji_order":3061,"aliases":[":iphone:",":android:"]},{"name":"mobile phone with arrow","shortname":":mobile_calling:","category":7,"emoji_order":3062},{"name":"telephone","shortname":":telephone:","category":7,"emoji_order":3064},{"name":"telephone receiver","shortname":":telephone_receiver:","category":7,"emoji_order":3065},{"name":"pager","shortname":":pager:","category":7,"emoji_order":3066},{"name":"fax machine","shortname":":fax:","category":7,"emoji_order":3067},{"name":"battery","shortname":":battery:","category":7,"emoji_order":3068},{"name":"electric plug","shortname":":electric_plug:","category":7,"emoji_order":3069},{"name":"laptop computer","shortname":":laptop:","category":7,"emoji_order":3070},{"name":"desktop computer","shortname":":desktop:","category":7,"emoji_order":3072,"aliases":[":computer:"]},{"name":"printer","shortname":":printer:","category":7,"emoji_order":3074},{"name":"keyboard","shortname":":keyboard:","category":7,"emoji_order":3076},{"name":"computer mouse","shortname":":computer_mouse:","category":7,"emoji_order":3078},{"name":"trackball","shortname":":trackball:","category":7,"emoji_order":3080},{"name":"computer disk","shortname":":minidisc:","category":7,"emoji_order":3081},{"name":"floppy disk","shortname":":floppy_disk:","category":7,"emoji_order":3082},{"name":"optical disk","shortname":":cd:","category":7,"emoji_order":3083,"aliases":[":disk:"]},{"name":"dvd","shortname":":dvd:","category":7,"emoji_order":3084},{"name":"abacus","shortname":":abacus:","category":7,"emoji_order":3085},{"name":"movie camera","shortname":":movie_camera:","category":7,"emoji_order":3086},{"name":"film frames","shortname":":film_frames:","category":7,"emoji_order":3088},{"name":"film projector","shortname":":projector:","category":7,"emoji_order":3090},{"name":"clapper board","shortname":":clapper:","category":7,"emoji_order":3091},{"name":"television","shortname":":tv:","category":7,"emoji_order":3092},{"name":"camera","shortname":":camera:","category":7,"emoji_order":3093},{"name":"camera with flash","shortname":":camera_flash:","category":7,"emoji_order":3094},{"name":"video camera","shortname":":video_camera:","category":7,"emoji_order":3095},{"name":"videocassette","shortname":":vhs:","category":7,"emoji_order":3096},{"name":"magnifying glass tilted left","shortname":":mag:","category":7,"emoji_order":3097},{"name":"magnifying glass tilted right","shortname":":mag_right:","category":7,"emoji_order":3098},{"name":"candle","shortname":":candle:","category":7,"emoji_order":3100},{"name":"light bulb","shortname":":bulb:","category":7,"emoji_order":3101,"aliases":[":light_bulb:"]},{"name":"flashlight","shortname":":flashlight:","category":7,"emoji_order":3102},{"name":"red paper lantern","shortname":":red_lantern:","category":7,"emoji_order":3103},{"name":"diya lamp","shortname":":diya_lamp:","category":7,"emoji_order":3104},{"name":"notebook with decorative cover","shortname":":decorative_notebook:","category":7,"emoji_order":3105},{"name":"closed book","shortname":":closed_book:","category":7,"emoji_order":3106},{"name":"open book","shortname":":book:","category":7,"emoji_order":3107},{"name":"green book","shortname":":green_book:","category":7,"emoji_order":3108},{"name":"blue book","shortname":":blue_book:","category":7,"emoji_order":3109},{"name":"orange book","shortname":":orange_book:","category":7,"emoji_order":3110},{"name":"books","shortname":":books:","category":7,"emoji_order":3111},{"name":"notebook","shortname":":notebook:","category":7,"emoji_order":3112},{"name":"ledger","shortname":":ledger:","category":7,"emoji_order":3113},{"name":"page with curl","shortname":":page_curl:","category":7,"emoji_order":3114},{"name":"scroll","shortname":":scroll:","category":7,"emoji_order":3115},{"name":"page facing up","shortname":":page_facing_up:","category":7,"emoji_order":3116},{"name":"newspaper","shortname":":newspaper:","category":7,"emoji_order":3117},{"name":"rolled-up newspaper","shortname":":rolled_newspaper:","category":7,"emoji_order":3119},{"name":"bookmark tabs","shortname":":bookmark_tabs:","category":7,"emoji_order":3120},{"name":"bookmark","shortname":":bookmark:","category":7,"emoji_order":3121},{"name":"label","shortname":":label:","category":7,"emoji_order":3123},{"name":"money bag","shortname":":moneybag:","category":7,"emoji_order":3124},{"name":"yen banknote","shortname":":yen:","category":7,"emoji_order":3125},{"name":"dollar banknote","shortname":":dollar:","category":7,"emoji_order":3126},{"name":"euro banknote","shortname":":euro:","category":7,"emoji_order":3127},{"name":"pound banknote","shortname":":pound:","category":7,"emoji_order":3128},{"name":"money with wings","shortname":":money_wings:","category":7,"emoji_order":3129},{"name":"credit card","shortname":":credit_card:","category":7,"emoji_order":3130},{"name":"receipt","shortname":":receipt:","category":7,"emoji_order":3131},{"name":"chart increasing with yen","shortname":":ja_chart:","category":7,"emoji_order":3132},{"name":"currency exchange","shortname":":currency_exchange:","category":7,"emoji_order":3133},{"name":"heavy dollar sign","shortname":":dollar_sign:","category":7,"emoji_order":3134},{"name":"envelope","shortname":":envelope:","category":7,"emoji_order":3136},{"name":"e-mail","shortname":":email:","category":7,"emoji_order":3137},{"name":"incoming envelope","shortname":":incoming_envelope:","category":7,"emoji_order":3138},{"name":"envelope with arrow","shortname":":envelope_arrow:","category":7,"emoji_order":3139},{"name":"outbox tray","shortname":":outbox_tray:","category":7,"emoji_order":3140},{"name":"inbox tray","shortname":":inbox_tray:","category":7,"emoji_order":3141},{"name":"package","shortname":":package:","category":7,"emoji_order":3142},{"name":"closed mailbox with raised flag","shortname":":mailbox:","category":7,"emoji_order":3143},{"name":"closed mailbox with lowered flag","shortname":":mailbox_closed:","category":7,"emoji_order":3144},{"name":"open mailbox with raised flag","shortname":":mailbox_mail:","category":7,"emoji_order":3145},{"name":"open mailbox with lowered flag","shortname":":mailbox_no_mail:","category":7,"emoji_order":3146},{"name":"postbox","shortname":":postbox:","category":7,"emoji_order":3147},{"name":"ballot box with ballot","shortname":":ballot_box:","category":7,"emoji_order":3149},{"name":"pencil","shortname":":pencil:","category":7,"emoji_order":3151},{"name":"black nib","shortname":":black_nib:","category":7,"emoji_order":3153},{"name":"fountain pen","shortname":":fountain_pen:","category":7,"emoji_order":3155},{"name":"pen","shortname":":pen:","category":7,"emoji_order":3157},{"name":"paintbrush","shortname":":paintbrush:","category":7,"emoji_order":3159},{"name":"crayon","shortname":":crayon:","category":7,"emoji_order":3161},{"name":"memo","shortname":":memo:","category":7,"emoji_order":3162},{"name":"briefcase","shortname":":briefcase:","category":7,"emoji_order":3163},{"name":"file folder","shortname":":file_folder:","category":7,"emoji_order":3164},{"name":"open file folder","shortname":":open_file_folder:","category":7,"emoji_order":3165},{"name":"card index dividers","shortname":":dividers:","category":7,"emoji_order":3167},{"name":"calendar","shortname":":date:","category":7,"emoji_order":3168,"aliases":[":calendar:"]},{"name":"tear-off calendar","shortname":":torn_calendar:","category":7,"emoji_order":3169},{"name":"spiral notepad","shortname":":notepad_spiral:","category":7,"emoji_order":3171},{"name":"spiral calendar","shortname":":calendar_spiral:","category":7,"emoji_order":3173},{"name":"card index","shortname":":card_index:","category":7,"emoji_order":3174},{"name":"chart increasing","shortname":":chart_up:","category":7,"emoji_order":3175},{"name":"chart decreasing","shortname":":chart_down:","category":7,"emoji_order":3176},{"name":"bar chart","shortname":":bar_chart:","category":7,"emoji_order":3177},{"name":"clipboard","shortname":":clipboard:","category":7,"emoji_order":3178},{"name":"pushpin","shortname":":pushpin:","category":7,"emoji_order":3179},{"name":"round pushpin","shortname":":round_pushpin:","category":7,"emoji_order":3180},{"name":"paperclip","shortname":":paperclip:","category":7,"emoji_order":3181},{"name":"linked paperclips","shortname":":paperclips:","category":7,"emoji_order":3183},{"name":"straight ruler","shortname":":straight_ruler:","category":7,"emoji_order":3184},{"name":"triangular ruler","shortname":":triangular_ruler:","category":7,"emoji_order":3185},{"name":"scissors","shortname":":scissors:","category":7,"emoji_order":3187},{"name":"card file box","shortname":":card_box:","category":7,"emoji_order":3189},{"name":"file cabinet","shortname":":file_cabinet:","category":7,"emoji_order":3191},{"name":"wastebasket","shortname":":trashcan:","category":7,"emoji_order":3193,"aliases":[":wastebasket:"]},{"name":"locked","shortname":":lock:","category":7,"emoji_order":3194},{"name":"unlocked","shortname":":unlock:","category":7,"emoji_order":3195},{"name":"locked with pen","shortname":":locked_pen:","category":7,"emoji_order":3196},{"name":"locked with key","shortname":":locked_key:","category":7,"emoji_order":3197},{"name":"key","shortname":":key:","category":7,"emoji_order":3198},{"name":"old key","shortname":":old_key:","category":7,"emoji_order":3200},{"name":"hammer","shortname":":hammer:","category":7,"emoji_order":3201},{"name":"axe","shortname":":axe:","category":7,"emoji_order":3202},{"name":"pick","shortname":":pick:","category":7,"emoji_order":3204},{"name":"hammer and pick","shortname":":hammer_pick:","category":7,"emoji_order":3206},{"name":"hammer and wrench","shortname":":tools:","category":7,"emoji_order":3208,"aliases":[":hammer_wrench:"]},{"name":"dagger","shortname":":dagger:","category":7,"emoji_order":3210},{"name":"crossed swords","shortname":":crossed_swords:","category":7,"emoji_order":3212},{"name":"pistol","shortname":":gun:","category":7,"emoji_order":3213,"aliases":[":pistol:"]},{"name":"bow and arrow","shortname":":bow:","category":7,"emoji_order":3214},{"name":"shield","shortname":":shield:","category":7,"emoji_order":3216},{"name":"wrench","shortname":":wrench:","category":7,"emoji_order":3217},{"name":"nut and bolt","shortname":":nut_and_bolt:","category":7,"emoji_order":3218},{"name":"gear","shortname":":gear:","category":7,"emoji_order":3220},{"name":"clamp","shortname":":clamp:","category":7,"emoji_order":3222,"aliases":[":compression:"]},{"name":"balance scale","shortname":":scales:","category":7,"emoji_order":3224},{"name":"probing cane","shortname":":probing_cane:","category":7,"emoji_order":3225},{"name":"link","shortname":":link:","category":7,"emoji_order":3226},{"name":"chains","shortname":":chains:","category":7,"emoji_order":3228},{"name":"toolbox","shortname":":toolbox:","category":7,"emoji_order":3229},{"name":"magnet","shortname":":magnet:","category":7,"emoji_order":3230},{"name":"alembic","shortname":":alembic:","category":7,"emoji_order":3232},{"name":"test tube","shortname":":test_tube:","category":7,"emoji_order":3233},{"name":"petri dish","shortname":":petri_dish:","category":7,"emoji_order":3234},{"name":"dna","shortname":":dna:","category":7,"emoji_order":3235,"aliases":[":double_helix:"]},{"name":"microscope","shortname":":microscope:","category":7,"emoji_order":3236},{"name":"telescope","shortname":":telescope:","category":7,"emoji_order":3237},{"name":"satellite antenna","shortname":":satellite_antenna:","category":7,"emoji_order":3238},{"name":"syringe","shortname":":syringe:","category":7,"emoji_order":3239},{"name":"drop of blood","shortname":":blood_drop:","category":7,"emoji_order":3240},{"name":"pill","shortname":":pill:","category":7,"emoji_order":3241},{"name":"adhesive bandage","shortname":":bandaid:","category":7,"emoji_order":3242,"aliases":[":adhesive_bandage:"]},{"name":"stethoscope","shortname":":stethoscope:","category":7,"emoji_order":3243},{"name":"door","shortname":":door:","category":7,"emoji_order":3244},{"name":"bed","shortname":":bed:","category":7,"emoji_order":3246},{"name":"couch and lamp","shortname":":couch:","category":7,"emoji_order":3248},{"name":"chair","shortname":":chair:","category":7,"emoji_order":3249},{"name":"toilet","shortname":":toilet:","category":7,"emoji_order":3250},{"name":"shower","shortname":":shower:","category":7,"emoji_order":3251},{"name":"bathtub","shortname":":bathtub:","category":7,"emoji_order":3252},{"name":"razor","shortname":":razor:","category":7,"emoji_order":3253},{"name":"lotion bottle","shortname":":lotion:","category":7,"emoji_order":3254},{"name":"safety pin","shortname":":safety_pin:","category":7,"emoji_order":3255},{"name":"broom","shortname":":broom:","category":7,"emoji_order":3256},{"name":"basket","shortname":":basket:","category":7,"emoji_order":3257},{"name":"roll of paper","shortname":":toilet_paper:","category":7,"emoji_order":3258},{"name":"soap","shortname":":soap:","category":7,"emoji_order":3259},{"name":"sponge","shortname":":sponge:","category":7,"emoji_order":3260},{"name":"fire extinguisher","shortname":":fire_extinguisher:","category":7,"emoji_order":3261},{"name":"shopping cart","shortname":":shopping_cart:","category":7,"emoji_order":3262},{"name":"cigarette","shortname":":cigarette:","category":7,"emoji_order":3263,"aliases":[":smoking:"]},{"name":"coffin","shortname":":coffin:","category":7,"emoji_order":3265},{"name":"funeral urn","shortname":":urn:","category":7,"emoji_order":3267},{"name":"moai","shortname":":moai:","category":7,"emoji_order":3268},{"name":"ATM sign","shortname":":atm:","category":8,"emoji_order":3269},{"name":"litter in bin sign","shortname":":litter_bin:","category":8,"emoji_order":3270},{"name":"potable water","shortname":":potable_water:","category":8,"emoji_order":3271},{"name":"wheelchair symbol","shortname":":handicapped:","category":8,"emoji_order":3272},{"name":"men’s room","shortname":":mens:","category":8,"emoji_order":3273},{"name":"women’s room","shortname":":womens:","category":8,"emoji_order":3274},{"name":"restroom","shortname":":restroom:","category":8,"emoji_order":3275,"aliases":[":bathroom:"]},{"name":"baby symbol","shortname":":baby_symbol:","category":8,"emoji_order":3276},{"name":"water closet","shortname":":wc:","category":8,"emoji_order":3277},{"name":"passport control","shortname":":passport_control:","category":8,"emoji_order":3278},{"name":"customs","shortname":":customs:","category":8,"emoji_order":3279},{"name":"baggage claim","shortname":":baggage_claim:","category":8,"emoji_order":3280},{"name":"left luggage","shortname":":left_luggage:","category":8,"emoji_order":3281},{"name":"warning","shortname":":warning:","category":8,"emoji_order":3283},{"name":"children crossing","shortname":":children_crossing:","category":8,"emoji_order":3284},{"name":"no entry","shortname":":no_entry:","category":8,"emoji_order":3285},{"name":"prohibited","shortname":":no_entry_sign:","category":8,"emoji_order":3286},{"name":"no bicycles","shortname":":no_bicycles:","category":8,"emoji_order":3287},{"name":"no smoking","shortname":":no_smoking:","category":8,"emoji_order":3288},{"name":"no littering","shortname":":do_not_litter:","category":8,"emoji_order":3289},{"name":"non-potable water","shortname":":non_potable_water:","category":8,"emoji_order":3290},{"name":"no pedestrians","shortname":":no_pedestrians:","category":8,"emoji_order":3291},{"name":"no mobile phones","shortname":":no_mobile_phones:","category":8,"emoji_order":3292},{"name":"no one under eighteen","shortname":":underage:","category":8,"emoji_order":3293},{"name":"radioactive","shortname":":radioactive:","category":8,"emoji_order":3295},{"name":"biohazard","shortname":":biohazard:","category":8,"emoji_order":3297},{"name":"up arrow","shortname":":arrow_up:","category":8,"emoji_order":3299},{"name":"up-right arrow","shortname":":arrow_upper_right:","category":8,"emoji_order":3301},{"name":"right arrow","shortname":":arrow_right:","category":8,"emoji_order":3303},{"name":"down-right arrow","shortname":":arrow_lower_right:","category":8,"emoji_order":3305},{"name":"down arrow","shortname":":arrow_down:","category":8,"emoji_order":3307},{"name":"down-left arrow","shortname":":arrow_lower_left:","category":8,"emoji_order":3309},{"name":"left arrow","shortname":":arrow_left:","category":8,"emoji_order":3311},{"name":"up-left arrow","shortname":":arrow_upper_left:","category":8,"emoji_order":3313},{"name":"up-down arrow","shortname":":arrow_up_down:","category":8,"emoji_order":3315},{"name":"left-right arrow","shortname":":arrow_left_right:","category":8,"emoji_order":3317},{"name":"right arrow curving left","shortname":":arrow_left_hook:","category":8,"emoji_order":3319},{"name":"left arrow curving right","shortname":":arrow_right_hook:","category":8,"emoji_order":3321},{"name":"right arrow curving up","shortname":":arrow_heading_up:","category":8,"emoji_order":3323},{"name":"right arrow curving down","shortname":":arrow_heading_down:","category":8,"emoji_order":3325},{"name":"clockwise vertical arrows","shortname":":clockwise:","category":8,"emoji_order":3326},{"name":"counterclockwise arrows button","shortname":":counter_clockwise:","category":8,"emoji_order":3327},{"name":"BACK arrow","shortname":":back:","category":8,"emoji_order":3328},{"name":"END arrow","shortname":":end:","category":8,"emoji_order":3329},{"name":"ON! arrow","shortname":":on:","category":8,"emoji_order":3330},{"name":"SOON arrow","shortname":":soon:","category":8,"emoji_order":3331},{"name":"TOP arrow","shortname":":top:","category":8,"emoji_order":3332},{"name":"place of worship","shortname":":place_of_worship:","category":8,"emoji_order":3333},{"name":"atom symbol","shortname":":atom:","category":8,"emoji_order":3335},{"name":"om","shortname":":om_symbol:","category":8,"emoji_order":3337},{"name":"star of David","shortname":":star_of_david:","category":8,"emoji_order":3339},{"name":"wheel of dharma","shortname":":wheel_of_dharma:","category":8,"emoji_order":3341},{"name":"yin yang","shortname":":yin_yang:","category":8,"emoji_order":3343},{"name":"latin cross","shortname":":cross:","category":8,"emoji_order":3345},{"name":"orthodox cross","shortname":":orthodox_cross:","category":8,"emoji_order":3347},{"name":"star and crescent","shortname":":star_and_crescent:","category":8,"emoji_order":3349},{"name":"peace symbol","shortname":":peace:","category":8,"emoji_order":3351},{"name":"menorah","shortname":":menorah:","category":8,"emoji_order":3352},{"name":"dotted six-pointed star","shortname":":six_pointed_star:","category":8,"emoji_order":3353},{"name":"Aries","shortname":":aries:","category":8,"emoji_order":3354},{"name":"Taurus","shortname":":taurus:","category":8,"emoji_order":3355},{"name":"Gemini","shortname":":gemini:","category":8,"emoji_order":3356},{"name":"Cancer","shortname":":cancer:","category":8,"emoji_order":3357},{"name":"Leo","shortname":":leo:","category":8,"emoji_order":3358},{"name":"Virgo","shortname":":virgo:","category":8,"emoji_order":3359},{"name":"Libra","shortname":":libra:","category":8,"emoji_order":3360},{"name":"Scorpio","shortname":":scorpius:","category":8,"emoji_order":3361},{"name":"Sagittarius","shortname":":sagittarius:","category":8,"emoji_order":3362},{"name":"Capricorn","shortname":":capricorn:","category":8,"emoji_order":3363},{"name":"Aquarius","shortname":":aquarius:","category":8,"emoji_order":3364},{"name":"Pisces","shortname":":pisces:","category":8,"emoji_order":3365},{"name":"Ophiuchus","shortname":":ophiuchus:","category":8,"emoji_order":3366},{"name":"shuffle tracks button","shortname":":shuffle:","category":8,"emoji_order":3367},{"name":"repeat button","shortname":":repeat:","category":8,"emoji_order":3368},{"name":"repeat single button","shortname":":repeat_single:","category":8,"emoji_order":3369},{"name":"play button","shortname":":play:","category":8,"emoji_order":3371},{"name":"fast-forward button","shortname":":fast_forward:","category":8,"emoji_order":3372},{"name":"next track button","shortname":":next_track:","category":8,"emoji_order":3374},{"name":"play or pause button","shortname":":play_pause:","category":8,"emoji_order":3376},{"name":"reverse button","shortname":":reverse:","category":8,"emoji_order":3378},{"name":"fast reverse button","shortname":":rewind:","category":8,"emoji_order":3379},{"name":"last track button","shortname":":previous_track:","category":8,"emoji_order":3381},{"name":"upwards button","shortname":":up_button:","category":8,"emoji_order":3382},{"name":"fast up button","shortname":":fast_up_button:","category":8,"emoji_order":3383},{"name":"downwards button","shortname":":down_button:","category":8,"emoji_order":3384},{"name":"fast down button","shortname":":fast_down_button:","category":8,"emoji_order":3385},{"name":"pause button","shortname":":pause:","category":8,"emoji_order":3387},{"name":"stop button","shortname":":stop:","category":8,"emoji_order":3389},{"name":"record button","shortname":":record:","category":8,"emoji_order":3391},{"name":"eject button","shortname":":eject:","category":8,"emoji_order":3393},{"name":"cinema","shortname":":cinema:","category":8,"emoji_order":3394},{"name":"dim button","shortname":":dim:","category":8,"emoji_order":3395,"aliases":[":low_brightness:"]},{"name":"bright button","shortname":":bright:","category":8,"emoji_order":3396,"aliases":[":high_brightness:"]},{"name":"antenna bars","shortname":":signal_strength:","category":8,"emoji_order":3397,"aliases":[":antenna_bars:"]},{"name":"vibration mode","shortname":":vibration_mode:","category":8,"emoji_order":3398},{"name":"mobile phone off","shortname":":mobile_phone_off:","category":8,"emoji_order":3399},{"name":"female sign","shortname":":female:","category":8,"emoji_order":3401,"aliases":[":female_sign:"]},{"name":"male sign","shortname":":male:","category":8,"emoji_order":3403,"aliases":[":male_sign:"]},{"name":"medical symbol","shortname":":medical:","category":8,"emoji_order":3405},{"name":"infinity","shortname":":infinity:","category":8,"emoji_order":3407},{"name":"recycling symbol","shortname":":recycle:","category":8,"emoji_order":3409},{"name":"fleur-de-lis","shortname":":fleur-de-lis:","category":8,"emoji_order":3411},{"name":"trident emblem","shortname":":trident:","category":8,"emoji_order":3412},{"name":"name badge","shortname":":name_badge:","category":8,"emoji_order":3413},{"name":"Japanese symbol for beginner","shortname":":ja_beginner:","category":8,"emoji_order":3414},{"name":"hollow red circle","shortname":":o:","category":8,"emoji_order":3415},{"name":"check mark button","shortname":":white_check_mark:","category":8,"emoji_order":3416},{"name":"check box with check","shortname":":checked_ballot:","category":8,"emoji_order":3418},{"name":"check mark","shortname":":check_mark:","category":8,"emoji_order":3420},{"name":"multiplication sign","shortname":":multiplication:","category":8,"emoji_order":3422},{"name":"cross mark","shortname":":x:","category":8,"emoji_order":3423,"aliases":[":cross_mark:"]},{"name":"cross mark button","shortname":":cross_mark_button:","category":8,"emoji_order":3424},{"name":"plus sign","shortname":":plus:","category":8,"emoji_order":3425},{"name":"minus sign","shortname":":minus:","category":8,"emoji_order":3426},{"name":"division sign","shortname":":division:","category":8,"emoji_order":3427},{"name":"curly loop","shortname":":curly_loop:","category":8,"emoji_order":3428},{"name":"double curly loop","shortname":":double_curly_loop:","category":8,"emoji_order":3429},{"name":"part alternation mark","shortname":":part_alternation_mark:","category":8,"emoji_order":3431},{"name":"eight-spoked asterisk","shortname":":eight_spoked_asterisk:","category":8,"emoji_order":3433},{"name":"eight-pointed star","shortname":":eight_pointed_star:","category":8,"emoji_order":3435},{"name":"sparkle","shortname":":sparkle:","category":8,"emoji_order":3437},{"name":"double exclamation mark","shortname":":bangbang:","category":8,"emoji_order":3439,"aliases":[":double_exclamation:"]},{"name":"exclamation question mark","shortname":":interrobang:","category":8,"emoji_order":3441,"aliases":[":exclamation_question:"]},{"name":"question mark","shortname":":question:","category":8,"emoji_order":3442},{"name":"white question mark","shortname":":white_question:","category":8,"emoji_order":3443},{"name":"white exclamation mark","shortname":":white_exclamation:","category":8,"emoji_order":3444},{"name":"exclamation mark","shortname":":exclamation:","category":8,"emoji_order":3445},{"name":"wavy dash","shortname":":wavy_dash:","category":8,"emoji_order":3447},{"name":"copyright","shortname":":copyright:","category":8,"emoji_order":3449},{"name":"registered","shortname":":registered:","category":8,"emoji_order":3451},{"name":"trade mark","shortname":":tm:","category":8,"emoji_order":3453},{"name":"keycap: #","shortname":":hash:","category":8,"emoji_order":3454},{"name":"keycap: *","shortname":":asterisk:","category":8,"emoji_order":3456},{"name":"keycap: 0","shortname":":zero:","category":8,"emoji_order":3458},{"name":"keycap: 1","shortname":":one:","category":8,"emoji_order":3460},{"name":"keycap: 2","shortname":":two:","category":8,"emoji_order":3462},{"name":"keycap: 3","shortname":":three:","category":8,"emoji_order":3464},{"name":"keycap: 4","shortname":":four:","category":8,"emoji_order":3466},{"name":"keycap: 5","shortname":":five:","category":8,"emoji_order":3468},{"name":"keycap: 6","shortname":":six:","category":8,"emoji_order":3470},{"name":"keycap: 7","shortname":":seven:","category":8,"emoji_order":3472},{"name":"keycap: 8","shortname":":eight:","category":8,"emoji_order":3474},{"name":"keycap: 9","shortname":":nine:","category":8,"emoji_order":3476},{"name":"keycap: 10","shortname":":ten:","category":8,"emoji_order":3478},{"name":"input latin uppercase","shortname":":upper_abcd:","category":8,"emoji_order":3479},{"name":"input latin lowercase","shortname":":abcd:","category":8,"emoji_order":3480},{"name":"input numbers","shortname":":1234:","category":8,"emoji_order":3481},{"name":"input symbols","shortname":":symbols:","category":8,"emoji_order":3482},{"name":"input latin letters","shortname":":abc:","category":8,"emoji_order":3483},{"name":"A button (blood type)","shortname":":a_blood:","category":8,"emoji_order":3485},{"name":"AB button (blood type)","shortname":":ab_blood:","category":8,"emoji_order":3486},{"name":"B button (blood type)","shortname":":b_blood:","category":8,"emoji_order":3488},{"name":"CL button","shortname":":cl:","category":8,"emoji_order":3489},{"name":"COOL button","shortname":":cool:","category":8,"emoji_order":3490},{"name":"FREE button","shortname":":free:","category":8,"emoji_order":3491},{"name":"information","shortname":":info:","category":8,"emoji_order":3493},{"name":"ID button","shortname":":id:","category":8,"emoji_order":3494},{"name":"circled M","shortname":":m:","category":8,"emoji_order":3496},{"name":"NEW button","shortname":":new:","category":8,"emoji_order":3497},{"name":"NG button","shortname":":ng:","category":8,"emoji_order":3498},{"name":"O button (blood type)","shortname":":o_blood:","category":8,"emoji_order":3500},{"name":"OK button","shortname":":ok:","category":8,"emoji_order":3501},{"name":"P button","shortname":":p:","category":8,"emoji_order":3503},{"name":"SOS button","shortname":":sos:","category":8,"emoji_order":3504},{"name":"UP! button","shortname":":up:","category":8,"emoji_order":3505},{"name":"VS button","shortname":":vs:","category":8,"emoji_order":3506},{"name":"Japanese “here” button","shortname":":ja_here:","category":8,"emoji_order":3507,"aliases":[":koko:"]},{"name":"Japanese “service charge” button","shortname":":ja_service_charge:","category":8,"emoji_order":3509},{"name":"Japanese “monthly amount” button","shortname":":ja_monthly_amount:","category":8,"emoji_order":3511},{"name":"Japanese “not free of charge” button","shortname":":ja_not_free_of_carge:","category":8,"emoji_order":3512},{"name":"Japanese “reserved” button","shortname":":ja_reserved:","category":8,"emoji_order":3513},{"name":"Japanese “bargain” button","shortname":":ja_bargain:","category":8,"emoji_order":3514},{"name":"Japanese “discount” button","shortname":":ja_discount:","category":8,"emoji_order":3515},{"name":"Japanese “free of charge” button","shortname":":ja_free_of_charge:","category":8,"emoji_order":3516},{"name":"Japanese “prohibited” button","shortname":":ja_prohibited:","category":8,"emoji_order":3517},{"name":"Japanese “acceptable” button","shortname":":ja_acceptable:","category":8,"emoji_order":3518},{"name":"Japanese “application” button","shortname":":ja_application:","category":8,"emoji_order":3519},{"name":"Japanese “passing grade” button","shortname":":ja_passing_grade:","category":8,"emoji_order":3520},{"name":"Japanese “vacancy” button","shortname":":ja_vacancy:","category":8,"emoji_order":3521},{"name":"Japanese “congratulations” button","shortname":":ja_congratulations:","category":8,"emoji_order":3523},{"name":"Japanese “secret” button","shortname":":ja_secret:","category":8,"emoji_order":3525},{"name":"Japanese “open for business” button","shortname":":ja_open_for_business:","category":8,"emoji_order":3526},{"name":"Japanese “no vacancy” button","shortname":":ja_no_vacancy:","category":8,"emoji_order":3527},{"name":"red circle","shortname":":red_circle:","category":8,"emoji_order":3528},{"name":"orange circle","shortname":":orange_circle:","category":8,"emoji_order":3529},{"name":"yellow circle","shortname":":yellow_circle:","category":8,"emoji_order":3530},{"name":"green circle","shortname":":green_circle:","category":8,"emoji_order":3531},{"name":"blue circle","shortname":":blue_circle:","category":8,"emoji_order":3532},{"name":"purple circle","shortname":":purple_circle:","category":8,"emoji_order":3533},{"name":"brown circle","shortname":":brown_circle:","category":8,"emoji_order":3534},{"name":"black circle","shortname":":black_circle:","category":8,"emoji_order":3535},{"name":"white circle","shortname":":white_circle:","category":8,"emoji_order":3536},{"name":"red square","shortname":":red_square:","category":8,"emoji_order":3537},{"name":"orange square","shortname":":orange_square:","category":8,"emoji_order":3538},{"name":"yellow square","shortname":":yellow_square:","category":8,"emoji_order":3539},{"name":"green square","shortname":":green_square:","category":8,"emoji_order":3540},{"name":"blue square","shortname":":blue_square:","category":8,"emoji_order":3541},{"name":"purple square","shortname":":purple_square:","category":8,"emoji_order":3542},{"name":"brown square","shortname":":brown_square:","category":8,"emoji_order":3543},{"name":"black large square","shortname":":large_black_square:","category":8,"emoji_order":3544},{"name":"white large square","shortname":":large_white_square:","category":8,"emoji_order":3545},{"name":"black medium square","shortname":":medium_black_square:","category":8,"emoji_order":3547},{"name":"white medium square","shortname":":medium_white_square:","category":8,"emoji_order":3549},{"name":"black medium-small square","shortname":":medium_small_black_square:","category":8,"emoji_order":3550},{"name":"white medium-small square","shortname":":medium_small_white_square:","category":8,"emoji_order":3551},{"name":"black small square","shortname":":small_black_square:","category":8,"emoji_order":3553},{"name":"white small square","shortname":":small_white_square:","category":8,"emoji_order":3555},{"name":"large orange diamond","shortname":":large_orange_diamond:","category":8,"emoji_order":3556},{"name":"large blue diamond","shortname":":large_blue_diamond:","category":8,"emoji_order":3557},{"name":"small orange diamond","shortname":":small_orange_diamond:","category":8,"emoji_order":3558},{"name":"small blue diamond","shortname":":small_blue_diamond:","category":8,"emoji_order":3559},{"name":"red triangle pointed up","shortname":":up_red_triangle:","category":8,"emoji_order":3560},{"name":"red triangle pointed down","shortname":":down_red_triangle:","category":8,"emoji_order":3561},{"name":"diamond with a dot","shortname":":diamond_dot:","category":8,"emoji_order":3562},{"name":"radio button","shortname":":radio_button:","category":8,"emoji_order":3563},{"name":"white square button","shortname":":white_square_button:","category":8,"emoji_order":3564},{"name":"black square button","shortname":":black_square_button:","category":8,"emoji_order":3565},{"name":"chequered flag","shortname":":checkered_flag:","category":9,"emoji_order":3566},{"name":"triangular flag","shortname":":triangle_flag:","category":9,"emoji_order":3567},{"name":"crossed flags","shortname":":crossed_flags:","category":9,"emoji_order":3568},{"name":"black flag","shortname":":black_flag:","category":9,"emoji_order":3569},{"name":"white flag","shortname":":white_flag:","category":9,"emoji_order":3571},{"name":"rainbow flag","shortname":":rainbow_flag:","category":9,"emoji_order":3572},{"name":"pirate flag","shortname":":pirate_flag:","category":9,"emoji_order":3574,"aliases":[":jolly_roger:"]},{"name":"flag: Ascension Island","shortname":":flag_ac:","category":9,"emoji_order":3576},{"name":"flag: Andorra","shortname":":flag_ad:","category":9,"emoji_order":3577},{"name":"flag: United Arab Emirates","shortname":":flag_ae:","category":9,"emoji_order":3578},{"name":"flag: Afghanistan","shortname":":flag_af:","category":9,"emoji_order":3579},{"name":"flag: Antigua & Barbuda","shortname":":flag_ag:","category":9,"emoji_order":3580},{"name":"flag: Anguilla","shortname":":flag_ai:","category":9,"emoji_order":3581},{"name":"flag: Albania","shortname":":flag_al:","category":9,"emoji_order":3582},{"name":"flag: Armenia","shortname":":flag_am:","category":9,"emoji_order":3583},{"name":"flag: Angola","shortname":":flag_ao:","category":9,"emoji_order":3584},{"name":"flag: Antarctica","shortname":":flag_aq:","category":9,"emoji_order":3585},{"name":"flag: Argentina","shortname":":flag_ar:","category":9,"emoji_order":3586},{"name":"flag: American Samoa","shortname":":flag_as:","category":9,"emoji_order":3587},{"name":"flag: Austria","shortname":":flag_at:","category":9,"emoji_order":3588},{"name":"flag: Australia","shortname":":flag_au:","category":9,"emoji_order":3589},{"name":"flag: Aruba","shortname":":flag_aw:","category":9,"emoji_order":3590},{"name":"flag: Åland Islands","shortname":":flag_ax:","category":9,"emoji_order":3591},{"name":"flag: Azerbaijan","shortname":":flag_az:","category":9,"emoji_order":3592},{"name":"flag: Bosnia & Herzegovina","shortname":":flag_ba:","category":9,"emoji_order":3593},{"name":"flag: Barbados","shortname":":flag_bb:","category":9,"emoji_order":3594},{"name":"flag: Bangladesh","shortname":":flag_bd:","category":9,"emoji_order":3595},{"name":"flag: Belgium","shortname":":flag_be:","category":9,"emoji_order":3596},{"name":"flag: Burkina Faso","shortname":":flag_bf:","category":9,"emoji_order":3597},{"name":"flag: Bulgaria","shortname":":flag_bg:","category":9,"emoji_order":3598},{"name":"flag: Bahrain","shortname":":flag_bh:","category":9,"emoji_order":3599},{"name":"flag: Burundi","shortname":":flag_bi:","category":9,"emoji_order":3600},{"name":"flag: Benin","shortname":":flag_bj:","category":9,"emoji_order":3601},{"name":"flag: St. Barthélemy","shortname":":flag_bl:","category":9,"emoji_order":3602},{"name":"flag: Bermuda","shortname":":flag_bm:","category":9,"emoji_order":3603},{"name":"flag: Brunei","shortname":":flag_bn:","category":9,"emoji_order":3604},{"name":"flag: Bolivia","shortname":":flag_bo:","category":9,"emoji_order":3605},{"name":"flag: Caribbean Netherlands","shortname":":flag_bq:","category":9,"emoji_order":3606},{"name":"flag: Brazil","shortname":":flag_br:","category":9,"emoji_order":3607},{"name":"flag: Bahamas","shortname":":flag_bs:","category":9,"emoji_order":3608},{"name":"flag: Bhutan","shortname":":flag_bt:","category":9,"emoji_order":3609},{"name":"flag: Bouvet Island","shortname":":flag_bv:","category":9,"emoji_order":3610},{"name":"flag: Botswana","shortname":":flag_bw:","category":9,"emoji_order":3611},{"name":"flag: Belarus","shortname":":flag_by:","category":9,"emoji_order":3612},{"name":"flag: Belize","shortname":":flag_bz:","category":9,"emoji_order":3613},{"name":"flag: Canada","shortname":":flag_ca:","category":9,"emoji_order":3614},{"name":"flag: Cocos (Keeling) Islands","shortname":":flag_cc:","category":9,"emoji_order":3615},{"name":"flag: Congo - Kinshasa","shortname":":flag_cd:","category":9,"emoji_order":3616},{"name":"flag: Central African Republic","shortname":":flag_cf:","category":9,"emoji_order":3617},{"name":"flag: Congo - Brazzaville","shortname":":flag_cg:","category":9,"emoji_order":3618},{"name":"flag: Switzerland","shortname":":flag_ch:","category":9,"emoji_order":3619},{"name":"flag: Côte d’Ivoire","shortname":":flag_ci:","category":9,"emoji_order":3620},{"name":"flag: Cook Islands","shortname":":flag_ck:","category":9,"emoji_order":3621},{"name":"flag: Chile","shortname":":flag_cl:","category":9,"emoji_order":3622},{"name":"flag: Cameroon","shortname":":flag_cm:","category":9,"emoji_order":3623},{"name":"flag: China","shortname":":flag_cn:","category":9,"emoji_order":3624},{"name":"flag: Colombia","shortname":":flag_co:","category":9,"emoji_order":3625},{"name":"flag: Clipperton Island","shortname":":flag_cp:","category":9,"emoji_order":3626},{"name":"flag: Costa Rica","shortname":":flag_cr:","category":9,"emoji_order":3627},{"name":"flag: Cuba","shortname":":flag_cu:","category":9,"emoji_order":3628},{"name":"flag: Cape Verde","shortname":":flag_cv:","category":9,"emoji_order":3629},{"name":"flag: Curaçao","shortname":":flag_cw:","category":9,"emoji_order":3630},{"name":"flag: Christmas Island","shortname":":flag_cx:","category":9,"emoji_order":3631},{"name":"flag: Cyprus","shortname":":flag_cy:","category":9,"emoji_order":3632},{"name":"flag: Czechia","shortname":":flag_cz:","category":9,"emoji_order":3633},{"name":"flag: Germany","shortname":":flag_de:","category":9,"emoji_order":3634},{"name":"flag: Diego Garcia","shortname":":flag_dg:","category":9,"emoji_order":3635},{"name":"flag: Djibouti","shortname":":flag_dj:","category":9,"emoji_order":3636},{"name":"flag: Denmark","shortname":":flag_dk:","category":9,"emoji_order":3637},{"name":"flag: Dominica","shortname":":flag_dm:","category":9,"emoji_order":3638},{"name":"flag: Dominican Republic","shortname":":flag_do:","category":9,"emoji_order":3639},{"name":"flag: Algeria","shortname":":flag_dz:","category":9,"emoji_order":3640},{"name":"flag: Ceuta & Melilla","shortname":":flag_ea:","category":9,"emoji_order":3641},{"name":"flag: Ecuador","shortname":":flag_ec:","category":9,"emoji_order":3642},{"name":"flag: Estonia","shortname":":flag_ee:","category":9,"emoji_order":3643},{"name":"flag: Egypt","shortname":":flag_eg:","category":9,"emoji_order":3644},{"name":"flag: Western Sahara","shortname":":flag_eh:","category":9,"emoji_order":3645},{"name":"flag: Eritrea","shortname":":flag_er:","category":9,"emoji_order":3646},{"name":"flag: Spain","shortname":":flag_es:","category":9,"emoji_order":3647},{"name":"flag: Ethiopia","shortname":":flag_et:","category":9,"emoji_order":3648},{"name":"flag: European Union","shortname":":flag_eu:","category":9,"emoji_order":3649},{"name":"flag: Finland","shortname":":flag_fi:","category":9,"emoji_order":3650},{"name":"flag: Fiji","shortname":":flag_fj:","category":9,"emoji_order":3651},{"name":"flag: Falkland Islands","shortname":":flag_fk:","category":9,"emoji_order":3652},{"name":"flag: Micronesia","shortname":":flag_fm:","category":9,"emoji_order":3653},{"name":"flag: Faroe Islands","shortname":":flag_fo:","category":9,"emoji_order":3654},{"name":"flag: France","shortname":":flag_fr:","category":9,"emoji_order":3655},{"name":"flag: Gabon","shortname":":flag_ga:","category":9,"emoji_order":3656},{"name":"flag: United Kingdom","shortname":":flag_gb:","category":9,"emoji_order":3657},{"name":"flag: Grenada","shortname":":flag_gd:","category":9,"emoji_order":3658},{"name":"flag: Georgia","shortname":":flag_ge:","category":9,"emoji_order":3659},{"name":"flag: French Guiana","shortname":":flag_gf:","category":9,"emoji_order":3660},{"name":"flag: Guernsey","shortname":":flag_gg:","category":9,"emoji_order":3661},{"name":"flag: Ghana","shortname":":flag_gh:","category":9,"emoji_order":3662},{"name":"flag: Gibraltar","shortname":":flag_gi:","category":9,"emoji_order":3663},{"name":"flag: Greenland","shortname":":flag_gl:","category":9,"emoji_order":3664},{"name":"flag: Gambia","shortname":":flag_gm:","category":9,"emoji_order":3665},{"name":"flag: Guinea","shortname":":flag_gn:","category":9,"emoji_order":3666},{"name":"flag: Guadeloupe","shortname":":flag_gp:","category":9,"emoji_order":3667},{"name":"flag: Equatorial Guinea","shortname":":flag_gq:","category":9,"emoji_order":3668},{"name":"flag: Greece","shortname":":flag_gr:","category":9,"emoji_order":3669},{"name":"flag: South Georgia & South Sandwich Islands","shortname":":flag_gs:","category":9,"emoji_order":3670},{"name":"flag: Guatemala","shortname":":flag_gt:","category":9,"emoji_order":3671},{"name":"flag: Guam","shortname":":flag_gu:","category":9,"emoji_order":3672},{"name":"flag: Guinea-Bissau","shortname":":flag_gw:","category":9,"emoji_order":3673},{"name":"flag: Guyana","shortname":":flag_gy:","category":9,"emoji_order":3674},{"name":"flag: Hong Kong SAR China","shortname":":flag_hk:","category":9,"emoji_order":3675},{"name":"flag: Heard & McDonald Islands","shortname":":flag_hm:","category":9,"emoji_order":3676},{"name":"flag: Honduras","shortname":":flag_hn:","category":9,"emoji_order":3677},{"name":"flag: Croatia","shortname":":flag_hr:","category":9,"emoji_order":3678},{"name":"flag: Haiti","shortname":":flag_ht:","category":9,"emoji_order":3679},{"name":"flag: Hungary","shortname":":flag_hu:","category":9,"emoji_order":3680},{"name":"flag: Canary Islands","shortname":":flag_ic:","category":9,"emoji_order":3681},{"name":"flag: Indonesia","shortname":":flag_id:","category":9,"emoji_order":3682},{"name":"flag: Ireland","shortname":":flag_ie:","category":9,"emoji_order":3683},{"name":"flag: Israel","shortname":":flag_il:","category":9,"emoji_order":3684},{"name":"flag: Isle of Man","shortname":":flag_im:","category":9,"emoji_order":3685},{"name":"flag: India","shortname":":flag_in:","category":9,"emoji_order":3686},{"name":"flag: British Indian Ocean Territory","shortname":":flag_io:","category":9,"emoji_order":3687},{"name":"flag: Iraq","shortname":":flag_iq:","category":9,"emoji_order":3688},{"name":"flag: Iran","shortname":":flag_ir:","category":9,"emoji_order":3689},{"name":"flag: Iceland","shortname":":flag_is:","category":9,"emoji_order":3690},{"name":"flag: Italy","shortname":":flag_it:","category":9,"emoji_order":3691},{"name":"flag: Jersey","shortname":":flag_je:","category":9,"emoji_order":3692},{"name":"flag: Jamaica","shortname":":flag_jm:","category":9,"emoji_order":3693},{"name":"flag: Jordan","shortname":":flag_jo:","category":9,"emoji_order":3694},{"name":"flag: Japan","shortname":":flag_jp:","category":9,"emoji_order":3695},{"name":"flag: Kenya","shortname":":flag_ke:","category":9,"emoji_order":3696},{"name":"flag: Kyrgyzstan","shortname":":flag_kg:","category":9,"emoji_order":3697},{"name":"flag: Cambodia","shortname":":flag_kh:","category":9,"emoji_order":3698},{"name":"flag: Kiribati","shortname":":flag_ki:","category":9,"emoji_order":3699},{"name":"flag: Comoros","shortname":":flag_km:","category":9,"emoji_order":3700},{"name":"flag: St. Kitts & Nevis","shortname":":flag_kn:","category":9,"emoji_order":3701},{"name":"flag: North Korea","shortname":":flag_kp:","category":9,"emoji_order":3702},{"name":"flag: South Korea","shortname":":flag_kr:","category":9,"emoji_order":3703},{"name":"flag: Kuwait","shortname":":flag_kw:","category":9,"emoji_order":3704},{"name":"flag: Cayman Islands","shortname":":flag_ky:","category":9,"emoji_order":3705},{"name":"flag: Kazakhstan","shortname":":flag_kz:","category":9,"emoji_order":3706},{"name":"flag: Laos","shortname":":flag_la:","category":9,"emoji_order":3707},{"name":"flag: Lebanon","shortname":":flag_lb:","category":9,"emoji_order":3708},{"name":"flag: St. Lucia","shortname":":flag_lc:","category":9,"emoji_order":3709},{"name":"flag: Liechtenstein","shortname":":flag_li:","category":9,"emoji_order":3710},{"name":"flag: Sri Lanka","shortname":":flag_lk:","category":9,"emoji_order":3711},{"name":"flag: Liberia","shortname":":flag_lr:","category":9,"emoji_order":3712},{"name":"flag: Lesotho","shortname":":flag_ls:","category":9,"emoji_order":3713},{"name":"flag: Lithuania","shortname":":flag_lt:","category":9,"emoji_order":3714},{"name":"flag: Luxembourg","shortname":":flag_lu:","category":9,"emoji_order":3715},{"name":"flag: Latvia","shortname":":flag_lv:","category":9,"emoji_order":3716},{"name":"flag: Libya","shortname":":flag_ly:","category":9,"emoji_order":3717},{"name":"flag: Morocco","shortname":":flag_ma:","category":9,"emoji_order":3718},{"name":"flag: Monaco","shortname":":flag_mc:","category":9,"emoji_order":3719},{"name":"flag: Moldova","shortname":":flag_md:","category":9,"emoji_order":3720},{"name":"flag: Montenegro","shortname":":flag_me:","category":9,"emoji_order":3721},{"name":"flag: St. Martin","shortname":":flag_mf:","category":9,"emoji_order":3722},{"name":"flag: Madagascar","shortname":":flag_mg:","category":9,"emoji_order":3723},{"name":"flag: Marshall Islands","shortname":":flag_mh:","category":9,"emoji_order":3724},{"name":"flag: North Macedonia","shortname":":flag_mk:","category":9,"emoji_order":3725},{"name":"flag: Mali","shortname":":flag_ml:","category":9,"emoji_order":3726},{"name":"flag: Myanmar (Burma)","shortname":":flag_mm:","category":9,"emoji_order":3727},{"name":"flag: Mongolia","shortname":":flag_mn:","category":9,"emoji_order":3728},{"name":"flag: Macao SAR China","shortname":":flag_mo:","category":9,"emoji_order":3729},{"name":"flag: Northern Mariana Islands","shortname":":flag_mp:","category":9,"emoji_order":3730},{"name":"flag: Martinique","shortname":":flag_mq:","category":9,"emoji_order":3731},{"name":"flag: Mauritania","shortname":":flag_mr:","category":9,"emoji_order":3732},{"name":"flag: Montserrat","shortname":":flag_ms:","category":9,"emoji_order":3733},{"name":"flag: Malta","shortname":":flag_mt:","category":9,"emoji_order":3734},{"name":"flag: Mauritius","shortname":":flag_mu:","category":9,"emoji_order":3735},{"name":"flag: Maldives","shortname":":flag_mv:","category":9,"emoji_order":3736},{"name":"flag: Malawi","shortname":":flag_mw:","category":9,"emoji_order":3737},{"name":"flag: Mexico","shortname":":flag_mx:","category":9,"emoji_order":3738},{"name":"flag: Malaysia","shortname":":flag_my:","category":9,"emoji_order":3739},{"name":"flag: Mozambique","shortname":":flag_mz:","category":9,"emoji_order":3740},{"name":"flag: Namibia","shortname":":flag_na:","category":9,"emoji_order":3741},{"name":"flag: New Caledonia","shortname":":flag_nc:","category":9,"emoji_order":3742},{"name":"flag: Niger","shortname":":flag_ne:","category":9,"emoji_order":3743},{"name":"flag: Norfolk Island","shortname":":flag_nf:","category":9,"emoji_order":3744},{"name":"flag: Nigeria","shortname":":flag_ng:","category":9,"emoji_order":3745},{"name":"flag: Nicaragua","shortname":":flag_ni:","category":9,"emoji_order":3746},{"name":"flag: Netherlands","shortname":":flag_nl:","category":9,"emoji_order":3747},{"name":"flag: Norway","shortname":":flag_no:","category":9,"emoji_order":3748},{"name":"flag: Nepal","shortname":":flag_np:","category":9,"emoji_order":3749},{"name":"flag: Nauru","shortname":":flag_nr:","category":9,"emoji_order":3750},{"name":"flag: Niue","shortname":":flag_nu:","category":9,"emoji_order":3751},{"name":"flag: New Zealand","shortname":":flag_nz:","category":9,"emoji_order":3752},{"name":"flag: Oman","shortname":":flag_om:","category":9,"emoji_order":3753},{"name":"flag: Panama","shortname":":flag_pa:","category":9,"emoji_order":3754},{"name":"flag: Peru","shortname":":flag_pe:","category":9,"emoji_order":3755},{"name":"flag: French Polynesia","shortname":":flag_pf:","category":9,"emoji_order":3756},{"name":"flag: Papua New Guinea","shortname":":flag_pg:","category":9,"emoji_order":3757},{"name":"flag: Philippines","shortname":":flag_ph:","category":9,"emoji_order":3758},{"name":"flag: Pakistan","shortname":":flag_pk:","category":9,"emoji_order":3759},{"name":"flag: Poland","shortname":":flag_pl:","category":9,"emoji_order":3760},{"name":"flag: St. Pierre & Miquelon","shortname":":flag_pm:","category":9,"emoji_order":3761},{"name":"flag: Pitcairn Islands","shortname":":flag_pn:","category":9,"emoji_order":3762},{"name":"flag: Puerto Rico","shortname":":flag_pr:","category":9,"emoji_order":3763},{"name":"flag: Palestinian Territories","shortname":":flag_ps:","category":9,"emoji_order":3764},{"name":"flag: Portugal","shortname":":flag_pt:","category":9,"emoji_order":3765},{"name":"flag: Palau","shortname":":flag_pw:","category":9,"emoji_order":3766},{"name":"flag: Paraguay","shortname":":flag_py:","category":9,"emoji_order":3767},{"name":"flag: Qatar","shortname":":flag_qa:","category":9,"emoji_order":3768},{"name":"flag: Réunion","shortname":":flag_re:","category":9,"emoji_order":3769},{"name":"flag: Romania","shortname":":flag_ro:","category":9,"emoji_order":3770},{"name":"flag: Serbia","shortname":":flag_rs:","category":9,"emoji_order":3771},{"name":"flag: Russia","shortname":":flag_ru:","category":9,"emoji_order":3772},{"name":"flag: Rwanda","shortname":":flag_rw:","category":9,"emoji_order":3773},{"name":"flag: Saudi Arabia","shortname":":flag_sa:","category":9,"emoji_order":3774},{"name":"flag: Solomon Islands","shortname":":flag_sb:","category":9,"emoji_order":3775},{"name":"flag: Seychelles","shortname":":flag_sc:","category":9,"emoji_order":3776},{"name":"flag: Sudan","shortname":":flag_sd:","category":9,"emoji_order":3777},{"name":"flag: Sweden","shortname":":flag_se:","category":9,"emoji_order":3778},{"name":"flag: Singapore","shortname":":flag_sg:","category":9,"emoji_order":3779},{"name":"flag: St. Helena","shortname":":flag_sh:","category":9,"emoji_order":3780},{"name":"flag: Slovenia","shortname":":flag_si:","category":9,"emoji_order":3781},{"name":"flag: Svalbard & Jan Mayen","shortname":":flag_sj:","category":9,"emoji_order":3782},{"name":"flag: Slovakia","shortname":":flag_sk:","category":9,"emoji_order":3783},{"name":"flag: Sierra Leone","shortname":":flag_sl:","category":9,"emoji_order":3784},{"name":"flag: San Marino","shortname":":flag_sm:","category":9,"emoji_order":3785},{"name":"flag: Senegal","shortname":":flag_sn:","category":9,"emoji_order":3786},{"name":"flag: Somalia","shortname":":flag_so:","category":9,"emoji_order":3787},{"name":"flag: Suriname","shortname":":flag_sr:","category":9,"emoji_order":3788},{"name":"flag: South Sudan","shortname":":flag_ss:","category":9,"emoji_order":3789},{"name":"flag: São Tomé & Príncipe","shortname":":flag_st:","category":9,"emoji_order":3790},{"name":"flag: El Salvador","shortname":":flag_sv:","category":9,"emoji_order":3791},{"name":"flag: Sint Maarten","shortname":":flag_sx:","category":9,"emoji_order":3792},{"name":"flag: Syria","shortname":":flag_sy:","category":9,"emoji_order":3793},{"name":"flag: Eswatini","shortname":":flag_sz:","category":9,"emoji_order":3794},{"name":"flag: Tristan da Cunha","shortname":":flag_ta:","category":9,"emoji_order":3795},{"name":"flag: Turks & Caicos Islands","shortname":":flag_tc:","category":9,"emoji_order":3796},{"name":"flag: Chad","shortname":":flag_td:","category":9,"emoji_order":3797},{"name":"flag: French Southern Territories","shortname":":flag_tf:","category":9,"emoji_order":3798},{"name":"flag: Togo","shortname":":flag_tg:","category":9,"emoji_order":3799},{"name":"flag: Thailand","shortname":":flag_th:","category":9,"emoji_order":3800},{"name":"flag: Tajikistan","shortname":":flag_tj:","category":9,"emoji_order":3801},{"name":"flag: Tokelau","shortname":":flag_tk:","category":9,"emoji_order":3802},{"name":"flag: Timor-Leste","shortname":":flag_tl:","category":9,"emoji_order":3803},{"name":"flag: Turkmenistan","shortname":":flag_tm:","category":9,"emoji_order":3804},{"name":"flag: Tunisia","shortname":":flag_tn:","category":9,"emoji_order":3805},{"name":"flag: Tonga","shortname":":flag_to:","category":9,"emoji_order":3806},{"name":"flag: Turkey","shortname":":flag_tr:","category":9,"emoji_order":3807},{"name":"flag: Trinidad & Tobago","shortname":":flag_tt:","category":9,"emoji_order":3808},{"name":"flag: Tuvalu","shortname":":flag_tv:","category":9,"emoji_order":3809},{"name":"flag: Taiwan","shortname":":flag_tw:","category":9,"emoji_order":3810},{"name":"flag: Tanzania","shortname":":flag_tz:","category":9,"emoji_order":3811},{"name":"flag: Ukraine","shortname":":flag_ua:","category":9,"emoji_order":3812},{"name":"flag: Uganda","shortname":":flag_ug:","category":9,"emoji_order":3813},{"name":"flag: U.S. Outlying Islands","shortname":":flag_um:","category":9,"emoji_order":3814},{"name":"flag: United Nations","shortname":":flag_un:","category":9,"emoji_order":3815},{"name":"flag: United States","shortname":":flag_us:","category":9,"emoji_order":3816,"aliases":[":usa:"]},{"name":"flag: Uruguay","shortname":":flag_uy:","category":9,"emoji_order":3817},{"name":"flag: Uzbekistan","shortname":":flag_uz:","category":9,"emoji_order":3818},{"name":"flag: Vatican City","shortname":":flag_va:","category":9,"emoji_order":3819},{"name":"flag: St. Vincent & Grenadines","shortname":":flag_vc:","category":9,"emoji_order":3820},{"name":"flag: Venezuela","shortname":":flag_ve:","category":9,"emoji_order":3821},{"name":"flag: British Virgin Islands","shortname":":flag_vg:","category":9,"emoji_order":3822},{"name":"flag: U.S. Virgin Islands","shortname":":flag_vi:","category":9,"emoji_order":3823},{"name":"flag: Vietnam","shortname":":flag_vn:","category":9,"emoji_order":3824},{"name":"flag: Vanuatu","shortname":":flag_vu:","category":9,"emoji_order":3825},{"name":"flag: Wallis & Futuna","shortname":":flag_wf:","category":9,"emoji_order":3826},{"name":"flag: Samoa","shortname":":flag_ws:","category":9,"emoji_order":3827},{"name":"flag: Kosovo","shortname":":flag_xk:","category":9,"emoji_order":3828},{"name":"flag: Yemen","shortname":":flag_ye:","category":9,"emoji_order":3829},{"name":"flag: Mayotte","shortname":":flag_yt:","category":9,"emoji_order":3830},{"name":"flag: South Africa","shortname":":flag_za:","category":9,"emoji_order":3831},{"name":"flag: Zambia","shortname":":flag_zm:","category":9,"emoji_order":3832},{"name":"flag: Zimbabwe","shortname":":flag_zw:","category":9,"emoji_order":3833},{"name":"flag: England","shortname":":flag_gbeng:","category":9,"emoji_order":3834,"aliases":[":england:"]},{"name":"flag: Scotland","shortname":":flag_gbsct:","category":9,"emoji_order":3835,"aliases":[":scotland:"]},{"name":"flag: Wales","shortname":":flag_gbwls:","category":9,"emoji_order":3836,"aliases":[":wales:"]}] \ No newline at end of file From a5d5569af4e06d57c0d89abaf75fb2966ca6cceb Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 17 Dec 2019 21:40:17 +0000 Subject: [PATCH 072/239] Translated using Weblate (Japanese) Currently translated at 59.3% (1184 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/ --- src/i18n/strings/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 14a1b6d429..cce9a81188 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -446,7 +446,7 @@ "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "共有キーリクエストは、他の端末に自動的に送信されます。 他の端末での共有キーリクエストを拒否または却下した場合は、ここをクリックしてこのセッションのキーを再度要求してください。", "If your other devices do not have the key for this message you will not be able to decrypt them.": "他の端末にこのメッセージのキーがない場合、それらの端末を復号化することはできません。", "Key request sent.": "キーリクエストが送信されました。", - "Re-request encryption keys from your other devices.": "他の端末から暗号化キーを再リクエストします。", + "Re-request encryption keys from your other devices.": "他の端末から暗号化キーを再リクエストします。", "Undecryptable": "解読不能", "Encrypted by an unverified device": "未検証の端末によって暗号化されました", "Unencrypted message": "暗号化されていないメッセージ", From a1df87a37579ff948302a1387e2ec160409c9dea Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 07:23:05 +0000 Subject: [PATCH 073/239] Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed --- src/components/structures/ContextMenu.js | 20 +++++++++++-------- .../views/messages/MessageActionBar.js | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.js index e861e3d45f..662972ee37 100644 --- a/src/components/structures/ContextMenu.js +++ b/src/components/structures/ContextMenu.js @@ -71,12 +71,12 @@ export class ContextMenu extends React.Component { // on resize callback windowResize: PropTypes.func, - catchTab: PropTypes.bool, // whether to close the ContextMenu on TAB (default=true) + managed: PropTypes.bool, // whether this context menu should be focus managed. If false it must handle itself }; static defaultProps = { hasBackground: true, - catchTab: true, + managed: true, }; constructor() { @@ -186,15 +186,19 @@ export class ContextMenu extends React.Component { }; _onKeyDown = (ev) => { + if (!this.props.managed) { + if (ev.key === Key.ESCAPE) { + this.props.onFinished(); + ev.stopPropagation(); + ev.preventDefault(); + } + return; + } + let handled = true; switch (ev.key) { case Key.TAB: - if (!this.props.catchTab) { - handled = false; - break; - } - // fallthrough case Key.ESCAPE: this.props.onFinished(); break; @@ -321,7 +325,7 @@ export class ContextMenu extends React.Component { return (
    -
    +
    { chevron } { props.children }
    diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js index 81e806cf62..52d7a74632 100644 --- a/src/components/views/messages/MessageActionBar.js +++ b/src/components/views/messages/MessageActionBar.js @@ -88,7 +88,7 @@ const ReactButton = ({mxEvent, reactions, onFocusChange}) => { if (menuDisplayed) { const buttonRect = button.current.getBoundingClientRect(); const ReactionPicker = sdk.getComponent('emojipicker.ReactionPicker'); - contextMenu = + contextMenu = ; } From 3196655524ed7860c7e26a1fdc5bdff9e4b21be3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 09:06:52 +0000 Subject: [PATCH 074/239] Replace UserInfo avatar with for fallback logic --- res/css/views/right_panel/_UserInfo.scss | 18 +++++---- src/components/views/right_panel/UserInfo.js | 40 +++++++++----------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss index df7d0a5f87..a5428393ee 100644 --- a/res/css/views/right_panel/_UserInfo.scss +++ b/res/css/views/right_panel/_UserInfo.scss @@ -63,7 +63,6 @@ limitations under the License. .mx_UserInfo_avatar { margin: 24px 32px 0 32px; - cursor: pointer; } .mx_UserInfo_avatar > div { @@ -71,18 +70,23 @@ limitations under the License. margin: 0 auto; } - .mx_UserInfo_avatar > div > div { + .mx_UserInfo_avatar > div * { /* use padding-top instead of height to make this element square, as the % in padding is a % of the width (including margin, that's why we had to put the margin to center on a parent div), and not a % of the parent height. */ - padding-top: 100%; - height: 0; + width: 30vh; + height: 30vh; + object-fit: cover; border-radius: 100%; box-sizing: content-box; - background-repeat: no-repeat; - background-size: cover; - background-position: center; + } + + // override the calculated sizes so that the letter isn't HUGE + .mx_UserInfo_avatar > div .mx_BaseAvatar_initial { + font-size: 26px !important; + width: 30vh !important; + line-height: 30vh !important; } .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image { diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index d1d7aa0371..0116fafb9e 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -1051,16 +1051,9 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room } }, [cli, user.userId]); - - const onMemberAvatarKey = e => { - if (e.key === "Enter") { - onMemberAvatarClick(); - } - }; - const onMemberAvatarClick = useCallback(() => { const member = user; - const avatarUrl = member.getMxcAvatarUrl(); + const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl; if (!avatarUrl) return; const httpUrl = cli.mxcUrlToHttp(avatarUrl); @@ -1158,21 +1151,22 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room statusLabel = { statusMessage }; } - const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl; - let avatarElement; - if (avatarUrl) { - const httpUrl = cli.mxcUrlToHttp(avatarUrl, 800, 800); - avatarElement =
    -
    -
    ; - } + // const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl; + const MemberAvatar = sdk.getComponent('avatars.MemberAvatar'); + const avatarElement = ( +
    +
    + +
    +
    + ); let closeButton; if (onClose) { From 6851ad04b6864ceb721b8185f9db083e0503b33b Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 19 Dec 2019 11:26:20 +0000 Subject: [PATCH 075/239] Migrate key backups to SSSS If there's a key backup set up when we bootstrap SSSS, use its key for SSSS and add the key backup key as a passthrough secret. Requires https://github.com/matrix-org/matrix-js-sdk/pull/1128 Fixes https://github.com/vector-im/riot-web/issues/11210 --- .../CreateSecretStorageDialog.js | 64 ++++++++++++++++--- src/i18n/strings/en_EN.json | 2 + 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js index 78ff2a1698..f47baa9f4e 100644 --- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js +++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js @@ -23,13 +23,15 @@ import FileSaver from 'file-saver'; import { _t } from '../../../../languageHandler'; import Modal from '../../../../Modal'; -const PHASE_PASSPHRASE = 0; -const PHASE_PASSPHRASE_CONFIRM = 1; -const PHASE_SHOWKEY = 2; -const PHASE_KEEPITSAFE = 3; -const PHASE_STORING = 4; -const PHASE_DONE = 5; -const PHASE_OPTOUT_CONFIRM = 6; +const PHASE_LOADING = 0; +const PHASE_MIGRATE = 1; +const PHASE_PASSPHRASE = 2; +const PHASE_PASSPHRASE_CONFIRM = 3; +const PHASE_SHOWKEY = 4; +const PHASE_KEEPITSAFE = 5; +const PHASE_STORING = 6; +const PHASE_DONE = 7; +const PHASE_OPTOUT_CONFIRM = 8; const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc. const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms. @@ -58,7 +60,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent { this._setZxcvbnResultTimeout = null; this.state = { - phase: PHASE_PASSPHRASE, + phase: PHASE_LOADING, passPhrase: '', passPhraseConfirm: '', copied: false, @@ -66,6 +68,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent { zxcvbnResult: null, setPassPhrase: false, }; + + this._fetchBackupInfo(); } componentWillUnmount() { @@ -74,10 +78,23 @@ export default class CreateSecretStorageDialog extends React.PureComponent { } } + async _fetchBackupInfo() { + const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion(); + + this.setState({ + phase: backupInfo ? PHASE_MIGRATE: PHASE_PASSPHRASE, + backupInfo, + }); + } + _collectRecoveryKeyNode = (n) => { this._recoveryKeyNode = n; } + _onMigrateNextClick = () => { + this._bootstrapSecretStorage(); + } + _onCopyClick = () => { selectText(this._recoveryKeyNode); const successful = document.execCommand('copy'); @@ -105,6 +122,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent { this.setState({ phase: PHASE_STORING, error: null, + keyBackupInfo: this.state.backupInfo, }); const cli = MatrixClientPeg.get(); try { @@ -250,6 +268,26 @@ export default class CreateSecretStorageDialog extends React.PureComponent { return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE; } + _renderPhaseMigrate() { + // This is a temporary screen so people who have the labs flag turned on and + // click the button are aware they're making a change to their account. + // Once we're confident enough in this (and it's supported enough) we can do + // it automatically. + const DialogButtons = sdk.getComponent('views.elements.DialogButtons'); + return
    +

    {_t( + "Secret Storage will be set up using your existing key backup details." + + "Your secret storage passphrase and recovery key will be the same as " + + " they were for your key backup", + )}

    + +
    ; + } + _renderPhasePassPhrase() { const DialogButtons = sdk.getComponent('views.elements.DialogButtons'); @@ -449,7 +487,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
    ; } - _renderBusyPhase(text) { + _renderBusyPhase() { const Spinner = sdk.getComponent('views.elements.Spinner'); return
    @@ -488,6 +526,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent { _titleForPhase(phase) { switch (phase) { + case PHASE_MIGRATE: + return _t('Migrate from Key Backup'); case PHASE_PASSPHRASE: return _t('Secure your encrypted messages with a passphrase'); case PHASE_PASSPHRASE_CONFIRM: @@ -525,6 +565,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
    ; } else { switch (this.state.phase) { + case PHASE_LOADING: + content = this._renderBusyPhase(); + break; + case PHASE_MIGRATE: + content = this._renderPhaseMigrate(); + break; case PHASE_PASSPHRASE: content = this._renderPhasePassPhrase(); break; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9bccca14f4..14cfbac987 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1935,6 +1935,7 @@ "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.", "File to import": "File to import", "Import": "Import", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup", "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.", "Warning: You should only set up secret storage from a trusted computer.": "Warning: You should only set up secret storage from a trusted computer.", "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.", @@ -1961,6 +1962,7 @@ "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.", "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.", "Set up secret storage": "Set up secret storage", + "Migrate from Key Backup": "Migrate from Key Backup", "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase", "Confirm your passphrase": "Confirm your passphrase", "Recovery key": "Recovery key", From 66783dff9e4ebfd4ddae8ad5be3927a7439f83ce Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 12:27:25 +0000 Subject: [PATCH 076/239] Fix scaling of the avatar in UserInfo --- res/css/views/avatars/_BaseAvatar.scss | 1 + res/css/views/right_panel/_UserInfo.scss | 30 +++++++++++++------- src/components/views/right_panel/UserInfo.js | 18 ++++++------ 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/res/css/views/avatars/_BaseAvatar.scss b/res/css/views/avatars/_BaseAvatar.scss index a085034758..e59598278f 100644 --- a/res/css/views/avatars/_BaseAvatar.scss +++ b/res/css/views/avatars/_BaseAvatar.scss @@ -40,6 +40,7 @@ limitations under the License. } .mx_BaseAvatar_image { + object-fit: cover; border-radius: 40px; vertical-align: top; background-color: $avatar-bg-color; diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss index a5428393ee..e87fe06a94 100644 --- a/res/css/views/right_panel/_UserInfo.scss +++ b/res/css/views/right_panel/_UserInfo.scss @@ -70,23 +70,33 @@ limitations under the License. margin: 0 auto; } - .mx_UserInfo_avatar > div * { + .mx_UserInfo_avatar > div > div { /* use padding-top instead of height to make this element square, as the % in padding is a % of the width (including margin, that's why we had to put the margin to center on a parent div), and not a % of the parent height. */ - width: 30vh; - height: 30vh; - object-fit: cover; - border-radius: 100%; - box-sizing: content-box; + padding-top: 100%; + position: relative; } - // override the calculated sizes so that the letter isn't HUGE - .mx_UserInfo_avatar > div .mx_BaseAvatar_initial { + .mx_UserInfo_avatar > div > div * { + border-radius: 100%; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + + .mx_UserInfo_avatar .mx_BaseAvatar_initial { + z-index: 1; + display: flex; + align-items: center; + justify-content: center; + + // override the calculated sizes so that the letter isn't HUGE font-size: 26px !important; - width: 30vh !important; - line-height: 30vh !important; + width: 100% !important; } .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image { diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 0116fafb9e..65fc0bf66b 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -1156,14 +1156,16 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room const avatarElement = (
    - +
    + +
    ); From 3678e64f5d10aff9eaad2da93b735411a93ea3a0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 13:25:43 +0000 Subject: [PATCH 077/239] Internationalise M_TOO_LARGE error from Synapse --- src/components/structures/RoomStatusBar.js | 4 ++-- src/i18n/strings/en_EN.json | 1 + src/utils/ErrorUtils.js | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js index b0aa4cb59b..574d3b7d1e 100644 --- a/src/components/structures/RoomStatusBar.js +++ b/src/components/structures/RoomStatusBar.js @@ -25,7 +25,7 @@ import MatrixClientPeg from '../../MatrixClientPeg'; import Resend from '../../Resend'; import * as cryptodevices from '../../cryptodevices'; import dis from '../../dispatcher'; -import { messageForResourceLimitError } from '../../utils/ErrorUtils'; +import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils'; const STATUS_BAR_HIDDEN = 0; const STATUS_BAR_EXPANDED = 1; @@ -272,7 +272,7 @@ module.exports = createReactClass({ unsentMessages[0].error.data && unsentMessages[0].error.data.error ) { - title = unsentMessages[0].error.data.error; + title = messageForSendError(unsentMessages[0].error.data) || unsentMessages[0].error.data.error; } else { title = _t('%(count)s of your messages have not been sent.', { count: unsentMessages.length }); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9bccca14f4..1dbd94f64f 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -301,6 +301,7 @@ "No homeserver URL provided": "No homeserver URL provided", "Unexpected error resolving homeserver configuration": "Unexpected error resolving homeserver configuration", "Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration", + "The message you are trying to send is too large.": "The message you are trying to send is too large.", "This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.", "This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.", "Please contact your service administrator to continue using the service.": "Please contact your service administrator to continue using the service.", diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js index 4a56d64ef1..51b130bdb6 100644 --- a/src/utils/ErrorUtils.js +++ b/src/utils/ErrorUtils.js @@ -49,6 +49,12 @@ export function messageForResourceLimitError(limitType, adminContact, strings, e } } +export function messageForSendError(errorData) { + if (errorData.errcode === "M_TOO_LARGE") { + return _t("The message you are trying to send is too large."); + } +} + export function messageForSyncError(err) { if (err.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') { const limitError = messageForResourceLimitError( From 6c1944359ece104736f64f1051d525ba9f45ea28 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 14:29:46 +0000 Subject: [PATCH 078/239] Add RoomTile online indicator to DMs --- res/css/views/rooms/_RoomTile.scss | 9 ++++ src/components/views/rooms/RoomTile.js | 17 ++++--- .../views/rooms/RoomTileOnlineDot.js | 48 +++++++++++++++++++ 3 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 src/components/views/rooms/RoomTileOnlineDot.js diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 1814919b61..2b181f366e 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket 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. @@ -61,6 +62,14 @@ limitations under the License. min-width: 0; } +.mx_RoomTile_online_dot { + border-radius: 50%; + background-color: $accent-color; + height: 5px; + width: 5px; + display: inline-block; +} + .mx_RoomTile_subtext { display: inline-block; font-size: 11px; diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 817ada9706..797aa7b87a 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -32,6 +32,7 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver'; import RoomViewStore from '../../../stores/RoomViewStore'; import SettingsStore from "../../../settings/SettingsStore"; import {_t} from "../../../languageHandler"; +import RoomTileOnlineDot from "./RoomTileOnlineDot"; module.exports = createReactClass({ displayName: 'RoomTile', @@ -68,11 +69,6 @@ module.exports = createReactClass({ }); }, - _isDirectMessageRoom: function(roomId) { - const dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId); - return Boolean(dmRooms); - }, - _shouldShowStatusMessage() { if (!SettingsStore.isFeatureEnabled("feature_custom_status")) { return false; @@ -371,8 +367,11 @@ module.exports = createReactClass({ let ariaLabel = name; + const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId); + let dmIndicator; - if (this._isDirectMessageRoom(this.props.room.roomId)) { + let dmOnline; + if (dmUserId) { dmIndicator = dm; + + if (this.props.room.getMember(dmUserId).membership === "join") { + const RoomTileOnlineDot = sdk.getComponent('rooms.RoomTileOnlineDot'); + dmOnline = ; + } } // The following labels are written in such a fashion to increase screen reader efficiency (speed). @@ -428,6 +432,7 @@ module.exports = createReactClass({ { label } { subtextLabel }
    + { dmOnline } { contextMenuButton } { badge }
    diff --git a/src/components/views/rooms/RoomTileOnlineDot.js b/src/components/views/rooms/RoomTileOnlineDot.js new file mode 100644 index 0000000000..a882aec613 --- /dev/null +++ b/src/components/views/rooms/RoomTileOnlineDot.js @@ -0,0 +1,48 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React, {useContext, useEffect, useMemo, useState, useCallback} from "react"; +import PropTypes from "prop-types"; + +import {useEventEmitter} from "../../../hooks/useEventEmitter"; +import MatrixClientContext from "../../../contexts/MatrixClientContext"; + +const RoomTileOnlineDot = ({userId}) => { + const cli = useContext(MatrixClientContext); + const user = useMemo(() => cli.getUser(userId), [cli, userId]); + + const [isOnline, setIsOnline] = useState(false); + + // Recheck if the user or client changes + useEffect(() => { + setIsOnline(user && (user.currentlyActive || user.presence === "online")); + }, [cli, user]); + // Recheck also if we receive a User.currentlyActive event + const currentlyActiveHandler = useCallback((ev) => { + const content = ev.getContent(); + setIsOnline(content.currently_active || content.presence === "online"); + }, []); + useEventEmitter(user, "User.currentlyActive", currentlyActiveHandler); + useEventEmitter(user, "User.presence", currentlyActiveHandler); + + return isOnline ? : null; +}; + +RoomTileOnlineDot.propTypes = { + userId: PropTypes.string.isRequired, +}; + +export default RoomTileOnlineDot; From db069b960207f3c8af5b6320a0bc5709b06354cb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 14:33:46 +0000 Subject: [PATCH 079/239] delint --- src/components/views/rooms/RoomTile.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 797aa7b87a..cd5af61862 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -32,7 +32,6 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver'; import RoomViewStore from '../../../stores/RoomViewStore'; import SettingsStore from "../../../settings/SettingsStore"; import {_t} from "../../../languageHandler"; -import RoomTileOnlineDot from "./RoomTileOnlineDot"; module.exports = createReactClass({ displayName: 'RoomTile', From 3f7ea3bc66ba47d171ff406ab79a8e5d126ef116 Mon Sep 17 00:00:00 2001 From: Samu Voutilainen Date: Thu, 19 Dec 2019 07:39:57 +0000 Subject: [PATCH 080/239] Translated using Weblate (Finnish) Currently translated at 95.5% (1909 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/ --- src/i18n/strings/fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 6f941b5d4a..381eff2e8e 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -1078,7 +1078,7 @@ "This room is a continuation of another conversation.": "Tämä huone on jatkumo toisesta keskustelusta.", "Don't ask me again": "Älä kysy uudelleen", "Not now": "Ei nyt", - "The conversation continues here.": "Keskustelu jatkuu tässä.", + "The conversation continues here.": "Keskustelu jatkuu täällä.", "Share Link to User": "Jaa linkki käyttäjälle", "Muted Users": "Mykistetyt käyttäjät", "Timeline": "Aikajana", From 1010c0a27b22466e25aae9bb1cb34fbb3d097f01 Mon Sep 17 00:00:00 2001 From: random Date: Thu, 19 Dec 2019 08:58:42 +0000 Subject: [PATCH 081/239] Translated using Weblate (Italian) Currently translated at 99.9% (1997 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 08be6d4c06..b18b6c9272 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -2006,5 +2006,12 @@ "Secure your encrypted messages with a passphrase": "Proteggi i tuoi messaggi cifrati con una password", "Storing secrets...": "Memorizzo i segreti...", "Unable to set up secret storage": "Impossibile impostare un archivio segreto", - "Close preview": "Chiudi anteprima" + "Close preview": "Chiudi anteprima", + "This user has not verified all of their devices.": "Questo utente non ha verificato tutti i suoi dispositivi.", + "You have not verified this user. This user has verified all of their devices.": "Non hai verificato questo utente. Questo utente ha verificato tutti i suoi dispositivi.", + "You have verified this user. This user has verified all of their devices.": "Hai verificato questo utente. Questo utente ha verificato tutti i suoi dispositivi.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Non hai verificato alcuni utenti in questa stanza criptata o essi non hanno verificato i loro dispositivi.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Hai verificato tutti gli utenti in questa stanza criptata ed essi hanno verificato i loro dispositivi.", + "Language Dropdown": "Lingua a tendina", + "Country Dropdown": "Nazione a tendina" } From 00b66b487799b4095f213ebf81e0835baf1f4c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Thu, 19 Dec 2019 10:03:51 +0000 Subject: [PATCH 082/239] Translated using Weblate (Slovak) Currently translated at 75.0% (1498 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/ --- src/i18n/strings/sk.json | 111 ++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 32 deletions(-) diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 1782059252..21830a92e0 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -1187,70 +1187,70 @@ "Verify this user by confirming the following number appears on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.", "Unable to find a supported verification method.": "Nie je možné nájsť podporovanú metódu overenia.", "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Pre zachovanie maximálnej bezpečnosti odporúčame, aby ste toto vykonali osobne, alebo použili iný dôverihodný komunikačný kanál.", - "Dog": "Pes", - "Cat": "Mačka", - "Lion": "Lev", + "Dog": "Hlava psa", + "Cat": "Hlava mačky", + "Lion": "Hlava leva", "Horse": "Kôň", - "Unicorn": "Jednorožec", - "Pig": "Prasa", + "Unicorn": "Hlava jednorožca", + "Pig": "Hlava Prasaťa", "Elephant": "Slon", - "Rabbit": "Zajac", - "Panda": "Panda", + "Rabbit": "Hlava Zajaca", + "Panda": "Hlava Pandy", "Rooster": "Kohút", "Penguin": "Tučniak", "Turtle": "Korytnačka", "Fish": "Ryba", "Octopus": "Chobotnica", "Butterfly": "Motýľ", - "Flower": "Kvetina", - "Tree": "Strom", + "Flower": "Tulipán", + "Tree": "Listnatý strom", "Cactus": "Kaktus", - "Mushroom": "Hríb", + "Mushroom": "Huba", "Globe": "Zemeguľa", - "Moon": "Mesiac", + "Moon": "Polmesiac", "Cloud": "Oblak", "Fire": "Oheň", "Banana": "Banán", - "Apple": "Jablko", + "Apple": "Červené jablko", "Strawberry": "Jahoda", - "Corn": "Kukurica", + "Corn": "Kukuričný klas", "Pizza": "Pizza", - "Cake": "Koláč", - "Heart": "Srdce", - "Smiley": "Úsmev", + "Cake": "Narodeninová torta", + "Heart": "Červené srdce", + "Smiley": "Škeriaca sa tvár", "Robot": "Robot", - "Hat": "Klobúk", + "Hat": "Cylinder", "Glasses": "Okuliare", - "Spanner": "Skrutkovač", - "Santa": "Mikuláš", + "Spanner": "Francúzsky kľúč", + "Santa": "Santa Claus", "Thumbs up": "palec nahor", "Umbrella": "Dáždnik", "Hourglass": "Presýpacie hodiny", - "Clock": "Hodiny", - "Gift": "Darček", + "Clock": "Budík", + "Gift": "Zabalený darček", "Light bulb": "Žiarovka", - "Book": "Kniha", + "Book": "Zatvorená kniha", "Pencil": "Ceruzka", - "Paperclip": "Kancelárska sponka", + "Paperclip": "Sponka na papier", "Scissors": "Nožnice", - "Padlock": "Visiaci zámok", + "Padlock": "Zatvorená zámka", "Key": "Kľúč", "Hammer": "Kladivo", "Telephone": "Telefón", - "Flag": "Vlajka", - "Train": "Vlak", + "Flag": "Kockovaná zástava", + "Train": "Rušeň", "Bicycle": "Bicykel", "Aeroplane": "Lietadlo", "Rocket": "Raketa", "Trophy": "Trofej", - "Ball": "Lopta", + "Ball": "Futbal", "Guitar": "Gitara", "Trumpet": "Trúbka", - "Bell": "Zvonček", + "Bell": "Zvon", "Anchor": "Kotva", "Headphones": "Slúchadlá", - "Folder": "Priečinok", - "Pin": "Pin", + "Folder": "Fascikel", + "Pin": "Špendlík", "Your homeserver does not support device management.": "Váš domovský server nepodporuje správu zariadení.", "Yes": "Áno", "No": "Nie", @@ -1461,7 +1461,7 @@ "The server does not support the room version specified.": "Server nepodporuje zadanú verziu miestnosti.", "Name or Matrix ID": "Meno alebo Matrix ID", "Email, name or Matrix ID": "Email, meno alebo Matrix ID", - "Failed to start chat": "Nepodarilo sa spustiť konverzáciu", + "Failed to start chat": "Nepodarilo sa začať konverzáciu", "Messages": "Správy", "Actions": "Akcie", "Room upgrade confirmation": "Potvrdenie aktualizácii miestnosti", @@ -1514,5 +1514,52 @@ "Terms of service not accepted or the identity server is invalid.": "Neprijali ste Podmienky poskytovania služby alebo to nie je správny server.", "Identity server has no terms of service": "Server totožností nemá žiadne podmienky poskytovania služieb", "The identity server you have chosen does not have any terms of service.": "Zadaný server totožností nezverejňuje žiadne podmienky poskytovania služieb.", - "Only continue if you trust the owner of the server.": "Pokračujte len v prípade, že dôverujete prevádzkovateľovi servera." + "Only continue if you trust the owner of the server.": "Pokračujte len v prípade, že dôverujete prevádzkovateľovi servera.", + "Add Email Address": "Pridať emailovú adresu", + "Add Phone Number": "Pridať telefónne číslo", + "Send cross-signing keys to homeserver": "Poslať kľúče pre podpisovanie naprieč zariadeniami na domovský server", + "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "Táto akcia si vyžaduje mať overenú emailovú adresu alebo telefónne číslo cez predvolený server totožností , ale server nezverejnil podmienky používania.", + "Trust": "Dôverovať", + "Custom (%(level)s)": "Vlastná (%(level)s)", + "Sends a message as plain text, without interpreting it as markdown": "Odošle správu vo formáte obyčajný text, bez prekladu markdown", + "You do not have the required permissions to use this command.": "Na použitie tohoto príkazu nemáte dostatočné povolenia.", + "Error upgrading room": "Chyba pri aktualizácii miestnosti", + "Double check that your server supports the room version chosen and try again.": "Uistite sa, že domovský server podporuje zvolenú verziu miestnosti a skúste znovu.", + "Changes the avatar of the current room": "Zmení obrázok miestnosti", + "Use an identity server": "Použiť server totožností", + "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Aby ste mohli používateľov pozývať zadaním emailovej adresy, je potrebné nastaviť adresu servera totožností. Klepnutím na tlačidlo pokračovať použijete predvolený server (%(defaultIdentityServerName)s) a zmeniť to môžete v nastaveniach.", + "Use an identity server to invite by email. Manage in Settings.": "Server totožností sa použije na pozývanie používateľov zadaním emailovej adresy. Spravujte v nastaveniach.", + "%(senderName)s placed a voice call.": "%(senderName)s uskutočnil telefonát.", + "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s uskutočnil telefonát. (Nepodporované týmto prehliadačom)", + "%(senderName)s placed a video call.": "%(senderName)s uskutočnil video hovor.", + "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s uskutočnil video hovor. (Nepodporované týmto prehliadačom)", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s odstránil pravidlo zákazu vstúpiť používateľom zhodujúcich sa s %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s odstránil pravidlo zákaz vstúpiť do miestností zhodujúcich sa s %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s odstránil pravidlo zakázať vstúpiť z domovského servera zhodnými s %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s odstránil pravidlo zákazu vstupu zhodné s %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s aktualizoval neplatné pravidlo zákazu vstúpiť", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zákazu vstúpiť používateľom zhodujúcim sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť do miestností shodujúcich sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť z domovských serverov zhodujúcich sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť zhodujúce sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť používateľom zhodujúcim sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť do miestností zhodujúcich sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť z domovských serverov zhodujúcich sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť zhodujúce sa s %(glob)s, dôvod: %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť používateľom pôvodne zhodujúcich sa s %(oldGlob)s na používateľov zhodujúcich sa s %(newGlob)s, dôvod: %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť do miestností pôvodne zhodujúcich sa s %(oldGlob)s na miestnosti zhodujúce sa s %(newGlob)s, dôvod: %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť z domovských serverov pôvodne sa zhodujúcich s %(oldGlob)s na servery zhodujúce sa s %(newGlob)s, dôvod: %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť pôvodne sa zhodujúce s %(oldGlob)s na %(newGlob)s, dôvod: %(reason)s", + "%(name)s (%(userId)s)": "%(name)s (%(userId)s)", + "Multiple integration managers": "Viacej integračných serverov", + "Try out new ways to ignore people (experimental)": "Vyskúšajte si nový spôsob ignorovania používateľov (experiment)", + "Send verification requests in direct message, including a new verification UX in the member panel.": "Požiadavky na overenie používateľov posielať v priamych konverzáciách, zahŕňa tiež nové rozhranie overenia v zozname používateľov.", + "Enable cross-signing to verify per-user instead of per-device (in development)": "Povoliť podpisovanie naprieč zariadeniami, umožňuje overovanie používateľov namiesto ich zariadení (vo vývoji)", + "Enable local event indexing and E2EE search (requires restart)": "Povoliť lokálne indexovanie udalostí a vyhľadávanie v šifrovaných miestnostiach", + "Use the new, faster, composer for writing messages": "Používať nový, rýchly, editor pri písaní správ", + "Match system theme": "Prispôsobiť sa vzhľadu systému", + "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)", + "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov", + "My Ban List": "Môj zoznam zakázať vstúpiť", + "Decline (%(counter)s)": "Zamietnuť (%(counter)s)" } From 709b2eed7c802789334769d176790bfe5c6d9705 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 15:10:54 +0000 Subject: [PATCH 083/239] Add bunch of null-guards and similar to fix React Errors/complaints --- src/components/views/elements/LazyRenderList.js | 10 ++++++++-- src/components/views/elements/Pill.js | 2 +- src/components/views/elements/SettingsFlag.js | 5 +++-- src/components/views/elements/TagTile.js | 2 ++ src/components/views/groups/GroupPublicityToggle.js | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/views/elements/LazyRenderList.js b/src/components/views/elements/LazyRenderList.js index 0fc0ef6733..7572dced0b 100644 --- a/src/components/views/elements/LazyRenderList.js +++ b/src/components/views/elements/LazyRenderList.js @@ -56,14 +56,20 @@ class ItemRange { } export default class LazyRenderList extends React.Component { + constructor(props) { + super(props); + + this.state = {}; + } + static getDerivedStateFromProps(props, state) { const range = LazyRenderList.getVisibleRangeFromProps(props); const intersectRange = range.expand(props.overflowMargin); const renderRange = range.expand(props.overflowItems); - const listHasChangedSize = !!state && renderRange.totalSize() !== state.renderRange.totalSize(); + const listHasChangedSize = !!state.renderRange && renderRange.totalSize() !== state.renderRange.totalSize(); // only update render Range if the list has shrunk/grown and we need to adjust padding OR // if the new range + overflowMargin isn't contained by the old anymore - if (listHasChangedSize || !state || !state.renderRange.contains(intersectRange)) { + if (listHasChangedSize || !state.renderRange || !state.renderRange.contains(intersectRange)) { return {renderRange}; } return null; diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index 12830488b1..b821276e92 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -127,7 +127,7 @@ const Pill = createReactClass({ } break; case Pill.TYPE_USER_MENTION: { - const localMember = nextProps.room.getMember(resourceId); + const localMember = nextProps.room ? nextProps.room.getMember(resourceId) : null; member = localMember; if (!localMember) { member = new RoomMember(null, resourceId); diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js index a3a6d18d33..d62f3182fc 100644 --- a/src/components/views/elements/SettingsFlag.js +++ b/src/components/views/elements/SettingsFlag.js @@ -34,12 +34,13 @@ module.exports = createReactClass({ getInitialState: function() { return { - value: SettingsStore.getValueAt( + // convert to Boolean to protect against null-capable "tri-state" Settings e.g fallbackICEServerAllowed + value: Boolean(SettingsStore.getValueAt( this.props.level, this.props.name, this.props.roomId, this.props.isExplicit, - ), + )), }; }, diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js index 767980f0a0..e31c1c524e 100644 --- a/src/components/views/elements/TagTile.js +++ b/src/components/views/elements/TagTile.js @@ -56,6 +56,8 @@ export default createReactClass({ hover: false, // The profile data of the group if this.props.tag is a group ID profile: null, + // Whether or not the context menu is open + menuDisplayed: false, }; }, diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js index bacf54382a..176bd9f988 100644 --- a/src/components/views/groups/GroupPublicityToggle.js +++ b/src/components/views/groups/GroupPublicityToggle.js @@ -32,7 +32,7 @@ export default createReactClass({ return { busy: false, ready: false, - isGroupPublicised: null, + isGroupPublicised: false, // assume false as expects a boolean }; }, @@ -43,7 +43,7 @@ export default createReactClass({ _initGroupStore: function(groupId) { this._groupStoreToken = GroupStore.registerListener(groupId, () => { this.setState({ - isGroupPublicised: GroupStore.getGroupPublicity(groupId), + isGroupPublicised: Boolean(GroupStore.getGroupPublicity(groupId)), ready: GroupStore.isStateReady(groupId, GroupStore.STATE_KEY.Summary), }); }); From 3d8422c88afe85a59eb9759a8bfb25bafb5ffd22 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 19 Dec 2019 15:23:32 +0000 Subject: [PATCH 084/239] Combine cross signing and verification over DM feature flags This means we can just make the new member info panel support cross-signing exclusively rather than having to try & make it temporarily support both --- src/components/structures/MatrixChat.js | 2 +- src/components/structures/RightPanel.js | 4 ++-- src/components/views/dialogs/DeviceVerifyDialog.js | 2 +- src/settings/Settings.js | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 82a682f9ab..8cee3e9def 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1466,7 +1466,7 @@ export default createReactClass({ } }); - if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { + if (SettingsStore.isFeatureEnabled("feature_cross_signing")) { cli.on("crypto.verification.request", request => { let requestObserver; if (request.event.getRoomId()) { diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js index 1745c9d7dc..2f91c5419d 100644 --- a/src/components/structures/RightPanel.js +++ b/src/components/structures/RightPanel.js @@ -190,7 +190,7 @@ export default class RightPanel extends React.Component { } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) { panel = ; } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) { - if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { + if (SettingsStore.isFeatureEnabled("feature_cross_signing")) { const onClose = () => { dis.dispatch({ action: "view_user", @@ -209,7 +209,7 @@ export default class RightPanel extends React.Component { } else if (this.state.phase === RIGHT_PANEL_PHASES.Room3pidMemberInfo) { panel = ; } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) { - if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { + if (SettingsStore.isFeatureEnabled("feature_cross_signing")) { const onClose = () => { dis.dispatch({ action: "view_user", diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js index 0e191cc192..6408245452 100644 --- a/src/components/views/dialogs/DeviceVerifyDialog.js +++ b/src/components/views/dialogs/DeviceVerifyDialog.js @@ -97,7 +97,7 @@ export default class DeviceVerifyDialog extends React.Component { const client = MatrixClientPeg.get(); const verifyingOwnDevice = this.props.userId === client.getUserId(); try { - if (!verifyingOwnDevice && SettingsStore.getValue("feature_dm_verification")) { + if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) { const roomId = await ensureDMExistsAndOpen(this.props.userId); // throws upon cancellation before having started this._verifier = await client.requestVerificationDM( diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 82dd639819..f1299a9045 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -136,13 +136,6 @@ export const SETTINGS = { supportedLevels: ['account'], default: null, }, - "feature_dm_verification": { - isFeature: true, - displayName: _td("Send verification requests in direct message," + - " including a new verification UX in the member panel."), - supportedLevels: LEVELS_FEATURE, - default: false, - }, "feature_cross_signing": { isFeature: true, displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"), From 26980e2ad542bcf290640bee3af50d89b585b303 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 15:26:04 +0000 Subject: [PATCH 085/239] apply unhomoglyph when filtering room list to fuzzify it --- src/components/views/rooms/RoomList.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 80a03e7a73..fb1643b8dd 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -22,6 +22,7 @@ import React from "react"; import ReactDOM from "react-dom"; import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; +import utils from "matrix-js-sdk/lib/utils"; import { _t } from '../../../languageHandler'; const MatrixClientPeg = require("../../../MatrixClientPeg"); const CallHandler = require('../../../CallHandler'); @@ -588,11 +589,17 @@ module.exports = createReactClass({ _applySearchFilter: function(list, filter) { if (filter === "") return list; + const fuzzyFilter = utils.removeHiddenChars(filter).toLowerCase(); const lcFilter = filter.toLowerCase(); // case insensitive if room name includes filter, // or if starts with `#` and one of room's aliases starts with filter - return list.filter((room) => (room.name && room.name.toLowerCase().includes(lcFilter)) || - (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter)))); + return list.filter((room) => { + if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) { + return true; + } + const lcRoomName = room.name ? utils.removeHiddenChars(room.name).toLowerCase() : ""; + return lcRoomName.includes(fuzzyFilter); + }); }, _handleCollapsedState: function(key, collapsed) { From c5e7594fe9869ab89bf3a9d3444d7418798dbe02 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 19 Dec 2019 15:27:29 +0000 Subject: [PATCH 086/239] i18n --- src/i18n/strings/en_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9bccca14f4..c959be6263 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -357,7 +357,6 @@ "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)", - "Send verification requests in direct message, including a new verification UX in the member panel.": "Send verification requests in direct message, including a new verification UX in the member panel.", "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", From e54429680be928e27815bf11761ea68950147b0b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 15:28:11 +0000 Subject: [PATCH 087/239] tidy up --- src/components/views/rooms/RoomList.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index fb1643b8dd..152ce5105e 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -597,8 +597,7 @@ module.exports = createReactClass({ if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) { return true; } - const lcRoomName = room.name ? utils.removeHiddenChars(room.name).toLowerCase() : ""; - return lcRoomName.includes(fuzzyFilter); + return room.name ? utils.removeHiddenChars(room.name).toLowerCase().includes(fuzzyFilter) : false; }); }, From 1c31fd34130e4aa8e0a224f36863efe3ae744e74 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 16:54:30 +0000 Subject: [PATCH 088/239] Apply new design to highlighted tags and add toggle mechanic --- res/css/structures/_TagPanel.scss | 24 +++++++++--------------- src/stores/TagOrderStore.js | 9 +++++++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index b03d36a592..8efd0796f5 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -68,7 +68,7 @@ limitations under the License. } .mx_TagPanel .mx_TagPanel_tagTileContainer > div { height: 40px; - padding: 5px 0 4px 0; + padding: 10px 0 9px 0; } .mx_TagPanel .mx_TagTile { @@ -82,21 +82,15 @@ limitations under the License. // opacity: 1; } -.mx_TagPanel .mx_TagTile.mx_TagTile_selected .mx_TagTile_avatar .mx_BaseAvatar { +.mx_TagPanel .mx_TagTile.mx_TagTile_selected::before { + content: ''; + height: 56px; background-color: $accent-color; - border-radius: 40px; - - /* In case this is a "initial" avatar */ - display: block; - height: 40px; - width: 40px; -} - -.mx_TagPanel .mx_TagTile_selected .mx_BaseAvatar_image { - border: 3px solid $accent-color; - height: 40px; - width: 40px; - box-sizing: border-box; + width: 5px; + position: absolute; + left: -15px; + border-radius: 0 2px 2px 0; + top: -8px; // (56 - 40)/2 } .mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus { diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js index 48a8817270..973d27f4e7 100644 --- a/src/stores/TagOrderStore.js +++ b/src/stores/TagOrderStore.js @@ -141,8 +141,13 @@ class TagOrderStore extends Store { newTags = [...this._state.selectedTags, payload.tag]; } } else { - // Select individual tag - newTags = [payload.tag]; + if (this._state.selectedTags.length === 1 && this._state.selectedTags.includes(payload.tag)) { + // Existing (only) selected tag is being normally clicked again, clear tags + newTags = []; + } else { + // Select individual tag + newTags = [payload.tag]; + } } // Only set the anchor tag if the tag was previously unselected, otherwise // the next range starts with an unselected tag. From a25bc9434390de9ac8a076179fc518ab8e8a4f01 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 17:22:02 +0000 Subject: [PATCH 089/239] remove unused, commented line of code --- src/autocomplete/EmojiProvider.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js index 7e30c8ca6a..9373ed662e 100644 --- a/src/autocomplete/EmojiProvider.js +++ b/src/autocomplete/EmojiProvider.js @@ -68,7 +68,6 @@ export default class EmojiProvider extends AutocompleteProvider { this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, { keys: ['emoji.emoticon', 'shortname'], funcs: [ - // (o) => `:${o.emoji.shortcodes[0]}:`, // shortname (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases ], // For matching against ascii equivalents From 48b166f4511e8e99475295485b091fa65e23f829 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 19 Dec 2019 17:28:32 +0000 Subject: [PATCH 090/239] Pass the key backup into the right thing --- .../views/dialogs/secretstorage/CreateSecretStorageDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js index f47baa9f4e..f8f782057b 100644 --- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js +++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js @@ -122,7 +122,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent { this.setState({ phase: PHASE_STORING, error: null, - keyBackupInfo: this.state.backupInfo, }); const cli = MatrixClientPeg.get(); try { @@ -143,6 +142,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent { } }, createSecretStorageKey: async () => this._keyInfo, + keyBackupInfo: this.state.backupInfo, }); this.setState({ phase: PHASE_DONE, From 372512b0c4b8fb5ffb6ee676ba3e6d117cfa1234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Thu, 19 Dec 2019 17:54:46 +0000 Subject: [PATCH 091/239] Translated using Weblate (French) Currently translated at 100.0% (1998 of 1998 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 96f2337229..f486048d66 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2015,5 +2015,6 @@ "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Certains utilisateurs dans ce salon chiffré n’ont pas été vérifiés par vous ou n’ont pas vérifié leurs propres appareils.", "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.", "Language Dropdown": "Sélection de la langue", - "Country Dropdown": "Sélection du pays" + "Country Dropdown": "Sélection du pays", + "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros." } From 822762f01434cfb5dabf92d36e6eef575dd954f8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 19 Dec 2019 19:49:36 +0000 Subject: [PATCH 092/239] add todo --- .../views/dialogs/secretstorage/CreateSecretStorageDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js index f8f782057b..289cb3265b 100644 --- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js +++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js @@ -269,7 +269,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent { } _renderPhaseMigrate() { - // This is a temporary screen so people who have the labs flag turned on and + // TODO: This is a temporary screen so people who have the labs flag turned on and // click the button are aware they're making a change to their account. // Once we're confident enough in this (and it's supported enough) we can do // it automatically. From b98058fc3c4b30db3795dc555f55a50ff55512bd Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 19 Dec 2019 19:54:44 +0000 Subject: [PATCH 093/239] Add bug for removing temporary srceen --- .../views/dialogs/secretstorage/CreateSecretStorageDialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js index 289cb3265b..25bc8cdfda 100644 --- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js +++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js @@ -273,6 +273,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent { // click the button are aware they're making a change to their account. // Once we're confident enough in this (and it's supported enough) we can do // it automatically. + // https://github.com/vector-im/riot-web/issues/11696 const DialogButtons = sdk.getComponent('views.elements.DialogButtons'); return

    {_t( From b2249d056117cb0c3f1891f476c0547ee5fcbfc3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 20:09:05 +0000 Subject: [PATCH 094/239] Initial rejig --- res/css/_components.scss | 1 - res/css/structures/_TagPanel.scss | 27 ++++++++- res/css/structures/_TagPanelButtons.scss | 56 ------------------ res/css/views/context_menus/_TopLeftMenu.scss | 4 ++ res/img/feather-customised/plus.svg | 4 ++ src/components/structures/LeftPanel.js | 1 - src/components/structures/TagPanel.js | 2 + src/components/structures/TagPanelButtons.js | 59 ------------------- .../views/context_menus/TopLeftMenu.js | 13 ++++ .../views/elements/AccessibleTooltipButton.js | 3 +- src/components/views/elements/GroupsButton.js | 37 ------------ src/components/views/elements/TagTile.js | 18 +----- src/i18n/strings/en_EN.json | 3 +- 13 files changed, 56 insertions(+), 172 deletions(-) delete mode 100644 res/css/structures/_TagPanelButtons.scss create mode 100644 res/img/feather-customised/plus.svg delete mode 100644 src/components/structures/TagPanelButtons.js delete mode 100644 src/components/views/elements/GroupsButton.js diff --git a/res/css/_components.scss b/res/css/_components.scss index 233c781d7f..20395550ab 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -24,7 +24,6 @@ @import "./structures/_SearchBox.scss"; @import "./structures/_TabbedView.scss"; @import "./structures/_TagPanel.scss"; -@import "./structures/_TagPanelButtons.scss"; @import "./structures/_ToastContainer.scss"; @import "./structures/_TopLeftMenuButton.scss"; @import "./structures/_UploadBar.scss"; diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index 8efd0796f5..307925335f 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -82,6 +82,31 @@ limitations under the License. // opacity: 1; } +.mx_TagPanel .mx_TagTile_plus { + margin-bottom: 12px; + height: 40px; + width: 40px; + border-radius: 20px; + background-color: $button-primary-fg-color; + opacity: 0.11; + position: relative; + /* overwrite mx_RoleButton inline-block */ + display: block !important; + + &::before { + mask-image: url('$(res)/img/feather-customised/plus.svg'); + mask-position: center; + background-color: $tagpanel-bg-color; + mask-repeat: no-repeat; + content: ''; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + } +} + .mx_TagPanel .mx_TagTile.mx_TagTile_selected::before { content: ''; height: 56px; @@ -89,7 +114,7 @@ limitations under the License. width: 5px; position: absolute; left: -15px; - border-radius: 0 2px 2px 0; + border-radius: 0 3px 3px 0; top: -8px; // (56 - 40)/2 } diff --git a/res/css/structures/_TagPanelButtons.scss b/res/css/structures/_TagPanelButtons.scss deleted file mode 100644 index 70fea92959..0000000000 --- a/res/css/structures/_TagPanelButtons.scss +++ /dev/null @@ -1,56 +0,0 @@ -/* -Copyright 2019 New Vector Ltd. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -.mx_TagPanelButtons { - background-color: $tagpanel-bg-color; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 17px 0 3px 0; -} - -.mx_TagPanelButtons > .mx_GroupsButton::before { - mask: url('$(res)/img/feather-customised/users.svg'); - mask-position: center 11px; -} - -.mx_TagPanelButtons > .mx_TagPanelButtons_report::before { - mask: url('$(res)/img/feather-customised/life-buoy.svg'); - mask-position: center 9px; -} - -.mx_TagPanelButtons > .mx_AccessibleButton { - margin-bottom: 12px; - height: 40px; - width: 40px; - border-radius: 20px; - background-color: $tagpanel-button-color; - position: relative; - /* overwrite mx_RoleButton inline-block */ - display: block !important; - - &::before { - background-color: $tagpanel-bg-color; - mask-repeat: no-repeat; - content: ''; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - } -} diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss index d17d683e7e..ed0d0106bc 100644 --- a/res/css/views/context_menus/_TopLeftMenu.scss +++ b/res/css/views/context_menus/_TopLeftMenu.scss @@ -53,6 +53,10 @@ limitations under the License. mask-image: url('$(res)/img/feather-customised/home.svg'); } + .mx_TopLeftMenu_icon_help::after { + mask-image: url('$(res)/img/feather-customised/life-buoy.svg'); + } + .mx_TopLeftMenu_icon_settings::after { mask-image: url('$(res)/img/feather-customised/settings.svg'); } diff --git a/res/img/feather-customised/plus.svg b/res/img/feather-customised/plus.svg new file mode 100644 index 0000000000..c747253139 --- /dev/null +++ b/res/img/feather-customised/plus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index a0ad2b5c81..f733888db9 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -243,7 +243,6 @@ const LeftPanel = createReactClass({ tagPanelContainer = (

    { isCustomTagsEnabled ? : undefined } -
    ); } diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index a758092dc8..6410af174e 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -104,6 +104,7 @@ const TagPanel = createReactClass({ render() { const DNDTagTile = sdk.getComponent('elements.DNDTagTile'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton'); const TintableSvg = sdk.getComponent('elements.TintableSvg'); const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper"); @@ -154,6 +155,7 @@ const TagPanel = createReactClass({ ref={provided.innerRef} > { tags } +
    { provided.placeholder }
    ) } diff --git a/src/components/structures/TagPanelButtons.js b/src/components/structures/TagPanelButtons.js deleted file mode 100644 index 7255e12307..0000000000 --- a/src/components/structures/TagPanelButtons.js +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2019 New Vector Ltd. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import React from 'react'; -import createReactClass from 'create-react-class'; -import sdk from '../../index'; -import dis from '../../dispatcher'; -import Modal from '../../Modal'; -import { _t } from '../../languageHandler'; - -const TagPanelButtons = createReactClass({ - displayName: 'TagPanelButtons', - - - componentDidMount: function() { - this._dispatcherRef = dis.register(this._onAction); - }, - - componentWillUnmount() { - if (this._dispatcherRef) { - dis.unregister(this._dispatcherRef); - this._dispatcherRef = null; - } - }, - - _onAction(payload) { - if (payload.action === "show_redesign_feedback_dialog") { - const RedesignFeedbackDialog = - sdk.getComponent("views.dialogs.RedesignFeedbackDialog"); - Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog); - } - }, - - render() { - const GroupsButton = sdk.getComponent('elements.GroupsButton'); - const ActionButton = sdk.getComponent("elements.ActionButton"); - - return (
    - - -
    ); - }, -}); -export default TagPanelButtons; diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js index b9aabdc608..db388a657d 100644 --- a/src/components/views/context_menus/TopLeftMenu.js +++ b/src/components/views/context_menus/TopLeftMenu.js @@ -25,6 +25,7 @@ import SdkConfig from '../../../SdkConfig'; import { getHostingLink } from '../../../utils/HostingLink'; import MatrixClientPeg from '../../../MatrixClientPeg'; import {MenuItem} from "../../structures/ContextMenu"; +import sdk from "../../../index"; export class TopLeftMenu extends React.Component { static propTypes = { @@ -100,6 +101,12 @@ export class TopLeftMenu extends React.Component { ); } + const helpItem = ( + + {_t("Help")} + + ); + const settingsItem = ( {_t("Settings")} @@ -115,11 +122,17 @@ export class TopLeftMenu extends React.Component {
      {homePageItem} {settingsItem} + {helpItem} {signInOutItem}
    ; } + openHelp() { + const RedesignFeedbackDialog = sdk.getComponent("views.dialogs.RedesignFeedbackDialog"); + Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog); + } + viewHomePage() { dis.dispatch({action: 'view_home_page'}); this.closeMenu(); diff --git a/src/components/views/elements/AccessibleTooltipButton.js b/src/components/views/elements/AccessibleTooltipButton.js index c824ea4025..4f2b1f1a96 100644 --- a/src/components/views/elements/AccessibleTooltipButton.js +++ b/src/components/views/elements/AccessibleTooltipButton.js @@ -48,7 +48,7 @@ export default class AccessibleTooltipButton extends React.PureComponent { const Tooltip = sdk.getComponent("elements.Tooltip"); const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); - const {title, ...props} = this.props; + const {title, children, ...props} = this.props; const tip = this.state.hover ? :
    ; return ( + { children } { tip } ); diff --git a/src/components/views/elements/GroupsButton.js b/src/components/views/elements/GroupsButton.js deleted file mode 100644 index 7b15e96424..0000000000 --- a/src/components/views/elements/GroupsButton.js +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2017 New Vector Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import React from 'react'; -import sdk from '../../../index'; -import PropTypes from 'prop-types'; -import { _t } from '../../../languageHandler'; - -const GroupsButton = function(props) { - const ActionButton = sdk.getComponent('elements.ActionButton'); - return ( - - ); -}; - -GroupsButton.propTypes = { - size: PropTypes.string, -}; - -export default GroupsButton; diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js index 767980f0a0..f3dbc5dd21 100644 --- a/src/components/views/elements/TagTile.js +++ b/src/components/views/elements/TagTile.js @@ -112,12 +112,10 @@ export default createReactClass({ }, onMouseOver: function() { - console.log("DEBUG onMouseOver"); this.setState({hover: true}); }, onMouseOut: function() { - console.log("DEBUG onMouseOut"); this.setState({hover: false}); }, @@ -140,7 +138,6 @@ export default createReactClass({ render: function() { const BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); - const Tooltip = sdk.getComponent('elements.Tooltip'); const profile = this.state.profile || {}; const name = profile.name || this.props.tag; const avatarHeight = 40; @@ -164,9 +161,6 @@ export default createReactClass({ badgeElement = (
    {FormattingUtils.formatCount(badge.count)}
    ); } - const tip = this.state.hover ? - : -
    ; // FIXME: this ought to use AccessibleButton for a11y but that causes onMouseOut/onMouseOver to fire too much const contextButton = this.state.hover || this.state.menuDisplayed ?
    @@ -184,14 +178,9 @@ export default createReactClass({ ); } + const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton"); return - +
    - { tip } { contextButton } { badgeElement }
    -     + { contextMenu }     ; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 1dbd94f64f..57479bc70e 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1259,7 +1259,6 @@ "Please create a new issue on GitHub so that we can investigate this bug.": "Please create a new issue on GitHub so that we can investigate this bug.", "collapse": "collapse", "expand": "expand", - "Communities": "Communities", "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)", "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s", "Rotate Left": "Rotate Left", @@ -1625,6 +1624,7 @@ "Hide": "Hide", "Home": "Home", "Sign in": "Sign in", + "Help": "Help", "Reload": "Reload", "Take picture": "Take picture", "Remove for everyone": "Remove for everyone", @@ -1768,6 +1768,7 @@ "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!", "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.", "Error whilst fetching joined communities": "Error whilst fetching joined communities", + "Communities": "Communities", "Create a new community": "Create a new community", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.", "You have no visible notifications": "You have no visible notifications", From d9ea9b4ad3c1b59e1872e8123974b839ce6a04fd Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 20:53:34 +0000 Subject: [PATCH 095/239] Iterate to match design on Zeplin --- res/css/structures/_CustomRoomTagPanel.scss | 16 +++++++-- res/css/structures/_TagPanel.scss | 4 +-- .../structures/CustomRoomTagPanel.js | 33 ++++--------------- src/components/structures/TagPanel.js | 10 ++++-- .../views/context_menus/TopLeftMenu.js | 1 + 5 files changed, 30 insertions(+), 34 deletions(-) diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss index 45961d7be1..278c7c3d0c 100644 --- a/res/css/structures/_CustomRoomTagPanel.scss +++ b/res/css/structures/_CustomRoomTagPanel.scss @@ -26,11 +26,15 @@ limitations under the License. .mx_CustomRoomTagPanel_scroller { max-height: inherit; + display: flex; + flex-direction: column; + align-items: center; } .mx_CustomRoomTagPanel .mx_AccessibleButton { margin: 9px auto; width: 40px; + position: relative; } .mx_CustomRoomTagPanel .mx_BaseAvatar_image { @@ -39,7 +43,13 @@ limitations under the License. height: 40px; } -.mx_CustomRoomTagPanel .mx_AccessibleButton.CustomRoomTagPanel_tileSelected .mx_BaseAvatar_image { - border: 3px solid $warning-color; - border-radius: 40px; +.mx_CustomRoomTagPanel .mx_AccessibleButton.CustomRoomTagPanel_tileSelected::before { + content: ''; + height: 56px; + background-color: $accent-color-alt; + width: 5px; + position: absolute; + left: -15px; + border-radius: 0 3px 3px 0; + top: -8px; // (56 - 40)/2 } diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index 307925335f..e2eda433ba 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -87,7 +87,7 @@ limitations under the License. height: 40px; width: 40px; border-radius: 20px; - background-color: $button-primary-fg-color; + background-color: $tagpanel-button-color; opacity: 0.11; position: relative; /* overwrite mx_RoleButton inline-block */ @@ -96,7 +96,7 @@ limitations under the License. &::before { mask-image: url('$(res)/img/feather-customised/plus.svg'); mask-position: center; - background-color: $tagpanel-bg-color; + background-color: $button-primary-fg-color; mask-repeat: no-repeat; content: ''; position: absolute; diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js index ee69d800ed..f1b548d72f 100644 --- a/src/components/structures/CustomRoomTagPanel.js +++ b/src/components/structures/CustomRoomTagPanel.js @@ -61,30 +61,13 @@ class CustomRoomTagPanel extends React.Component { } class CustomRoomTagTile extends React.Component { - constructor(props) { - super(props); - this.state = {hover: false}; - this.onClick = this.onClick.bind(this); - this.onMouseOut = this.onMouseOut.bind(this); - this.onMouseOver = this.onMouseOver.bind(this); - } - - onMouseOver() { - this.setState({hover: true}); - } - - onMouseOut() { - this.setState({hover: false}); - } - - onClick() { + onClick = () => { dis.dispatch({action: 'select_custom_room_tag', tag: this.props.tag.name}); - } + }; render() { const BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const Tooltip = sdk.getComponent('elements.Tooltip'); + const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton'); const tag = this.props.tag; const avatarHeight = 40; @@ -102,12 +85,9 @@ class CustomRoomTagTile extends React.Component { badgeElement = (
    {FormattingUtils.formatCount(badge.count)}
    ); } - const tip = (this.state.hover ? - : -
    ); return ( - -
    + +
    { badgeElement } - { tip }
    - +     ); } } diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index 6410af174e..0e05dbd785 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -104,7 +104,7 @@ const TagPanel = createReactClass({ render() { const DNDTagTile = sdk.getComponent('elements.DNDTagTile'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton'); + const ActionButton = sdk.getComponent('elements.ActionButton'); const TintableSvg = sdk.getComponent('elements.TintableSvg'); const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper"); @@ -155,7 +155,13 @@ const TagPanel = createReactClass({ ref={provided.innerRef} > { tags } -
    +
    + +
    { provided.placeholder }
    ) } diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js index db388a657d..7a7b124919 100644 --- a/src/components/views/context_menus/TopLeftMenu.js +++ b/src/components/views/context_menus/TopLeftMenu.js @@ -129,6 +129,7 @@ export class TopLeftMenu extends React.Component { } openHelp() { + this.closeMenu(); const RedesignFeedbackDialog = sdk.getComponent("views.dialogs.RedesignFeedbackDialog"); Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog); } From 3a36d61fab829640cb1aed82230d1565cab29c10 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 21:10:22 +0000 Subject: [PATCH 096/239] delint --- src/components/structures/LeftPanel.js | 1 - src/components/views/elements/TagTile.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index f733888db9..57ba58d6fe 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -24,7 +24,6 @@ import { Key } from '../../Keyboard'; import sdk from '../../index'; import dis from '../../dispatcher'; import VectorConferenceHandler from '../../VectorConferenceHandler'; -import TagPanelButtons from './TagPanelButtons'; import SettingsStore from '../../settings/SettingsStore'; import {_t} from "../../languageHandler"; import Analytics from "../../Analytics"; diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js index f3dbc5dd21..5464d69609 100644 --- a/src/components/views/elements/TagTile.js +++ b/src/components/views/elements/TagTile.js @@ -23,14 +23,13 @@ import classNames from 'classnames'; import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; -import {_t} from '../../../languageHandler'; import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard'; import * as FormattingUtils from '../../../utils/FormattingUtils'; import FlairStore from '../../../stores/FlairStore'; import GroupStore from '../../../stores/GroupStore'; import TagOrderStore from '../../../stores/TagOrderStore'; -import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu"; +import {ContextMenu, toRightOf} from "../../structures/ContextMenu"; // A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents // a thing to click on for the user to filter the visible rooms in the RoomList to: From b998e6ffe88df4936d8c172fdf70d50b8315cff3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 20 Dec 2019 11:31:11 +0000 Subject: [PATCH 097/239] Switch to using checkDeviceTrust In the UserInfo panel. This means we now use cross-signing verifications in the UserInfoPanel so we can see our cross-signing verifications working! Lots more to do here: the remaining device.isVerified() calls in UserInfoPanel are where it needs to be switched to verifying users rather than devices, and of course we need to replace all the calls to device.isVerified() with checkDeviceTrust everywhere else. --- src/components/views/right_panel/UserInfo.js | 32 +++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index da82fb2bdf..0ad2cc4dfb 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -129,17 +129,20 @@ function verifyDevice(userId, device) { } function DeviceItem({userId, device}) { + const cli = useContext(MatrixClientContext); + const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId); + const classes = classNames("mx_UserInfo_device", { - mx_UserInfo_device_verified: device.isVerified(), - mx_UserInfo_device_unverified: !device.isVerified(), + mx_UserInfo_device_verified: deviceTrust.isVerified(), + mx_UserInfo_device_unverified: !deviceTrust.isVerified(), }); const iconClasses = classNames("mx_E2EIcon", { - mx_E2EIcon_verified: device.isVerified(), - mx_E2EIcon_warning: !device.isVerified(), + mx_E2EIcon_verified: deviceTrust.isVerified(), + mx_E2EIcon_warning: !deviceTrust.isVerified(), }); const onDeviceClick = () => { - if (!device.isVerified()) { + if (!deviceTrust.isVerified()) { verifyDevice(userId, device); } }; @@ -147,7 +150,7 @@ function DeviceItem({userId, device}) { const deviceName = device.ambiguous ? (device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" : device.getDisplayName(); - const trustedLabel = device.isVerified() ? _t("Trusted") : _t("Not trusted"); + const trustedLabel = deviceTrust.isVerified() ? _t("Trusted") : _t("Not trusted"); return (
    {deviceName}
    @@ -157,6 +160,7 @@ function DeviceItem({userId, device}) { function DevicesSection({devices, userId, loading}) { const Spinner = sdk.getComponent("elements.Spinner"); + const cli = useContext(MatrixClientContext); const [isExpanded, setExpanded] = useState(false); @@ -167,9 +171,21 @@ function DevicesSection({devices, userId, loading}) { if (devices === null) { return _t("Unable to load device list"); } + const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId)); - const unverifiedDevices = devices.filter(d => !d.isVerified()); - const verifiedDevices = devices.filter(d => d.isVerified()); + const unverifiedDevices = []; + const verifiedDevices = []; + + for (let i = 0; i < devices.length; ++i) { + const device = devices[i]; + const deviceTrust = deviceTrusts[i]; + + if (deviceTrust.isVerified()) { + verifiedDevices.push(device); + } else { + unverifiedDevices.push(device); + } + } let expandButton; if (verifiedDevices.length) { From a928b33f274adf93cfb8b97a826776f4f0b5934e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 20 Dec 2019 16:51:50 +0000 Subject: [PATCH 098/239] Don't show the 'verify' button if the user is verified Which is more in keeping with the designs (and we can do this now that the new user info panel is only enabled with cross signing). --- src/components/views/right_panel/UserInfo.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 0ad2cc4dfb..4dd71700ad 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -1286,11 +1286,20 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { const devicesSection = isRoomEncrypted ? () : null; + + const userVerified = cli.checkUserTrust(user.userId).isVerified(); + let verifyButton; + if (!userVerified) { + verifyButton = verifyDevice(user.userId, null)}> + {_t("Verify")} + ; + } + const securitySection = (

    { _t("Security") }

    { text }

    - verifyDevice(user.userId, null)}>{_t("Verify")} + {verifyButton} { devicesSection }
    ); From 376bf7e2138c2eb62199211ea37a4915a6505d5c Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 20 Dec 2019 16:56:38 +0000 Subject: [PATCH 099/239] i18n --- src/i18n/strings/en_EN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 313bc93edd..ec1797cafd 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1124,8 +1124,8 @@ "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.", "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.", "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.", - "Security": "Security", "Verify": "Verify", + "Security": "Security", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", From e936f7eb095fc03d53b512d081db8aa37b2a87ad Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 21 Dec 2019 11:13:37 +0000 Subject: [PATCH 100/239] Fix room list filtering weird case sensitivity Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/RoomList.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 152ce5105e..2fd4fef5b0 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -589,15 +589,17 @@ module.exports = createReactClass({ _applySearchFilter: function(list, filter) { if (filter === "") return list; - const fuzzyFilter = utils.removeHiddenChars(filter).toLowerCase(); const lcFilter = filter.toLowerCase(); + // apply toLowerCase before and after removeHiddenChars because different rules get applied + // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppsercase, e.g 𝚮 -> H + const fuzzyFilter = utils.removeHiddenChars(lcFilter).toLowerCase(); // case insensitive if room name includes filter, // or if starts with `#` and one of room's aliases starts with filter return list.filter((room) => { if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) { return true; } - return room.name ? utils.removeHiddenChars(room.name).toLowerCase().includes(fuzzyFilter) : false; + return room.name && utils.removeHiddenChars(room.name.toLowerCase()).toLowerCase().includes(fuzzyFilter); }); }, From 21dcf65858940dbf6b076b8303442bba1d0b4fee Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Fri, 20 Dec 2019 04:49:56 +0000 Subject: [PATCH 101/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2000 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index cea6d8d70d..73af96e7fc 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2015,5 +2015,8 @@ "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "在此已加密的聊天室中的某些使用者尚未被您驗證，或是他們尚未驗證他們的裝置。", "All users in this encrypted room are verified by you and they have verified their own devices.": "在此已加密的聊天室中的所有使用者已被您驗證，他們也已驗證所有裝置。", "Language Dropdown": "語言下拉式選單", - "Country Dropdown": "國家下拉式選單" + "Country Dropdown": "國家下拉式選單", + "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同", + "Migrate from Key Backup": "從金鑰備份導入" } From 0e7949d73eda08c9ac49ed727c855eb24a165e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Thu, 19 Dec 2019 23:06:27 +0000 Subject: [PATCH 102/239] Translated using Weblate (French) Currently translated at 100.0% (2000 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index f486048d66..fb233b40d9 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2016,5 +2016,7 @@ "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.", "Language Dropdown": "Sélection de la langue", "Country Dropdown": "Sélection du pays", - "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros." + "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés", + "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés" } From fef19c510c36ae1346a772c025e175bf97928c7f Mon Sep 17 00:00:00 2001 From: Szimszon Date: Fri, 20 Dec 2019 12:54:30 +0000 Subject: [PATCH 103/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (2000 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 0faf20937b..fd88250707 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2016,5 +2016,8 @@ "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Néhány felhasználót még nem ellenőriztél ebben a titkosított szobában vagy még ők nem ellenőrizték az összes eszközüket.", "All users in this encrypted room are verified by you and they have verified their own devices.": "Minden felhasználót ellenőriztél ebben a titkosított szobában és ők ellenőrizték az összes eszközüket.", "Language Dropdown": "Nyelvválasztó lenyíló menü", - "Country Dropdown": "Ország lenyíló menü" + "Country Dropdown": "Ország lenyíló menü", + "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal", + "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből" } From 9a51b418463423a5a23282f9e1f024bf8b981cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Fri, 20 Dec 2019 10:05:17 +0000 Subject: [PATCH 104/239] Translated using Weblate (Slovak) Currently translated at 77.8% (1556 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/ --- src/i18n/strings/sk.json | 65 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 21830a92e0..8befc3c18c 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -1561,5 +1561,68 @@ "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)", "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov", "My Ban List": "Môj zoznam zakázať vstúpiť", - "Decline (%(counter)s)": "Zamietnuť (%(counter)s)" + "Decline (%(counter)s)": "Zamietnuť (%(counter)s)", + "The message you are trying to send is too large.": "Správa, ktorú sa usilujete odoslať, je príliš veľká.", + "This is your list of users/servers you have blocked - don't leave the room!": "Toto je zoznam používateľov / serverov, ktorých ste zablokovali - neopúšťajte miestnosť!", + "Upload": "Nahrať", + "Cross-signing and secret storage are enabled.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko sú aktívne.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Na bezpečnom úložisku vo vašom účte máte uloženú totožnosť podpisovania naprieč zariadeniami, ale v tomto zariadení zatiaľ tejto totožnosti nedôverujete.", + "Cross-signing and secret storage are not yet set up.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko zatiaľ nie sú nastavené.", + "Bootstrap cross-signing and secret storage": "Zaviesť podpisovanie naprieč zariadeniami a bezpečné úložisko", + "Cross-signing public keys:": "Verejné kľúče podpisovania naprieč zariadeniami:", + "on device": "na zariadení", + "not found": "nenájdené", + "Cross-signing private keys:": "Súkromné kľúče podpisovania naprieč zariadeniami:", + "in secret storage": "na bezpečnom úložisku", + "Secret storage public key:": "Verejný kľúč bezpečného úložiska:", + "in account data": "v údajoch účtu", + "Connecting to integration manager...": "Pripájanie k integračnému serveru…", + "Cannot connect to integration manager": "Nie je možné sa pripojiť k integračnému serveru", + "The integration manager is offline or it cannot reach your homeserver.": "Integračný server je offline, alebo nemôže pristupovať k domovskému serveru.", + "not stored": "neuložené", + "Backup has a valid signature from this user": "Záloha je podpísaná platným kľúčom od tohoto používateľa", + "Backup has a invalid signature from this user": "Záloha je podpísaná neplatným kľúčom od tohoto používateľa", + "Backup has a signature from unknown user with ID %(deviceId)s": "Podpis zálohy pochádza od neznámeho používateľa ID %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "Podpis zálohy pochádza z neznámeho zariadenia ID %(deviceId)s", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Záloha kľúčov je uložená na bezpečnom úložisku, ale funkcia podpisovanie naprieč zariadeniami nie je na tomto zariadení aktívna. Ak chcete zmeniť stav zálohy kľúčov, zapnite podpisovanie naprieč zariadeniami v časti experimenty.", + "Backup key stored: ": "Záloha kľúčov uložená: ", + "Start using Key Backup with Secure Secret Storage": "Začnite používať zálohu kľúčov na bezpečnom úložisku", + "Clear notifications": "Vymazať oznámenia", + "Change identity server": "Zmeniť server totožností", + "Disconnect from the identity server and connect to instead?": "Naozaj si želáte odpojiť od servera totožností a pripojiť sa namiesto toho k serveru ?", + "Disconnect identity server": "Odpojiť server totožností", + "Disconnect from the identity server ?": "Naozaj sa chcete odpojiť od servera totožností ?", + "Disconnect": "Odpojiť", + "You should remove your personal data from identity server before disconnecting. Unfortunately, identity server is currently offline or cannot be reached.": "Pred odpojením zo servera totožností by ste mali z neho odstrániť vaše osobné údaje. Žiaľ, server momentálne nie je dostupný a nie je možné sa k nemu pripojiť.", + "You should:": "Mali by ste:", + "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Skontrolovať rozšírenia inštalované vo webovom prehliadači, ktoré by mohli blokovať prístup k serveru totožností (napr. rozšírenie Privacy Badger)", + "contact the administrators of identity server ": "Kontaktovať správcu servera totožností ", + "wait and try again later": "Počkať a skúsiť znovu neskôr", + "Disconnect anyway": "Napriek tomu sa odpojiť", + "You are still sharing your personal data on the identity server .": "na servery máte stále uložené vaše osobné údaje.", + "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Odporúčame, aby ste ešte pred odpojením sa zo servera totožností odstránili vašu emailovú adresu a telefónne číslo.", + "Identity Server (%(server)s)": "Server totožností (%(server)s)", + "You are currently using to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdení kontaktmi ktorých poznáte používate . Zmeniť server totožností môžete nižšie.", + "If you don't want to use to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ak nechcete na vyhľadávanie kontaktov a možnosť byť nájdení používať , zadajte adresu servera totožností nižšie.", + "Identity Server": "Server totožností", + "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Momentálne nepoužívate žiaden server totožností. Ak chcete vyhľadávať kontakty a zároveň umožniť ostatným vašim kontaktom, aby mohli nájsť vás, nastavte si server totožností nižšie.", + "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ak sa odpojíte od servera totožností, vaše kontakty vás nebudú môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy a telefónneho čísla.", + "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Používanie servera totožností je voliteľné. Ak sa rozhodnete, že nebudete používať server totožností, nebudú vás vaši známi môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy alebo telefónneho čísla.", + "Do not use an identity server": "Nepoužívať server totožností", + "Enter a new identity server": "Zadať nový server totožností", + "Use an Integration Manager (%(serverName)s) to manage bots, widgets, and sticker packs.": "Použiť integračný server (%(serverName)s) na správu botov, widgetov a balíčkov s nálepkami.", + "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použiť integračný server na správu botov, widgetov a balíčkov s nálepkami.", + "Manage integrations": "Spravovať integrácie", + "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integračné servery zhromažďujú údaje nastavení, môžu spravovať widgety, odosielať vo vašom mene pozvánky alebo meniť úroveň moci.", + "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlas s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.", + "Discovery": "Objaviť", + "Deactivate account": "Deaktivovať účet", + "Clear cache and reload": "Vymazať vyrovnávaciu pamäť a načítať znovu", + "Customise your experience with experimental labs features. Learn more.": "Prispôsobte si zážitok s používania aktivovaním experimentálnych vlastností. Zistiť viac.", + "Ignored/Blocked": "Ignorovaní / Blokovaní", + "Error adding ignored user/server": "Chyba pri pridávaní ignorovaného používateľa / servera", + "Something went wrong. Please try again or view your console for hints.": "Niečo sa nepodarilo. Prosím, skúste znovu neskôr alebo si prečítajte ďalšie usmernenia zobrazením konzoly.", + "Error subscribing to list": "Chyba pri prihlasovaní sa do zoznamu", + "Please verify the room ID or alias and try again.": "Prosím, overte platnosť ID miestnosti alebo alias a skúste znovu.\nPlease verify the room ID or alias and try again.", + "Error removing ignored user/server": "Chyba pri odstraňovaní ignorovaného používateľa / servera" } From 3dcef53b930833b1e945df7e50054479becafeb9 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 20 Dec 2019 21:13:53 +0000 Subject: [PATCH 105/239] Translated using Weblate (Turkish) Currently translated at 33.8% (677 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/ --- src/i18n/strings/tr.json | 92 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 2462b5789f..da177ae68c 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -589,5 +589,95 @@ "The platform you're on": "Bulunduğun platform", "The version of Riot.im": "Riot.im'in sürümü", "Your language of choice": "Seçtiginiz diliniz", - "Which officially provided instance you are using, if any": "" + "Which officially provided instance you are using, if any": "", + "Add Email Address": "E-posta Adresi Ekle", + "Add Phone Number": "Telefon Numarası Ekle", + "Your identity server's URL": "Kimlik sunucunuzun linki", + "e.g. %(exampleValue)s": "örn.%(exampleValue)s", + "Every page you use in the app": "uygulamadaki kullandığınız tüm sayfalar", + "e.g. ": "örn. ", + "Your User Agent": "Kullanıcı Ajanınız", + "Your device resolution": "Cihazınızın çözünürlüğü", + "Call Failed": "Arama Başarısız", + "Review Devices": "Cihazları Gözden Geçir", + "Call Anyway": "Yinede Ara", + "Answer Anyway": "Yinede Cevapla", + "Call": "Ara", + "Answer": "Cevap", + "Call failed due to misconfigured server": "Hatalı yapılandırılmış sunucu nedeniyle arama başarısız", + "Call in Progress": "Arama Yapılıyor", + "A call is already in progress!": "Zaten bir arama devam etmekte!", + "Permission Required": "İzin Gerekli", + "Replying With Files": "Dosyalarla Cevaplanıyor", + "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s%(monthName)s%(day)s%(fullYear)s", + "Invite new community members": "Yeni topluluk üyelerini davet et", + "Name or Matrix ID": "İsim yada Matrix ID", + "Invite to Community": "Topluluğa Davet", + "Add rooms to the community": "Topluluğa odalar ekle", + "Add to community": "Topluluğa ekle", + "Failed to invite the following users to %(groupId)s:": "%(groupId)s grubuna belirtilen kullanıcıların davet işlemi başarısız oldu:", + "Failed to invite users to community": "Kullanıcıların topluluğa daveti başarısız", + "Identity server has no terms of service": "Kimlik sunucusu hizmet kurallarına sahip değil", + "Only continue if you trust the owner of the server.": "Sadece sunucunun sahibine güveniyorsanız devam edin.", + "Trust": "Güven", + "Unable to load! Check your network connectivity and try again.": "Yüklenemiyor! Ağ bağlantınızı kontrol edin ve yeniden deneyin.", + "Registration Required": "Kayıt Zorunlu", + "You need to register to do this. Would you like to register now?": "Bunu yapabilmek için kayıt olmalısınız. Şimdi kayıt olmak ister misiniz?", + "Restricted": "Sınırlı", + "Email, name or Matrix ID": "E-posta, isim yada Matrix ID", + "Failed to start chat": "Sohbet başlatma başarısız", + "Failed to invite users to the room:": "Kullanıcıların odaya daveti başarısız oldu:", + "Missing roomId.": "roomId eksik.", + "You are not in this room.": "Bu odada değilsin.", + "You do not have permission to do that in this room.": "Bu odada bunu yapma yetkiniz yok.", + "Messages": "Mesajlar", + "Actions": "Eylemler", + "Other": "Diğer", + "Upgrades a room to a new version": "Odayı yeni bir sürüme yükseltir", + "You do not have the required permissions to use this command.": "Bu komutu kullanmak için gerekli izinlere sahip değilsin.", + "Error upgrading room": "Oda güncellenirken hata", + "Changes your avatar in all rooms": "Tüm odalardaki avatarlarını değiştirir", + "This room has no topic.": "Bu odanın başlığı yok.", + "Sets the room name": "Oda adını düzenler", + "Use an identity server": "Bir kimlik sunucusu kullan", + "Define the power level of a user": "Bir kullanıcının güç düzeyini tanımla", + "Opens the Developer Tools dialog": "Geliştirici Araçları kutucuğunu açar", + "%(senderDisplayName)s upgraded this room.": "Odayı güncelleyen %(senderDisplayName)s.", + "%(senderDisplayName)s made the room invite only.": "Odayı sadece davetle yapan %(senderDisplayName)s.", + "%(senderDisplayName)s has prevented guests from joining the room.": "Odaya misafirlerin girişini engelleyen %(senderDisplayName)s.", + "%(senderName)s removed the main address for this room.": "Bu oda için ana adresi silen %(senderName)s.", + "Light theme": "Açık tema", + "Dark theme": "Koyu tema", + "%(displayName)s is typing …": "%(displayName)s yazıyor…", + "%(names)s and %(count)s others are typing …|one": "%(names)s ve bir diğeri yazıyor…", + "%(names)s and %(lastPerson)s are typing …": "%(names)s ve %(lastPerson)s yazıyor…", + "Cannot reach homeserver": "Ana sunucuya erişilemiyor", + "Your Riot is misconfigured": "Rioutunuz hatalı yapılandırılmış", + "Cannot reach identity server": "Kimlik sunucu erişilemiyor", + "No homeserver URL provided": "Ana sunucu adresi belirtilmemiş", + "Unexpected error resolving homeserver configuration": "Ana sunucu yapılandırması çözümlenirken beklenmeyen hata", + "Unexpected error resolving identity server configuration": "Kimlik sunucu yapılandırması çözümlenirken beklenmeyen hata", + "The message you are trying to send is too large.": "Göndermeye çalıştığın mesaj çok büyük.", + "This homeserver has hit its Monthly Active User limit.": "Bu ana sunucu Aylık Aktif Kullanıcı limitine ulaştı.", + "Riot URL": "Riot Linki", + "Room ID": "Oda ID", + "More options": "Daha fazla seçenek", + "Join": "Katıl", + "Yes": "Evet", + "No": "Hayır", + "expand": "genişlet", + "Communities": "Topluluklar", + "Rotate Left": "Sola Döndür", + "Rotate Right": "Sağa Döndür", + "Rotate clockwise": "Saat yönünde döndür", + "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s", + "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s kez katıldı", + "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s katıldı", + "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s kez katıldı", + "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s katıldı", + "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s kullanıcı ayrıldı", + "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ayrıldı", + "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s katıldı ve ayrıldı", + "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s katıldı ve ayrıldı", + "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı" } From 24a1017d6d246e388d23910630edb89f1164248f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 21 Dec 2019 20:26:32 +0000 Subject: [PATCH 106/239] Fix typo in comment --- src/components/views/rooms/RoomList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 2fd4fef5b0..cb88861509 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -591,7 +591,7 @@ module.exports = createReactClass({ if (filter === "") return list; const lcFilter = filter.toLowerCase(); // apply toLowerCase before and after removeHiddenChars because different rules get applied - // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppsercase, e.g 𝚮 -> H + // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppercase, e.g 𝚮 -> H const fuzzyFilter = utils.removeHiddenChars(lcFilter).toLowerCase(); // case insensitive if room name includes filter, // or if starts with `#` and one of room's aliases starts with filter From afcbb218faf8a63fddce5ac19e8f90990e9fca2a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 11:31:30 +0000 Subject: [PATCH 107/239] match padding on CustomRoomTagPanel and fix colour of Communities btn --- res/css/structures/_CustomRoomTagPanel.scss | 3 ++- res/css/structures/_TagPanel.scss | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss index 278c7c3d0c..32ad20132d 100644 --- a/res/css/structures/_CustomRoomTagPanel.scss +++ b/res/css/structures/_CustomRoomTagPanel.scss @@ -32,8 +32,9 @@ limitations under the License. } .mx_CustomRoomTagPanel .mx_AccessibleButton { - margin: 9px auto; + margin: 0 auto; width: 40px; + padding: 10px 0 9px 0; position: relative; } diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index e2eda433ba..dddd2e324c 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -87,16 +87,15 @@ limitations under the License. height: 40px; width: 40px; border-radius: 20px; - background-color: $tagpanel-button-color; - opacity: 0.11; + background-color: $roomheader-addroom-bg-color; position: relative; /* overwrite mx_RoleButton inline-block */ display: block !important; &::before { + background-color: $roomheader-addroom-fg-color; mask-image: url('$(res)/img/feather-customised/plus.svg'); mask-position: center; - background-color: $button-primary-fg-color; mask-repeat: no-repeat; content: ''; position: absolute; From 84eb72b0e065148395cad871745f138405931025 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 11:38:52 +0000 Subject: [PATCH 108/239] fix alignment --- res/css/structures/_CustomRoomTagPanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss index 32ad20132d..1fb18ec41e 100644 --- a/res/css/structures/_CustomRoomTagPanel.scss +++ b/res/css/structures/_CustomRoomTagPanel.scss @@ -52,5 +52,5 @@ limitations under the License. position: absolute; left: -15px; border-radius: 0 3px 3px 0; - top: -8px; // (56 - 40)/2 + top: 2px; // 10 [padding-top] - (56 - 40)/2 } From 17f58499857d71dd1ac854292643111013b02467 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 12:24:49 +0000 Subject: [PATCH 109/239] stop using ReactDOM.findDOMNode in componentWillUnmount, use refs --- src/components/structures/RoomView.js | 5 ++--- src/components/views/avatars/BaseAvatar.js | 21 ++++++++++++++----- .../views/rooms/ReadReceiptMarker.js | 12 +++++++---- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 739519a2b3..29ffc24009 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -25,7 +25,6 @@ import shouldHideEvent from '../../shouldHideEvent'; import React, {createRef} from 'react'; import createReactClass from 'create-react-class'; -import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import {Room} from "matrix-js-sdk"; @@ -461,7 +460,7 @@ module.exports = createReactClass({ componentDidUpdate: function() { if (this._roomView.current) { - const roomView = ReactDOM.findDOMNode(this._roomView.current); + const roomView = this._roomView.current; if (!roomView.ondrop) { roomView.addEventListener('drop', this.onDrop); roomView.addEventListener('dragover', this.onDragOver); @@ -505,7 +504,7 @@ module.exports = createReactClass({ // is really just for hygiene - we're going to be // deleted anyway, so it doesn't matter if the event listeners // don't get cleaned up. - const roomView = ReactDOM.findDOMNode(this._roomView.current); + const roomView = this._roomView.current; roomView.removeEventListener('drop', this.onDrop); roomView.removeEventListener('dragover', this.onDragOver); roomView.removeEventListener('dragleave', this.onDragLeaveOrEnd); diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js index 82db78615e..d7e30bc6f1 100644 --- a/src/components/views/avatars/BaseAvatar.js +++ b/src/components/views/avatars/BaseAvatar.js @@ -38,6 +38,12 @@ module.exports = createReactClass({ // XXX resizeMethod not actually used. resizeMethod: PropTypes.string, defaultToInitialLetter: PropTypes.bool, // true to add default url + inputRef: PropTypes.oneOfType([ + // Either a function + PropTypes.func, + // Or the instance of a DOM native element + PropTypes.shape({ current: PropTypes.instanceOf(Element) }), + ]), }, contextTypes: { @@ -148,7 +154,7 @@ module.exports = createReactClass({ const { name, idName, title, url, urls, width, height, resizeMethod, - defaultToInitialLetter, onClick, + defaultToInitialLetter, onClick, inputRef, ...otherProps } = this.props; @@ -171,7 +177,7 @@ module.exports = createReactClass({ if (onClick != null) { return ( { textNode } { imgNode } @@ -179,7 +185,7 @@ module.exports = createReactClass({ ); } else { return ( - + { textNode } { imgNode } @@ -188,21 +194,26 @@ module.exports = createReactClass({ } if (onClick != null) { return ( - ); } else { return ( - ); } diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js index 27c5e8c20e..8f28d96f9d 100644 --- a/src/components/views/rooms/ReadReceiptMarker.js +++ b/src/components/views/rooms/ReadReceiptMarker.js @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from 'react'; -import ReactDOM from 'react-dom'; +import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; @@ -90,6 +89,10 @@ module.exports = createReactClass({ }; }, + UNSAFE_componentWillMount: function() { + this._avatar = createRef(); + }, + componentWillUnmount: function() { // before we remove the rr, store its location in the map, so that if // it reappears, it can be animated from the right place. @@ -105,7 +108,7 @@ module.exports = createReactClass({ return; } - const avatarNode = ReactDOM.findDOMNode(this); + const avatarNode = this._avatar.current; rrInfo.top = avatarNode.offsetTop; rrInfo.left = avatarNode.offsetLeft; rrInfo.parent = avatarNode.offsetParent; @@ -125,7 +128,7 @@ module.exports = createReactClass({ oldTop = oldInfo.top + oldInfo.parent.getBoundingClientRect().top; } - const newElement = ReactDOM.findDOMNode(this); + const newElement = this._avatar.current; let startTopOffset; if (!newElement.offsetParent) { // this seems to happen sometimes for reasons I don't understand @@ -215,6 +218,7 @@ module.exports = createReactClass({ style={style} title={title} onClick={this.props.onClick} + inputRef={this._avatar} /> ); From 207045e979ed9916f68c0021b37a544aa93ffa1c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 12:54:31 +0000 Subject: [PATCH 110/239] fix ReadReceiptMarker ref --- src/components/views/rooms/ReadReceiptMarker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js index 8f28d96f9d..35d745ae5a 100644 --- a/src/components/views/rooms/ReadReceiptMarker.js +++ b/src/components/views/rooms/ReadReceiptMarker.js @@ -178,7 +178,7 @@ module.exports = createReactClass({ render: function() { const MemberAvatar = sdk.getComponent('avatars.MemberAvatar'); if (this.state.suppressDisplay) { - return
    ; + return
    ; } const style = { From 8018097e56be3c2d428a53eace899584c4a7e3a5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 14:13:56 +0000 Subject: [PATCH 111/239] Add alt="" to presentational images --- src/components/views/globals/MatrixToolbar.js | 2 +- src/components/views/globals/NewVersionBar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js index aabf0810f8..1e496741ad 100644 --- a/src/components/views/globals/MatrixToolbar.js +++ b/src/components/views/globals/MatrixToolbar.js @@ -34,7 +34,7 @@ module.exports = createReactClass({ render: function() { return (
    - +
    { _t('You are not receiving desktop notifications') } { _t('Enable them now') }
    diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js index abb9334242..f6bd029969 100644 --- a/src/components/views/globals/NewVersionBar.js +++ b/src/components/views/globals/NewVersionBar.js @@ -97,7 +97,7 @@ export default createReactClass({ } return (
    - +
    {_t("A new version of Riot is available.")}
    From e47ac5fbb530f87c39e3084e9f2fe3b030c04bee Mon Sep 17 00:00:00 2001 From: Samu Voutilainen Date: Sun, 22 Dec 2019 10:19:38 +0000 Subject: [PATCH 112/239] Translated using Weblate (Finnish) Currently translated at 97.0% (1940 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/ --- src/i18n/strings/fi.json | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 381eff2e8e..bb63641848 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -1926,5 +1926,37 @@ "Customise your experience with experimental labs features. Learn more.": "Muokkaa kokemustasi kokeellisilla laboratio-ominaisuuksia. Tutki vaihtoehtoja.", "Error upgrading room": "Virhe päivitettäessä huonetta", "Double check that your server supports the room version chosen and try again.": "Tarkista, että palvelimesi tukee valittua huoneversiota ja yritä uudelleen.", - "Invite joined members to the new room automatically": "Kutsu huoneen jäsenet liittymään uuteen huoneeseen automaattisesti" + "Invite joined members to the new room automatically": "Kutsu huoneen jäsenet liittymään uuteen huoneeseen automaattisesti", + "Send cross-signing keys to homeserver": "Lähetä ristivarmennuksen tarvitsemat avaimet kotipalvelimelle", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s poisti porttikiellon käyttäjiltä, jotka täsmäsivät sääntöön %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s poisti huoneita estävän säännön %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s poisti palvelimia estävän säännön %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s poisti estosäännön %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s muokkasi epäkelpoa estosääntöä", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s muokkasi käyttäjiä estävää sääntöä %(glob)s seuraavasta syystä: %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s muokkasi huoneita estävää sääntöä %(glob)s seuraavasta syystä: %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s muokkasi palvelimia estävää sääntöä %(glob)s seuraavasta syystä: %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s muokkasi estosääntöä %(glob)s seuraavasta syystä: %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s loi porttikiellonsäännön %(glob)s, syy: %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s loi huoneita estävän säännön %(glob)s, syy: %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s loi palvelimia estävän säännön %(glob)s, syy: %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s loi estosäännön %(glob)s, syy: %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti käyttäjiä säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti huoneita säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti palvelimia säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti estosääntöä muodosta %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s", + "The message you are trying to send is too large.": "Lähettämäsi viesti on liian suuri.", + "Cross-signing and secret storage are enabled.": "Ristivarmennus ja salavarasto on käytössä.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Tunnuksellasi on ristivarmennusidentiteetti salavarastossa, mutta tämä laite ei luota siihen.", + "Cross-signing and secret storage are not yet set up.": "Ristivarmennusta ja salavarastoa ei ole vielä otettu käyttöön.", + "Bootstrap cross-signing and secret storage": "Ota käyttöön ristivarmennus ja salavarasto", + "Cross-signing public keys:": "Ristivarmennuksen julkiset avaimet:", + "on device": "laitteella", + "not found": "ei löydetty", + "Cross-signing private keys:": "Ristivarmennuksen salaiset avaimet:", + "in secret storage": "salavarastossa", + "Secret storage public key:": "Salavaraston julkinen avain:", + "in account data": "tunnuksen tiedoissa", + "not stored": "ei tallennettu", + "Cross-signing": "Ristivarmennus" } From 4d61e0bbe7d1f1abb441a3d871c3f78e2c3a357b Mon Sep 17 00:00:00 2001 From: random Date: Mon, 23 Dec 2019 09:45:06 +0000 Subject: [PATCH 113/239] Translated using Weblate (Italian) Currently translated at 99.9% (1999 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index b18b6c9272..5d0c769e6e 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -271,9 +271,9 @@ "Blacklisted": "In lista nera", "device id: ": "ID dispositivo: ", "Disinvite": "Revoca invito", - "Kick": "Caccia fuori", + "Kick": "Butta fuori", "Disinvite this user?": "Revocare l'invito a questo utente?", - "Kick this user?": "Cacciare questo utente?", + "Kick this user?": "Buttare fuori questo utente?", "Failed to kick": "Espulsione fallita", "Unban": "Togli ban", "Ban": "Bandisci", @@ -2013,5 +2013,8 @@ "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Non hai verificato alcuni utenti in questa stanza criptata o essi non hanno verificato i loro dispositivi.", "All users in this encrypted room are verified by you and they have verified their own devices.": "Hai verificato tutti gli utenti in questa stanza criptata ed essi hanno verificato i loro dispositivi.", "Language Dropdown": "Lingua a tendina", - "Country Dropdown": "Nazione a tendina" + "Country Dropdown": "Nazione a tendina", + "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli del tuo backup chiavi. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del tuo backup chiavi", + "Migrate from Key Backup": "Migra dal backup chiavi" } From 131ecfe912736c82ae7ab52710aff1841faf8905 Mon Sep 17 00:00:00 2001 From: catborise Date: Sun, 22 Dec 2019 08:25:01 +0000 Subject: [PATCH 114/239] Translated using Weblate (Turkish) Currently translated at 36.8% (736 of 2000 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/ --- src/i18n/strings/tr.json | 61 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index da177ae68c..647ca2f6a5 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -679,5 +679,64 @@ "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ayrıldı", "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s katıldı ve ayrıldı", "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s katıldı ve ayrıldı", - "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı" + "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı", + "were invited %(count)s times|other": "%(count)s kez davet edildi", + "were invited %(count)s times|one": "davet edildi", + "was invited %(count)s times|other": "%(count)s kez davet edildi", + "was invited %(count)s times|one": "davet edildi", + "were kicked %(count)s times|other": "%(count)s kez atıldı", + "were kicked %(count)s times|one": "atıldı", + "was kicked %(count)s times|other": "%(count)s kez atıldı", + "was kicked %(count)s times|one": "atıldı", + "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s isimlerini değiştrtiler", + "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ismini değiştirdi", + "Power level": "Güç düzeyi", + "e.g. my-room": "örn. odam", + "Some characters not allowed": "Bazı karakterlere izin verilmiyor", + "Matrix ID": "Matrix ID", + "Matrix Room ID": "Matrix Oda ID", + "email address": "e-posta adresi", + "That doesn't look like a valid email address": "Geçerli bir e-posta adresi gibi gözükmüyor", + "You have entered an invalid address.": "Geçersiz bir adres girdiniz.", + "Invite anyway and never warn me again": "Yinede davet et ve asla beni uyarma", + "Invite anyway": "Yinede davet et", + "Close dialog": "Kutucuğu kapat", + "Preparing to send logs": "Loglar gönderilmek için hazırlanıyor", + "Logs sent": "Loglar gönderiliyor", + "Thank you!": "Teşekkürler!", + "Failed to send logs: ": "Loglarıb gönderilmesi başarısız: ", + "GitHub issue": "GitHub sorunu", + "Notes": "Notlar", + "Removing…": "Siliniyor…", + "Clear all data on this device?": "Bu cihazdaki bütün verileri sil?", + "Clear all data": "Bütün verileri sil", + "Community IDs cannot be empty.": "Topluluk ID leri boş bırakılamaz.", + "Something went wrong whilst creating your community": "Topluluğunuz oluşturulurken bir şeyler yanlış gitti", + "Create Community": "Topluluk Oluştur", + "Community Name": "Topluluk Adı", + "Example": "Örnek", + "Community ID": "Topluluk ID", + "example": "örnek", + "Create": "Oluştur", + "Please enter a name for the room": "Lütfen oda için bir ad girin", + "This room is private, and can only be joined by invitation.": "Bu oda özel, sadece davet ile katılınabilir.", + "Create a private room": "Özel bir oda oluştur", + "Hide advanced": "Gelişmiş gizle", + "Show advanced": "Gelişmiş göster", + "Incompatible Database": "Uyumsuz Veritabanı", + "To continue, please enter your password:": "Devam etmek için lütfen şifrenizi giriniz:", + "Begin Verifying": "Doğrulamaya Başla", + "Use two-way text verification": "İki yönlü metin doğrulama kullan", + "Back": "Geri", + "You must specify an event type!": "Bir olay tipi seçmek zorundasınız!", + "Event sent!": "Olay gönderildi!", + "Event Type": "Olay Tipi", + "State Key": "Durum Anahtarı", + "Event Content": "Olay İçeriği", + "Send Account Data": "Hesap Verisi Gönder", + "Filter results": "Sonuçları filtrele", + "View Servers in Room": "Odadaki Sunucuları Gör", + "Toolbox": "Araç Kutusu", + "Developer Tools": "Geliştirici Araçları", + "Integrations are disabled": "Bütünleştirmeler kapatılmış" } From e55219570144af0b6244138d2ba6553b88fc2837 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 17:57:53 +0000 Subject: [PATCH 115/239] Fix duplicate Incoming Call prompt on Community Invite sublist --- src/components/views/rooms/RoomList.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index cb88861509..35a5ca9e66 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -636,7 +636,6 @@ module.exports = createReactClass({ const defaultProps = { collapsed: this.props.collapsed, isFiltered: !!this.props.searchFilter, - incomingCall: this.state.incomingCall, }; subListsProps.forEach((p) => { @@ -649,7 +648,7 @@ module.exports = createReactClass({ })); return subListsProps.reduce((components, props, i) => { - props = Object.assign({}, defaultProps, props); + props = {...defaultProps, ...props}; const isLast = i === subListsProps.length - 1; const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0); const {key, label, onHeaderClick, ...otherProps} = props; @@ -660,12 +659,12 @@ module.exports = createReactClass({ onHeaderClick(collapsed); } }; - let startAsHidden = props.startAsHidden || this.collapsedState[chosenKey]; + const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey]; this._layoutSections.push({ id: chosenKey, count: len, }); - let subList = ( Date: Mon, 23 Dec 2019 17:42:06 +0000 Subject: [PATCH 116/239] Translated using Weblate (French) Currently translated at 100.0% (2001 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index fb233b40d9..727d171ca4 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2018,5 +2018,6 @@ "Country Dropdown": "Sélection du pays", "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés", - "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés" + "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés", + "Help": "Aide" } From 0497ef228d7348d8b82a72832e23fdbc1de5119f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 18:20:59 +0000 Subject: [PATCH 117/239] UserInfo hide kick/mute buttons if they make no sense --- src/components/views/right_panel/UserInfo.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 4dd71700ad..316c8d3d0e 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -425,6 +425,9 @@ const useRoomPowerLevels = (cli, room) => { const RoomKickButton = ({member, startUpdating, stopUpdating}) => { const cli = useContext(MatrixClientContext); + // check if user can be kicked/disinvited + if (member.membership !== "invite" && member.membership !== "join") return null; + const onKick = async () => { const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); const {finished} = Modal.createTrackedDialog( @@ -602,6 +605,9 @@ const BanToggleButton = ({member, startUpdating, stopUpdating}) => { const MuteToggleButton = ({member, room, powerLevels, startUpdating, stopUpdating}) => { const cli = useContext(MatrixClientContext); + // Don't show the mute/unmute option if the user is not in the room + if (member.membership !== "join") return null; + const isMuted = _isMuted(member, powerLevels); const onMuteToggle = async () => { const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); From 25d864c39dddc78eed6b8aa09621965e28fa3b73 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 23 Dec 2019 19:29:43 +0000 Subject: [PATCH 118/239] Fix wrong scope binding on openHelp for TopLeftMenu --- src/components/views/context_menus/TopLeftMenu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js index 7a7b124919..08a65e2f21 100644 --- a/src/components/views/context_menus/TopLeftMenu.js +++ b/src/components/views/context_menus/TopLeftMenu.js @@ -128,11 +128,11 @@ export class TopLeftMenu extends React.Component {
    ; } - openHelp() { + openHelp = () => { this.closeMenu(); const RedesignFeedbackDialog = sdk.getComponent("views.dialogs.RedesignFeedbackDialog"); Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog); - } + }; viewHomePage() { dis.dispatch({action: 'view_home_page'}); From 92ea1157bec969006882e87f38f8d9c35a7b5ce1 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 23 Dec 2019 19:26:59 -0700 Subject: [PATCH 119/239] Reintroduce working resizer code for right panel Fixes https://github.com/vector-im/riot-web/issues/11674 This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93 We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel. --- src/components/structures/MainSplit.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/components/structures/MainSplit.js b/src/components/structures/MainSplit.js index bd7bfd8780..772be358cf 100644 --- a/src/components/structures/MainSplit.js +++ b/src/components/structures/MainSplit.js @@ -74,6 +74,21 @@ export default class MainSplit extends React.Component { } } + componentDidUpdate(prevProps) { + const wasPanelSet = this.props.panel && !prevProps.panel; + const wasPanelCleared = !this.props.panel && prevProps.panel; + + if (this.resizeContainer && wasPanelSet) { + // The resizer can only be created when **both** expanded and the panel is + // set. Once both are true, the container ref will mount, which is required + // for the resizer to work. + this._createResizer(); + } else if (this.resizer && wasPanelCleared) { + this.resizer.detach(); + this.resizer = null; + } + } + render() { const bodyView = React.Children.only(this.props.children); const panelView = this.props.panel; From abb5ea2df8565b8ef5bce1cf39a404d428fc32c4 Mon Sep 17 00:00:00 2001 From: "ferhad.necef" Date: Wed, 25 Dec 2019 15:54:20 +0000 Subject: [PATCH 120/239] Translated using Weblate (Azerbaijani) Currently translated at 22.3% (447 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/ --- src/i18n/strings/az.json | 62 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index c53258a28f..e4316496ec 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -70,7 +70,7 @@ "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", "Unable to enable Notifications": "Xəbərdarlıqları daxil qoşmağı bacarmadı", - "Default": "Default", + "Default": "Varsayılan olaraq", "Moderator": "Moderator", "Admin": "Administrator", "Start a chat": "Danışığa başlamaq", @@ -389,5 +389,63 @@ "Verified key": "Təsdiqlənmiş açar", "Sends the given message coloured as a rainbow": "Verilən mesajı göy qurşağı kimi rəngli göndərir", "Sends the given emote coloured as a rainbow": "Göndərilmiş emote rəngini göy qurşağı kimi göndərir", - "Unrecognised command:": "Tanınmayan əmr:" + "Unrecognised command:": "Tanınmayan əmr:", + "Add Email Address": "Emal ünvan əlavə etmək", + "Add Phone Number": "Telefon nömrəsi əlavə etmək", + "e.g. %(exampleValue)s": "e.g. %(exampleValue)s", + "Call failed due to misconfigured server": "Düzgün qurulmamış server səbəbindən zəng alınmadı", + "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Xahiş edirik, baş serverin administratoruna müraciət edin (%(homeserverDomain)s) ki zənglərin etibarlı işləməsi üçün dönüş serverini konfiqurasiya etsin.", + "Alternatively, you can try to use the public server at turn.matrix.org, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativ olaraq, ümumi serveri turn.matrix.org istifadə etməyə cəhd edə bilərsiniz, lakin bu qədər etibarlı olmayacaq və IP ünvanınızı bu serverlə bölüşəcəkdir. Bunu Ayarlarda da idarə edə bilərsiniz.", + "Try using turn.matrix.org": "Turn.matrix.org istifadə edin", + "The file '%(fileName)s' failed to upload.": "'%(fileName)s' faylı yüklənə bilmədi.", + "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' faylı yükləmə üçün bu server ölçü həddini aşmışdır", + "Send cross-signing keys to homeserver": "Ev serveri üçün çarpaz imzalı açarları göndərin", + "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s", + "Add rooms to the community": "Icmaya otaqlar əlavə edin", + "Failed to invite the following users to %(groupId)s:": "Aşağıdakı istifadəçiləri %(groupId)s - ə dəvət etmək alınmadı:", + "Failed to invite users to %(groupId)s": "İstifadəçiləri %(groupId)s - a dəvət etmək alınmadı", + "Failed to add the following rooms to %(groupId)s:": "Aşağıdakı otaqları %(groupId)s - a əlavə etmək alınmadı:", + "Identity server has no terms of service": "Şəxsiyyət serverinin xidmət şərtləri yoxdur", + "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "Bu hərəkət e-poçt ünvanı və ya telefon nömrəsini təsdiqləmək üçün standart şəxsiyyət serverinə girməyi tələb edir, lakin serverdə heç bir xidmət şəraiti yoxdur.", + "Only continue if you trust the owner of the server.": "Yalnız server sahibinə etibar etsəniz davam edin.", + "Trust": "Etibar", + "Custom (%(level)s)": "Xüsusi (%(level)s)", + "Failed to start chat": "Söhbətə başlamaq olmur", + "Failed to invite the following users to the %(roomName)s room:": "Aşağıdakı istifadəçiləri %(roomName)s otağına dəvət etmək alınmadı:", + "Room %(roomId)s not visible": "Otaq %(roomId)s görünmür", + "Messages": "Mesajlar", + "Actions": "Tədbirlər", + "Other": "Digər", + "Sends a message as plain text, without interpreting it as markdown": "Bir mesajı qeyd kimi şərh etmədən, düz mətn şəklində göndərir", + "You do not have the required permissions to use this command.": "Bu komandadan (əmrdən) istifadə etmək üçün tələb olunan icazəniz yoxdur.", + "Error upgrading room": "Otaq yeniləmə xətası", + "Double check that your server supports the room version chosen and try again.": "Serverinizin seçilmiş otaq versiyasını dəstəklədiyini bir daha yoxlayın və yenidən cəhd edin.", + "Changes the avatar of the current room": "Cari otağın avatarını dəyişdirir", + "Use an identity server": "Şəxsiyyət serverindən istifadə edin", + "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "E-poçtla dəvət etmək üçün şəxsiyyət serverindən istifadə edin. Defolt şəxsiyyət serverini (%(defaultIdentityServerName)s) istifadə etməyə və ya Parametrlərdə idarə etməyə davam edin.", + "Use an identity server to invite by email. Manage in Settings.": "E-poçtla dəvət etmək üçün şəxsiyyət serverindən istifadə edin. Parametrlərdə idarə edin.", + "Please supply a https:// or http:// widget URL": "Zəhmət olmasa https:// və ya http:// widget URL təmin edin", + "Device already verified!": "Cihaz artıq təsdiqləndi!", + "WARNING: Device already verified, but keys do NOT MATCH!": "XƏBƏRDARLIQ: Cihaz artıq təsdiqləndi, lakin açarlar uyğun gəlmir!", + "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "XƏBƏRDARLIQ: ƏSAS VERIFİKASİYA VERİLİR! %(userId)s və cihaz %(deviceId)s üçün imza açarı \"%(fprint)s\" ilə təmin olunmayan \"%(fingerprint)s\". Bu, ünsiyyətlərinizin tutulduğunu ifadə edə bilər!", + "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Təqdim etdiyiniz imza açarı %(userId)s cihazının %(deviceId)s cihazından aldığınız imza açarına uyğundur. Cihaz təsdiqlənmiş kimi qeyd edildi.", + "Forces the current outbound group session in an encrypted room to be discarded": "Şifrəli bir otaqda mövcud qrup sessiyasını ləğv etməyə məcbur edir", + "Displays list of commands with usages and descriptions": "İstifadə qaydaları və təsvirləri ilə komanda siyahısını göstərir", + "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konfrans istədi.", + "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s göstərilən adlarını %(displayName)s olaraq dəyişdirdi.", + "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s öz adlarını %(displayName)s olaraq təyin etdilər.", + "%(senderName)s set a profile picture.": "%(senderName)s profil şəkli təyin etdi.", + "%(senderName)s made no change.": "%(senderName)s dəyişiklik etməyib.", + "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s otaq otağını sildi.", + "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s bu otağı təkmilləşdirdi.", + "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s linki olanlara otağı açıq etdi.", + "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s otağı yalnız dəvətlə açıq etdi.", + "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s qoşulma qaydasını %(rule)s olaraq dəyişdirdi", + "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s qonaq otağa qoşulmasına icazə verdi.", + "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s qonaqların otağa daxil olmasının qarşısını aldı.", + "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s %(rule)s-a qonaq girişi dəyişdirildi.", + "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Bu otaqda %(qruplar)s üçün %(senderDisplayName)s aktiv oldu.", + "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Bu otaqda %(groups)s üçün %(senderDisplayName)s aktiv oldu.", + "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", + "Custom Server Options": "Xüsusi Server Seçimləri" } From b4a569dfc7ea8653ab353a62092c2bff0ab65945 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Tue, 24 Dec 2019 06:39:24 +0000 Subject: [PATCH 121/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2001 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 73af96e7fc..e6ce4077e5 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2018,5 +2018,6 @@ "Country Dropdown": "國家下拉式選單", "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同", - "Migrate from Key Backup": "從金鑰備份導入" + "Migrate from Key Backup": "從金鑰備份導入", + "Help": "說明" } From b8dbd32363b97f220f814195fda80cead34510bf Mon Sep 17 00:00:00 2001 From: Samu Voutilainen Date: Wed, 25 Dec 2019 08:11:50 +0000 Subject: [PATCH 122/239] Translated using Weblate (Finnish) Currently translated at 100.0% (2001 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/ --- src/i18n/strings/fi.json | 65 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index bb63641848..8881456d8c 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -1343,7 +1343,7 @@ "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s istunnon purkaminen epäonnistui!", "Restored %(sessionCount)s session keys": "%(sessionCount)s istunnon avainta palautettu", "Enter Recovery Passphrase": "Syötä palautuksen salalause", - "Warning: you should only set up key backup from a trusted computer.": "Varoitus: sinun pitäisi ottaa avainvarmuuskopio käyttöön vain luotetulta tietokoneelta.", + "Warning: you should only set up key backup from a trusted computer.": "Varoitus: sinun pitäisi ottaa avainvarmuuskopio käyttöön vain luotetulla tietokoneella.", "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautuksen salalauseesi.", "If you've forgotten your recovery passphrase you can use your recovery key or set up new recovery options": "Jos olet unohtanut palautuksen salalauseesi, voit käyttää palautusavaintasi tai ottaa käyttöön uuden palautustavan", "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautusavaimesi.", @@ -1958,5 +1958,66 @@ "Secret storage public key:": "Salavaraston julkinen avain:", "in account data": "tunnuksen tiedoissa", "not stored": "ei tallennettu", - "Cross-signing": "Ristivarmennus" + "Cross-signing": "Ristivarmennus", + "Backup has a valid signature from this user": "Varmuuskopiossa on kelvollinen allekirjoitus tältä käyttäjältä", + "Backup has a invalid signature from this user": "Varmuuskopiossa on epäkelpo allekirjoitus tältä käyttäjältä", + "Backup has a signature from unknown user with ID %(deviceId)s": "Varmuuskopiossa on tuntematon allekirjoitus käyttäjältä, jonka ID on %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "Varmuuskopiossa on tuntematon allekirjoitus laitteelta, jonka ID on %(deviceId)s", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Vara-avain on tallennettu salavarastoon, mutta salavarasto ei ole käytössä tällä laitteella. Ota käyttöön ristivarmennus Laboratoriosta, jotta voi muokata avainvarmuuskopion tilaa.", + "Backup key stored: ": "Vara-avain on tallennettu: ", + "Start using Key Backup with Secure Secret Storage": "Aloita avainten varmuuskopiointi turvalliseen salavarastoon", + "This user has not verified all of their devices.": "Tämä käyttäjä ei ole varmentanut kaikkia laitteitaan.", + "You have not verified this user. This user has verified all of their devices.": "Et ole varmentanut tätä käyttäjää. Tämä käyttäjä on varmentanut kaikki laitteensa.", + "You have verified this user. This user has verified all of their devices.": "Olet varmentanut tämän käyttäjän. Tämä käyttäjä on varmentanut kaikki laitteensa.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Et ole varmentanut osaa tämän salausta käyttävän huoneen käyttäjistä tai he eivät ole varmentaneet omia laitteitaan.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Olet varmentanut kaikki käyttäjät tässä salausta käyttävässä huoneessa ja he ovat varmentaneet omat laitteensa.", + "This message cannot be decrypted": "Tätä viestiä ei voida avata luettavaksi", + "Unencrypted": "Suojaamaton", + "Close preview": "Sulje esikatselu", + " wants to chat": " haluaa keskustella", + "Start chatting": "Aloita keskustelu", + "Hide verified sessions": "Piilota varmennetut istunnot", + "%(count)s verified sessions|other": "%(count)s varmennettua istuntoa", + "%(count)s verified sessions|one": "1 varmennettu istunto", + "Reactions": "Reaktiot", + " reacted with %(content)s": " reagoi: %(content)s", + "Language Dropdown": "Kielipudotusvalikko", + "Automatically invite users": "Kutsu käyttäjät automaattisesti", + "Upgrade private room": "Päivitä yksityinen huone", + "Upgrade public room": "Päivitä julkinen huone", + "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Huoneen päivittäminen on monimutkainen toimenpide ja yleensä sitä suositellaan, kun huone on epävakaa bugien, puuttuvien ominaisuuksien tai tietoturvaongelmien takia.", + "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please report a bug.": "Tämä yleensä vaikuttaa siihen, miten huonetta käsitellään palvelimella. Jos sinulla on ongelmia Riottisi kanssa, ilmoita virheestä.", + "You'll upgrade this room from to .": "Olat päivittämässä tätä huonetta versiosta versioon .", + "Upgrade": "Päivitä", + "Enter secret storage passphrase": "Syötä salavaraston salalause", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Salavavaraston avaaminen epäonnistui. Varmista, että syötit oikean salalauseen.", + "Warning: You should only access secret storage from a trusted computer.": "Varoitus: sinun pitäisi käyttää salavarastoa vain luotetulta tietokoneelta.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Käytä turvattua viestihistoriaasi ja ristivarmennuksen identiteettiäsi muiden laitteiden varmentamiseen syöttämällä salalauseesi.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Jos olet unohtanut salalauseesi, voit käyttää palautusavaintasi tai asettaa uusia palautusvaihtoehtoja.", + "Enter secret storage recovery key": "Syötä salavaraston palautusavain", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Salavaraston käyttö epäonnistui. Varmista, että syötit oikean palautusavaimen.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Käytä turvattua viestihistoriaasi ja ristivarmennuksen identiteettiäsi muiden laitteiden varmentamiseen syöttämällä palautusavaimesi.", + "If you've forgotten your recovery key you can .": "Jos olet unohtanut palautusavaimesi, voit .", + "Warning: You should only set up key backup from a trusted computer.": "Varoitus: sinun pitäisi ottaa avainten varmuuskopiointi käyttöön vain luotetulla tietokoneella.", + "If you've forgotten your recovery key you can ": "Jos olet unohtanut palautusavaimesi, voit ", + "Notification settings": "Ilmoitusasetukset", + "Help": "Ohje", + "User Status": "Käyttäjän tila", + "Country Dropdown": "Maapudotusvalikko", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Salavarasto otetaan käyttöön nykyisen avainten varmuuskopiointimenetelmäsi tiedoilla. Salavaraston salalause ja palautusavain tulee olemaan samat kuin ne olivat avainten varmuuskopioinnissasi", + "Warning: You should only set up secret storage from a trusted computer.": "Varoitus: sinun pitäisi ottaa salavarasto käyttöön vain luotetulla tietokoneella.", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Voimme vaihtoehtoisesti tallentaa salavarastoon salatun kopion ristivarmennuksen identiteetistäsi muiden laitteiden varmentamiseen ja lähettääksesi avaimia meidän palvelimelle. Suojaa pääsysi salattuihin viesteihisi pitämällä salalauseesi turvassa.", + "Set up with a recovery key": "Ota käyttöön palautusavaimella", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihin, jos unohdat salalauseesi.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihisi.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Pidä palautusavaimesi jossain hyvin turvallisessa paikassa, kuten salasananhallintasovelluksessa (tai kassakaapissa).", + "Your recovery key has been copied to your clipboard, paste it to:": "Palautusavaimesi on kopioitu leikepöydällesi. Liitä se:", + "Your recovery key is in your Downloads folder.": "Palautusavaimesi on Lataukset-kansiossasi.", + "Your access to encrypted messages is now protected.": "Pääsysi salattuihin viesteihisi on nyt turvattu.", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Ottamatta käyttöön salavarastoa et voi palauttaa pääsyäsi salattuihin viesteihisi tai ristivarmennuksen identiteettiisi, jos kirjaudut ulos tai käytät toista laitetta.", + "Set up secret storage": "Ota salavarasto käyttöön", + "Migrate from Key Backup": "Siirrä tiedot vanhasta avainten varmuuskopiointijärjestelmästä", + "Secure your encrypted messages with a passphrase": "Turvaa salatut viestisi salalauseella", + "Storing secrets...": "Tallennetaan salaisuuksia...", + "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui" } From 5e4f341cd870aa0b38098dba2fb29a0b69168567 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Wed, 25 Dec 2019 19:16:46 +0000 Subject: [PATCH 123/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (2001 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index fd88250707..2f31f75407 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2019,5 +2019,6 @@ "Country Dropdown": "Ország lenyíló menü", "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal", - "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből" + "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből", + "Help": "Segítség" } From a0e816d134f4f80db26b131b02ce9c70b76a3372 Mon Sep 17 00:00:00 2001 From: "ferhad.necef" Date: Wed, 25 Dec 2019 16:02:48 +0000 Subject: [PATCH 124/239] Translated using Weblate (Russian) Currently translated at 90.8% (1816 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index c71e4236b9..fc8b37140e 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1830,5 +1830,7 @@ "My Ban List": "Мой список запрещенных", "Ignored/Blocked": "Игнорируемые/Заблокированные", "Error adding ignored user/server": "Ошибка добавления игнорируемого пользователя/сервера", - "Error subscribing to list": "Ошибка при подписке на список" + "Error subscribing to list": "Ошибка при подписке на список", + "Send cross-signing keys to homeserver": "Отправка ключей перекрестной подписи на домашний сервер", + "Error upgrading room": "Ошибка обновления комнаты" } From 7043453d3ebcd97ccfec519f224f9175326baf5a Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 24 Dec 2019 15:28:22 +0000 Subject: [PATCH 125/239] Translated using Weblate (Turkish) Currently translated at 44.7% (894 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/ --- src/i18n/strings/tr.json | 163 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 647ca2f6a5..85715846ac 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -738,5 +738,166 @@ "View Servers in Room": "Odadaki Sunucuları Gör", "Toolbox": "Araç Kutusu", "Developer Tools": "Geliştirici Araçları", - "Integrations are disabled": "Bütünleştirmeler kapatılmış" + "Integrations are disabled": "Bütünleştirmeler kapatılmış", + "Integrations not allowed": "Bütünleştirmelere izin verilmiyor", + "Loading device info...": "Cihaz bilgileri yükleniyor...", + "Incompatible local cache": "Yerel geçici bellek uyumsuz", + "Clear cache and resync": "Geçici belleği temizle ve yeniden eşle", + "Updating Riot": "Riot güncelleniyor", + "I don't want my encrypted messages": "Şifrelenmiş mesajlarımı istemiyorum", + "Manually export keys": "Elle dışa aktarılmış anahtarlar", + "You'll lose access to your encrypted messages": "Şifrelenmiş mesajlarınıza erişiminizi kaybedeceksiniz", + "Are you sure you want to sign out?": "Oturumdan çıkmak istediğinize emin misiniz?", + "Your homeserver doesn't seem to support this feature.": "Ana sunucunuz bu özelliği desteklemiyor gözüküyor.", + "Message edits": "Mesajları düzenle", + "Report bugs & give feedback": "Hataları raporla & geri bildirim yap", + "Please fill why you're reporting.": "Lütfen neden raporlama yaptığınızı belirtin.", + "Report Content to Your Homeserver Administrator": "Ana Sunucu Yöneticinize İçeriği Raporlayın", + "Send report": "Rapor gönder", + "Room Settings - %(roomName)s": "Oda Ayarları - %(roomName)s", + "Failed to upgrade room": "Oda güncelleme başarısız", + "The room upgrade could not be completed": "Oda güncelleme tamamlanamadı", + "Upgrade this room to version %(version)s": "Bu odayı %(version)s versiyonuna yükselt", + "Upgrade Room Version": "Oda Sürümünü Yükselt", + "Automatically invite users": "Otomatik olarak kullanıcıları davet et", + "Upgrade private room": "Özel oda güncelle", + "Upgrade": "Yükselt", + "Sign out and remove encryption keys?": "Oturumu kapat ve şifreleme anahtarlarını sil?", + "Clear Storage and Sign Out": "Depolamayı temizle ve Oturumu Kapat", + "Send Logs": "Logları Gönder", + "Refresh": "Yenile", + "Checking...": "Kontrol ediliyor...", + "To get started, please pick a username!": "Başlamak için lütfen bir kullanıcı adı seçin!", + "Share Room": "Oda Paylaş", + "Link to most recent message": "En son mesaja bağlantı", + "Share User": "Kullanıcı Paylaş", + "Share Community": "Topluluk Paylaş", + "Share Room Message": "Oda Mesajı Paylaş", + "Link to selected message": "Seçili mesaja bağlantı", + "COPY": "KOPYA", + "Command Help": "Komut Yardımı", + "Missing session data": "Kayıp oturum verisi", + "Integration Manager": "Bütünleştirme Yöneticisi", + "Find others by phone or email": "Kişileri telefon yada e-posta ile bul", + "Be found by phone or email": "Telefon veya e-posta ile bulunun", + "Terms of Service": "Hizmet Şartları", + "Service": "Hizmet", + "Summary": "Özet", + "Document": "Belge", + "Next": "İleri", + "Upload files": "Dosyaları yükle", + "Upload all": "Hepsini yükle", + "Cancel All": "Hepsi İptal", + "Upload Error": "Yükleme Hatası", + "Allow": "İzin ver", + "Enter secret storage recovery key": "Depolama kurtarma anahtarı için şifre gir", + "This looks like a valid recovery key!": "Bu geçerli bir kurtarma anahtarına benziyor!", + "Not a valid recovery key": "Geçersiz bir kurtarma anahtarı", + "Unable to load backup status": "Yedek durumu yüklenemiyor", + "Recovery Key Mismatch": "Kurtarma Anahtarı Kurtarma", + "Unable to restore backup": "Yedek geri dönüşü yapılamıyor", + "No backup found!": "Yedek bulunamadı!", + "Backup Restored": "Yedek Geri Dönüldü", + "Enter Recovery Key": "Kurtarma Anahtarını Gir", + "Warning: You should only set up key backup from a trusted computer.": "Uyarı: Yedek anahtarı kurulumunu sadece güvenli bir bilgisayardan yapmalısınız.", + "Unable to reject invite": "Davet reddedilemedi", + "Pin Message": "Pin Mesajı", + "Share Message": "Mesajı Paylaş", + "Report Content": "İçeriği Raporla", + "Notification settings": "Bildirim ayarları", + "Clear status": "Durumu temizle", + "Update status": "Durumu güncelle", + "Set status": "Durumu ayarla", + "Set a new status...": "Yeni bir durum ayarla...", + "View Community": "Topluluğu Gör", + "Hide": "Gizle", + "Reload": "Yeniden Yükle", + "Remove for everyone": "Herkes için sil", + "Remove for me": "Benim için sil", + "User Status": "Kullanıcı Durumu", + "This homeserver would like to make sure you are not a robot.": "Bu ana sunucu sizin bir robot olup olmadığınızdan emin olmak istiyor.", + "Country Dropdown": "Ülke Listesi", + "Code": "Kod", + "Unable to validate homeserver/identity server": "Ana/kimlik sunucu doğrulanamıyor", + "Your Modular server": "Sizin Modüler sunucunuz", + "Server Name": "Sunucu Adı", + "The email field must not be blank.": "E-posta alanı boş bırakılamaz.", + "The username field must not be blank.": "Kullanıcı adı alanı boş bırakılamaz.", + "The phone number field must not be blank.": "Telefon numarası alanı boş bırakılamaz.", + "The password field must not be blank.": "Şifre alanı boş bırakılamaz.", + "Username": "Kullanıcı Adı", + "Use an email address to recover your account": "Hesabınızı kurtarmak için bir e-posta adresi kullanın", + "Enter email address (required on this homeserver)": "E-posta adresi gir ( bu ana sunucuda gerekli)", + "Doesn't look like a valid email address": "Geçerli bir e-posta adresine benzemiyor", + "Enter password": "Şifre gir", + "Password is allowed, but unsafe": "Şifreye izin var, fakat kullanmak güvenli değil", + "Nice, strong password!": "Güzel, güçlü şifre!", + "Keep going...": "Devam et...", + "Passwords don't match": "Şifreler uyuşmuyor", + "Enter phone number (required on this homeserver)": "Telefon numarası gir ( bu ana sunucuda gerekli)", + "Doesn't look like a valid phone number": "Geçerli bir telefon numarasına benzemiyor", + "Enter username": "Kullanıcı adı gir", + "Email (optional)": "E-posta (opsiyonel)", + "Confirm": "Doğrula", + "Phone (optional)": "Telefon (opsiyonel)", + "Create your Matrix account on %(serverName)s": "%(serverName)s üzerinde Matrix hesabınızı oluşturun", + "Create your Matrix account on ": " üzerinde Matrix hesabınızı oluşturun", + "Homeserver URL": "Ana sunucu URL", + "Identity Server URL": "Kimlik Sunucu URL", + "Other servers": "Diğer sunucular", + "Couldn't load page": "Sayfa yüklenemiyor", + "Add a Room": "Bir Oda Ekle", + "Add a User": "Bir Kullanıcı Ekle", + "Failed to upload image": "Resim yükleme başarısız", + "Unable to accept invite": "Davet kabul edilemiyor", + "Unable to join community": "Topluluğa katılınamıyor", + "Leave Community": "Topluluktan Ayrıl", + "Leave %(groupName)s?": "%(groupName)s den ayrıl?", + "Unable to leave community": "Topluluktan ayrılınamıyor", + "Community Settings": "Topluluk Ayarları", + "Join this community": "Bu topluluğa katıl", + "Leave this community": "Bu topluluktan ayrıl", + "You are an administrator of this community": "Bu topluluğun yöneticisi sizsiniz", + "You are a member of this community": "Bu topluluğun bir üyesisiniz", + "Who can join this community?": "Bu topluluğa kimler katılabilir?", + "Everyone": "Herkes", + "Long Description (HTML)": "Uzun Tanım (HTML)", + "Description": "Tanım", + "Community %(groupId)s not found": "%(groupId)s topluluğu bulunamıyor", + "This homeserver does not support communities": "Bu ana sunucu toplulukları desteklemiyor", + "Failed to load %(groupId)s": "%(groupId)s yükleme başarısız", + "Filter": "Filtre", + "Filter rooms…": "Odaları filtrele…", + "Old cryptography data detected": "Eski kriptolama verisi tespit edildi", + "Verification Request": "Doğrulama Talebi", + "Your Communities": "Topluluklarınız", + "Error whilst fetching joined communities": "Katılım sağlanmış topluluklar getirilirken hata oluştu", + "Create a new community": "Yeni bir topluluk oluştur", + "The homeserver may be unavailable or overloaded.": "Ana sunucunu mevcut değil yada fazla yüklü.", + "Preview": "Önizleme", + "View": "Görüntüle", + "Find a room…": "Bir oda bul…", + "Find a room… (e.g. %(exampleRoom)s)": "Bir oda bul... (örn. %(exampleRoom)s)", + "%(count)s of your messages have not been sent.|one": "Mesajınız gönderilmedi.", + "Jump to first unread room.": "Okunmamış ilk odaya zıpla.", + "Jump to first invite.": "İlk davete zıpla.", + "Add room": "Oda ekle", + "Clear filter": "Filtre temizle", + "Guest": "Misafir", + "Your profile": "Profiliniz", + "Could not load user profile": "Kullanıcı profili yüklenemedi", + "Your Matrix account on %(serverName)s": "%(serverName)s sunucusundaki Matrix hesabınız", + "Your password has been reset.": "Parolanız sıfırlandı.", + "Set a new password": "Yeni bir şifre belirle", + "General failure": "Genel başarısızlık", + "This homeserver does not support login using email address.": "Bu ana sunucu e-posta adresiyle oturum açmayı desteklemiyor.", + "This account has been deactivated.": "Bu hesap pasifleştirilmiş.", + "Create account": "Yeni hesap", + "Unable to query for supported registration methods.": "Desteklenen kayıt yöntemleri için sorgulama yapılamıyor.", + "Continue with previous account": "Önceki hesapla devam et", + "Log in to your new account.": "Yeni hesabınızla Oturum açın.", + "Registration Successful": "Kayıt Başarılı", + "Create your account": "Hesabınızı oluşturun", + "Forgotten your password?": "Parolanızı mı unuttunuz?", + "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın." } From a9cae90a520be50608ef6aee60fce911c66cfbbe Mon Sep 17 00:00:00 2001 From: Pankaj Kumar Singh <34129569+ps0305@users.noreply.github.com> Date: Thu, 26 Dec 2019 23:03:04 +0530 Subject: [PATCH 126/239] Signed-off-by Pankaj Singh Date: Thu, 26 Dec 2019 18:04:58 +0000 Subject: [PATCH 127/239] Fix UserInfo promote user inverted buttons --- src/components/views/right_panel/UserInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 316c8d3d0e..208c5e8906 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -984,7 +984,7 @@ const PowerLevelEditor = ({user, room, roomPermissions, onFinished}) => { }); const [confirmed] = await finished; - if (confirmed) return; + if (!confirmed) return; } await _applyPowerChange(roomId, target, powerLevel, powerLevelEvent); } finally { From c1c0c36008fa21f0729feead80d9f0bc948ccd8a Mon Sep 17 00:00:00 2001 From: "ferhad.necef" Date: Wed, 25 Dec 2019 22:18:37 +0000 Subject: [PATCH 128/239] Translated using Weblate (Azerbaijani) Currently translated at 22.4% (448 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/ --- src/i18n/strings/az.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index e4316496ec..538403f164 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -350,7 +350,7 @@ "Failed to invite users to community": "İstifadəçiləri cəmiyyətə dəvət etmək alınmadı", "Unnamed Room": "Adı açıqlanmayan otaq", "Unable to load! Check your network connectivity and try again.": "Yükləmək olmur! Şəbəkə bağlantınızı yoxlayın və yenidən cəhd edin.", - "Dismiss": "Rədd et", + "Dismiss": "Nəzərə almayın", "Riot does not have permission to send you notifications - please check your browser settings": "Riot-un sizə bildiriş göndərmək icazəsi yoxdur - brauzerinizin parametrlərini yoxlayın", "Riot was not given permission to send notifications - please try again": "Riot bildiriş göndərmək üçün icazə verilmədi - lütfən yenidən cəhd edin", "This email address was not found": "Bu e-poçt ünvanı tapılmadı", @@ -447,5 +447,6 @@ "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Bu otaqda %(qruplar)s üçün %(senderDisplayName)s aktiv oldu.", "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Bu otaqda %(groups)s üçün %(senderDisplayName)s aktiv oldu.", "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir", - "Custom Server Options": "Xüsusi Server Seçimləri" + "Custom Server Options": "Fərdi Server Seçimləri", + "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Bu otaqda %(newGroups)s üçün aktiv və %(oldGroups)s üçün %(senderDisplayName)s deaktiv oldu." } From 22fe0add3c01215f2525e36f567196b6f3d0e8b2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 18:10:52 +0000 Subject: [PATCH 129/239] Make UserOnlineDot more generic --- res/css/_components.scss | 1 + res/css/views/rooms/_RoomTile.scss | 8 ------- res/css/views/rooms/_UserOnlineDot.scss | 23 +++++++++++++++++++ src/components/views/rooms/RoomTile.js | 4 ++-- ...{RoomTileOnlineDot.js => UserOnlineDot.js} | 8 +++---- 5 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 res/css/views/rooms/_UserOnlineDot.scss rename src/components/views/rooms/{RoomTileOnlineDot.js => UserOnlineDot.js} (89%) diff --git a/res/css/_components.scss b/res/css/_components.scss index 233c781d7f..03c2663af8 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -174,6 +174,7 @@ @import "./views/rooms/_SendMessageComposer.scss"; @import "./views/rooms/_Stickers.scss"; @import "./views/rooms/_TopUnreadMessagesBar.scss"; +@import "./views/rooms/_UserOnlineDot.scss"; @import "./views/rooms/_WhoIsTypingTile.scss"; @import "./views/settings/_AvatarSetting.scss"; @import "./views/settings/_CrossSigningPanel.scss"; diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 2b181f366e..e5c7948216 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -62,14 +62,6 @@ limitations under the License. min-width: 0; } -.mx_RoomTile_online_dot { - border-radius: 50%; - background-color: $accent-color; - height: 5px; - width: 5px; - display: inline-block; -} - .mx_RoomTile_subtext { display: inline-block; font-size: 11px; diff --git a/res/css/views/rooms/_UserOnlineDot.scss b/res/css/views/rooms/_UserOnlineDot.scss new file mode 100644 index 0000000000..339e5cc48a --- /dev/null +++ b/res/css/views/rooms/_UserOnlineDot.scss @@ -0,0 +1,23 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_UserOnlineDot { + border-radius: 50%; + background-color: $accent-color; + height: 5px; + width: 5px; + display: inline-block; +} diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index cd5af61862..3f45b5b342 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -380,8 +380,8 @@ module.exports = createReactClass({ />; if (this.props.room.getMember(dmUserId).membership === "join") { - const RoomTileOnlineDot = sdk.getComponent('rooms.RoomTileOnlineDot'); - dmOnline = ; + const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot'); + dmOnline = ; } } diff --git a/src/components/views/rooms/RoomTileOnlineDot.js b/src/components/views/rooms/UserOnlineDot.js similarity index 89% rename from src/components/views/rooms/RoomTileOnlineDot.js rename to src/components/views/rooms/UserOnlineDot.js index a882aec613..426dd1bf64 100644 --- a/src/components/views/rooms/RoomTileOnlineDot.js +++ b/src/components/views/rooms/UserOnlineDot.js @@ -20,7 +20,7 @@ import PropTypes from "prop-types"; import {useEventEmitter} from "../../../hooks/useEventEmitter"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; -const RoomTileOnlineDot = ({userId}) => { +const UserOnlineDot = ({userId}) => { const cli = useContext(MatrixClientContext); const user = useMemo(() => cli.getUser(userId), [cli, userId]); @@ -38,11 +38,11 @@ const RoomTileOnlineDot = ({userId}) => { useEventEmitter(user, "User.currentlyActive", currentlyActiveHandler); useEventEmitter(user, "User.presence", currentlyActiveHandler); - return isOnline ? : null; + return isOnline ? : null; }; -RoomTileOnlineDot.propTypes = { +UserOnlineDot.propTypes = { userId: PropTypes.string.isRequired, }; -export default RoomTileOnlineDot; +export default UserOnlineDot; From e95b67e101399c6d6b5b74e11f396e8489e6799a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 18:15:08 +0000 Subject: [PATCH 130/239] Only show it if exactly 2 members, until we get Canonical DMs --- src/components/views/rooms/RoomTile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 3f45b5b342..ecf2de394b 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -379,7 +379,8 @@ module.exports = createReactClass({ alt="dm" />; - if (this.props.room.getMember(dmUserId).membership === "join") { + const { room } = this.props; + if (room.getMember(dmUserId).membership === "join" && room.getJoinedMemberCount() === 2) { const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot'); dmOnline = ; } From ebf7eb698dd548766ec8dfb3f76438dbb13b1f64 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 18:52:57 +0000 Subject: [PATCH 131/239] Turn RoomAliasField into properly controlled and use in RoomSettings --- .../views/dialogs/CreateRoomDialog.js | 2 +- .../views/elements/RoomAliasField.js | 5 +++- .../views/room_settings/AliasSettings.js | 28 +++++++++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js index 6a73d22708..5ddebb1119 100644 --- a/src/components/views/dialogs/CreateRoomDialog.js +++ b/src/components/views/dialogs/CreateRoomDialog.js @@ -173,7 +173,7 @@ export default createReactClass({ const domain = MatrixClientPeg.get().getDomain(); aliasField = (
    - this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} /> + this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} value={this.state.alias} />
    ); } else { diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js index 03f4000e59..7054dfcce2 100644 --- a/src/components/views/elements/RoomAliasField.js +++ b/src/components/views/elements/RoomAliasField.js @@ -20,11 +20,13 @@ import sdk from '../../../index'; import withValidation from './Validation'; import MatrixClientPeg from '../../../MatrixClientPeg'; +// Controlled form component wrapping Field for inputting a room alias scoped to a given domain export default class RoomAliasField extends React.PureComponent { static propTypes = { id: PropTypes.string.isRequired, domain: PropTypes.string.isRequired, onChange: PropTypes.func, + value: PropTypes.string.isRequired, }; constructor(props) { @@ -53,6 +55,7 @@ export default class RoomAliasField extends React.PureComponent { onValidate={this._onValidate} placeholder={_t("e.g. my-room")} onChange={this._onChange} + value={this.props.value.substring(1, this.props.value.length - this.props.domain.length - 1)} maxLength={maxlength} /> ); } @@ -61,7 +64,7 @@ export default class RoomAliasField extends React.PureComponent { if (this.props.onChange) { this.props.onChange(this._asFullAlias(ev.target.value)); } - } + }; _onValidate = async (fieldState) => { const result = await this._validationRules(fieldState); diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js index daf5c6edc2..946bf0d791 100644 --- a/src/components/views/room_settings/AliasSettings.js +++ b/src/components/views/room_settings/AliasSettings.js @@ -15,6 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +import EditableItemList from "../elements/EditableItemList"; + const React = require('react'); import PropTypes from 'prop-types'; const MatrixClientPeg = require('../../../MatrixClientPeg'); @@ -22,8 +24,29 @@ const sdk = require("../../../index"); import { _t } from '../../../languageHandler'; import Field from "../elements/Field"; import ErrorDialog from "../dialogs/ErrorDialog"; +import AccessibleButton from "../elements/AccessibleButton"; const Modal = require("../../../Modal"); +class EditableAliasesList extends EditableItemList { + _renderNewItemField() { + const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField'); + const onChange = (alias) => this._onNewItemChanged({target: {value: alias}}); + return ( + + + + {_t("Add")} + + + ); + } +} + export default class AliasSettings extends React.Component { static propTypes = { roomId: PropTypes.string.isRequired, @@ -47,7 +70,6 @@ export default class AliasSettings extends React.Component { remoteDomains: [], // [ domain.com, foobar.com ] canonicalAlias: null, // #canonical:domain.com updatingCanonicalAlias: false, - newItem: "", }; const localDomain = MatrixClientPeg.get().getDomain(); @@ -181,7 +203,6 @@ export default class AliasSettings extends React.Component { }; render() { - const EditableItemList = sdk.getComponent("elements.EditableItemList"); const localDomain = MatrixClientPeg.get().getDomain(); let found = false; @@ -233,7 +254,7 @@ export default class AliasSettings extends React.Component { return (
    {canonicalAliasSection} - {remoteAliasesSection}
    From e320f64ba1ed9d6f99138885bcbd68fe2f402e85 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 19:27:04 +0000 Subject: [PATCH 132/239] fuzzy-sort MemberList --- src/components/views/rooms/MemberList.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js index 0805c0342c..b874c378d4 100644 --- a/src/components/views/rooms/MemberList.js +++ b/src/components/views/rooms/MemberList.js @@ -32,6 +32,9 @@ const INITIAL_LOAD_NUM_MEMBERS = 30; const INITIAL_LOAD_NUM_INVITED = 5; const SHOW_MORE_INCREMENT = 100; +// Regex applied to member names before applying sort, to fuzzy it a little +const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@]+/g; + module.exports = createReactClass({ displayName: 'MemberList', @@ -336,10 +339,13 @@ module.exports = createReactClass({ } // Fourth by name (alphabetical) - const nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name; - const nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name; + const nameA = (memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name).replace(SORT_REGEX, ""); + const nameB = (memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name).replace(SORT_REGEX, ""); // console.log(`Comparing userA_name=${nameA} against userB_name=${nameB} - returning`); - return nameA.localeCompare(nameB); + return nameA.localeCompare(nameB, { + ignorePunctuation: true, + sensitivity: "base", + }); }, onSearchQueryChanged: function(searchQuery) { From ab122889795b5aa864dda67ac1a9b4d99e4555be Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 19:29:25 +0000 Subject: [PATCH 133/239] Add more punctuation to regex --- src/components/views/rooms/MemberList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js index b874c378d4..bbb1390611 100644 --- a/src/components/views/rooms/MemberList.js +++ b/src/components/views/rooms/MemberList.js @@ -33,7 +33,7 @@ const INITIAL_LOAD_NUM_INVITED = 5; const SHOW_MORE_INCREMENT = 100; // Regex applied to member names before applying sort, to fuzzy it a little -const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@]+/g; +const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@#\\/+_=]+/g; module.exports = createReactClass({ displayName: 'MemberList', From 06230e01e3805cdcb418d4cc452628f4f73a8317 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 19:36:16 +0000 Subject: [PATCH 134/239] Fix End-to-End tests for RoomSettings interactivity --- test/end-to-end-tests/src/usecases/room-settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js index 7655d2d066..5b425f14b7 100644 --- a/test/end-to-end-tests/src/usecases/room-settings.js +++ b/test/end-to-end-tests/src/usecases/room-settings.js @@ -52,7 +52,7 @@ module.exports = async function changeRoomSettings(session, settings) { if (settings.alias) { session.log.step(`sets alias to ${settings.alias}`); const aliasField = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings input[type=text]"); - await session.replaceInputText(aliasField, settings.alias); + await session.replaceInputText(aliasField, settings.alias.substring(1, settings.alias.lastIndexOf(":"))); const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings .mx_AccessibleButton"); await addButton.click(); session.log.done(); From ed24f19a3f24f6c23cb3dd04aae6c1c6a287a9d2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 20:12:50 +0000 Subject: [PATCH 135/239] Fix stick picker chevron offset calculation --- src/components/views/rooms/Stickerpicker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js index 24f256e706..4fabb75ed6 100644 --- a/src/components/views/rooms/Stickerpicker.js +++ b/src/components/views/rooms/Stickerpicker.js @@ -315,8 +315,8 @@ export default class Stickerpicker extends React.Component { // Offset the chevron location, which is relative to the left of the context menu // (10 = offset when context menu would not be displayed off viewport) - // (8 = value required in practice (possibly 10 - 2 where the 2 = context menu borders) - const stickerPickerChevronOffset = Math.max(10, 8 + window.pageXOffset + buttonRect.left - x); + // (2 = context menu borders) + const stickerPickerChevronOffset = Math.max(10, 2 + window.pageXOffset + buttonRect.left - x); const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19; From e9ebfa100fa639444c283222e658f8f64bb06c61 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 26 Dec 2019 20:32:25 +0000 Subject: [PATCH 136/239] Do not show Top Unread Messages Bar and Jump to bottom button if searching --- src/components/structures/RoomView.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 21d5a8f354..939f422a36 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -1931,7 +1931,8 @@ module.exports = createReactClass({ />); let topUnreadMessagesBar = null; - if (this.state.showTopUnreadMessagesBar) { + // Do not show TopUnreadMessagesBar if we have search results showing, it makes no sense + if (this.state.showTopUnreadMessagesBar && !this.state.searchResults) { const TopUnreadMessagesBar = sdk.getComponent('rooms.TopUnreadMessagesBar'); topUnreadMessagesBar = (); } let jumpToBottom; - if (!this.state.atEndOfLiveTimeline) { + // Do not show JumpToBottomButton if we have search results showing, it makes no sense + if (!this.state.atEndOfLiveTimeline && !this.state.searchResults) { const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton'); jumpToBottom = ( Date: Fri, 27 Dec 2019 13:59:57 +0000 Subject: [PATCH 137/239] Serialize file uploads into room to match confirmation dialog order --- src/ContentMessages.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ContentMessages.js b/src/ContentMessages.js index 6908a6a18e..0ce349f348 100644 --- a/src/ContentMessages.js +++ b/src/ContentMessages.js @@ -422,6 +422,9 @@ export default class ContentMessages { const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog"); let uploadAll = false; + // Promise to complete before sending next file into room, used for synchronisation of file-sending + // to match the order the files were specified in + let promBefore = Promise.resolve(); for (let i = 0; i < okFiles.length; ++i) { const file = okFiles[i]; if (!uploadAll) { @@ -440,11 +443,11 @@ export default class ContentMessages { }); if (!shouldContinue) break; } - this._sendContentToRoom(file, roomId, matrixClient); + promBefore = this._sendContentToRoom(file, roomId, matrixClient, promBefore); } } - _sendContentToRoom(file, roomId, matrixClient) { + _sendContentToRoom(file, roomId, matrixClient, promBefore) { const content = { body: file.name || 'Attachment', info: { @@ -517,7 +520,10 @@ export default class ContentMessages { content.file = result.file; content.url = result.url; }); - }).then(function(url) { + }).then((url) => { + // Await previous message being sent into the room + return promBefore; + }).then(function() { return matrixClient.sendMessage(roomId, content); }, function(err) { error = err; From 6f7ddc37139db7ebbd82823c9d1b771623981ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= Date: Fri, 27 Dec 2019 13:17:10 +0000 Subject: [PATCH 138/239] Translated using Weblate (Czech) Currently translated at 98.8% (1976 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/ --- src/i18n/strings/cs.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 4b69e2da82..5aacb27c80 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -1976,5 +1976,23 @@ "Set up secret storage": "Nastavit bezpečné úložiště", "Secure your encrypted messages with a passphrase": "Zabezpečte vaše šifrované zprávy heslem", "Storing secrets...": "Ukládám tajná data...", - "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště" + "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště", + "The message you are trying to send is too large.": "Zpráva kterou se snažíte odeslat je příliš velká.", + "not found": "nenalezeno", + "Backup has a valid signature from this user": "Záloha má platný podpis od tohoto uživatele", + "Backup has a invalid signature from this user": "Záloha má neplatný podpis od tohoto uživatele", + "Backup has a signature from unknown user with ID %(deviceId)s": "Záloha je podepsaná neznámým uživatelem %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "Záloha je podepsaná neznámým zařízením %(deviceId)s", + "This user has not verified all of their devices.": "Uživatel neověřil všechna svá zařízení.", + "You have not verified this user. This user has verified all of their devices.": "Tohoto uživatele jste neověřili. Uživatel má ověřená všechna svá zařízení.", + "You have verified this user. This user has verified all of their devices.": "Tohoto uživatele jste ověřili. Uživatel má ověřená všechna svá zařízení.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Někteřé uživatele v této šifrované místnosti jste neověřili nebo nemají ověřená některá svá zařízení.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Všichni uživatelé v této šifrované místnosti jsou ověření a mají ověřená všechna svá zařízení.", + "Close preview": "Zavřít náhled", + "Hide verified sessions": "Schovat ověřené relace", + "%(count)s verified sessions|other": "%(count)s ověřených relací", + "%(count)s verified sessions|one": "1 ověřená relace", + "Language Dropdown": "Menu jazyků", + "Help": "Pomoc", + "Country Dropdown": "Menu států" } From 145741d16846b5ddca99a0800970209b04dc8139 Mon Sep 17 00:00:00 2001 From: strix aluco Date: Fri, 27 Dec 2019 08:28:07 +0000 Subject: [PATCH 139/239] Translated using Weblate (Ukrainian) Currently translated at 27.1% (542 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/ --- src/i18n/strings/uk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index e2df3fc774..9a522e6ee2 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -405,7 +405,7 @@ "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив/ла %(widgetName)s", "Failure to create room": "Не вдалося створити кімнату", "Server may be unavailable, overloaded, or you hit a bug.": "Сервер може бути недоступний, перевантажений, або ж ви натрапили на ваду.", - "Send anyway": "Все-таки надіслати", + "Send anyway": "Надіслати хоч би там що", "Unnamed Room": "Кімната без назви", "This homeserver has hit its Monthly Active User limit.": "Цей домашній сервер досягнув свого ліміту щомісячних активних користувачів.", "This homeserver has exceeded one of its resource limits.": "Цей домашній сервер досягнув одного зі своїх лімітів ресурсів.", From f9e386adaa289e871a6da26ecaf12fc92fea0473 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 27 Dec 2019 17:04:14 +0000 Subject: [PATCH 140/239] Improve SORT_REGEX --- src/components/views/rooms/MemberList.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js index bbb1390611..de0a6fe478 100644 --- a/src/components/views/rooms/MemberList.js +++ b/src/components/views/rooms/MemberList.js @@ -32,8 +32,9 @@ const INITIAL_LOAD_NUM_MEMBERS = 30; const INITIAL_LOAD_NUM_INVITED = 5; const SHOW_MORE_INCREMENT = 100; -// Regex applied to member names before applying sort, to fuzzy it a little -const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@#\\/+_=]+/g; +// Regex applied to filter our punctuation in member names before applying sort, to fuzzy it a little +// matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ +const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g; module.exports = createReactClass({ displayName: 'MemberList', From aa990462cec34b47349d3ef6ba542aed17470c33 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 27 Dec 2019 17:05:51 +0000 Subject: [PATCH 141/239] delint --- src/components/views/room_settings/AliasSettings.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js index 946bf0d791..aa9d46c9d5 100644 --- a/src/components/views/room_settings/AliasSettings.js +++ b/src/components/views/room_settings/AliasSettings.js @@ -32,15 +32,19 @@ class EditableAliasesList extends EditableItemList { const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField'); const onChange = (alias) => this._onNewItemChanged({target: {value: alias}}); return ( -
    + - {_t("Add")} + { _t("Add") } ); From 957b1efc00885b3f6fd55160e35de16a01b8cae0 Mon Sep 17 00:00:00 2001 From: random Date: Fri, 27 Dec 2019 17:13:48 +0000 Subject: [PATCH 142/239] Translated using Weblate (Italian) Currently translated at 99.9% (2000 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 5d0c769e6e..390729950b 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -2016,5 +2016,6 @@ "Country Dropdown": "Nazione a tendina", "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli del tuo backup chiavi. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del tuo backup chiavi", - "Migrate from Key Backup": "Migra dal backup chiavi" + "Migrate from Key Backup": "Migra dal backup chiavi", + "Help": "Aiuto" } From 98571d706f16d36fd3402e765fd9c1b61c640824 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 27 Dec 2019 11:31:15 -0700 Subject: [PATCH 143/239] Fix NPE when searching for rooms Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751 --- src/components/views/rooms/RoomTile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index ecf2de394b..241713c97d 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -380,7 +380,8 @@ module.exports = createReactClass({ />; const { room } = this.props; - if (room.getMember(dmUserId).membership === "join" && room.getJoinedMemberCount() === 2) { + const member = room.getMember(dmUserId); + if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) { const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot'); dmOnline = ; } From a0cb6ce30287633192a7be5a13b02036a74395f6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 28 Dec 2019 17:51:38 +0000 Subject: [PATCH 144/239] User Info fetch latest RoomMember instead of showing historical data --- src/components/views/right_panel/UserInfo.js | 43 +++++++++++--------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 208c5e8906..69555bf79f 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -1020,6 +1020,8 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { // Load room if we are given a room id and memoize it const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]); + // fetch latest room member if we have a room, so we don't show historical information + const member = useMemo(() => room ? room.getMember(user.userId) : user, [room, user]); // only display the devices list if our client supports E2E const _enableDevices = cli.isCryptoEnabled(); @@ -1051,7 +1053,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { setPendingUpdateCount(pendingUpdateCount - 1); }, [pendingUpdateCount]); - const roomPermissions = useRoomPermissions(cli, room, user); + const roomPermissions = useRoomPermissions(cli, room, member); const onSynapseDeactivate = useCallback(async () => { const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog'); @@ -1084,7 +1086,6 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { }, [cli, user.userId]); const onMemberAvatarClick = useCallback(() => { - const member = user; const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl; if (!avatarUrl) return; @@ -1096,7 +1097,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { }; Modal.createDialog(ImageView, params, "mx_Dialog_lightbox"); - }, [cli, user]); + }, [cli, member]); let synapseDeactivateButton; let spinner; @@ -1113,11 +1114,11 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { } let adminToolsContainer; - if (room && user.roomId) { + if (room && member.roomId) { adminToolsContainer = ( @@ -1147,20 +1148,20 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { spinner = ; } - const displayName = user.name || user.displayname; + const displayName = member.name || member.displayname; let presenceState; let presenceLastActiveAgo; let presenceCurrentlyActive; let statusMessage; - if (user instanceof RoomMember && user.user) { - presenceState = user.user.presence; - presenceLastActiveAgo = user.user.lastActiveAgo; - presenceCurrentlyActive = user.user.currentlyActive; + if (member instanceof RoomMember && member.user) { + presenceState = member.user.presence; + presenceLastActiveAgo = member.user.lastActiveAgo; + presenceCurrentlyActive = member.user.currentlyActive; if (SettingsStore.isFeatureEnabled("feature_custom_status")) { - statusMessage = user.user._unstable_statusMessage; + statusMessage = member.user._unstable_statusMessage; } } @@ -1190,13 +1191,13 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
    + urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
    @@ -1210,10 +1211,14 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { title={_t('Close')} />; } - const memberDetails = ; + const memberDetails = ( + + ); const isRoomEncrypted = useIsEncrypted(cli, room); // undefined means yet to be loaded, null means failed to load, otherwise list of devices @@ -1349,7 +1354,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { devices={devices} canInvite={roomPermissions.canInvite} isIgnored={isIgnored} - member={user} /> + member={member} /> { adminToolsContainer } From 705bfcd20dca6f68ece3d12254818bbaec124871 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 28 Dec 2019 17:54:46 +0000 Subject: [PATCH 145/239] fix RoomViewStore import in UserInfo --- src/components/views/right_panel/UserInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index 69555bf79f..9fd7a1ddff 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -32,7 +32,7 @@ import SdkConfig from '../../../SdkConfig'; import SettingsStore from "../../../settings/SettingsStore"; import {EventTimeline} from "matrix-js-sdk"; import AutoHideScrollbar from "../../structures/AutoHideScrollbar"; -import * as RoomViewStore from "../../../stores/RoomViewStore"; +import RoomViewStore from "../../../stores/RoomViewStore"; import MultiInviter from "../../../utils/MultiInviter"; import GroupStore from "../../../stores/GroupStore"; import MatrixClientPeg from "../../../MatrixClientPeg"; From 4489b5a21aa7550d1bfeee1b4f3960ebc4698cb7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 28 Dec 2019 20:05:55 +0000 Subject: [PATCH 146/239] Escape HTML in og:description and render any html &-encoded entities --- src/components/views/rooms/LinkPreviewWidget.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js index ee63cd1bb7..06c0201af8 100644 --- a/src/components/views/rooms/LinkPreviewWidget.js +++ b/src/components/views/rooms/LinkPreviewWidget.js @@ -128,15 +128,15 @@ module.exports = createReactClass({ } const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + // Escape to prevent any HTML injections, we can't replace & as the description may contain & encoded html entities + const safeDescription = (p["og:description"] || "").replace("<", "<").replace(">", ">"); return (
    { img }
    { p["og:site_name"] ? (" - " + p["og:site_name"]) : null }
    -
    - { p["og:description"] } -
    +
    Date: Sat, 28 Dec 2019 23:52:57 -0600 Subject: [PATCH 147/239] Fix inverted diff line highlighting in dark theme Signed-off-by: Justin Sleep --- res/themes/dark/css/_dark.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index eadde4c672..d1d0e333a0 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -243,3 +243,12 @@ $breadcrumb-placeholder-bg-color: #272c35; } } } + +// Fixes diff color inversion by swapping add / del colors +.hljs-addition { + background: #fdd; +} + +.hljs-deletion { + background: #dfd; +} From 9eed423994b546dc01ecec75d4f8fae0df35d28b Mon Sep 17 00:00:00 2001 From: j Date: Tue, 24 Dec 2019 15:06:50 +0100 Subject: [PATCH 148/239] support channel names with slash in name/alias Signed-off-by: Jan Gerber --- src/components/structures/MatrixChat.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index fad57f5d52..af3f4d2598 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1569,9 +1569,17 @@ export default createReactClass({ action: 'start_post_registration', }); } else if (screen.indexOf('room/') == 0) { - const segments = screen.substring(5).split('/'); - const roomString = segments[0]; - let eventId = segments.splice(1).join("/"); // empty string if no event id given + // Rooms can have the following formats: + // #room_alias:domain or !opaque_id:domain + const room = screen.substring(5); + const domainOffset = room.indexOf(':') + 1; // 0 in case room does not contain a : + let eventOffset = room.length; + // room aliases can contain slashes only look for slash after domain + if (room.substring(domainOffset).indexOf('/') > -1) { + eventOffset = domainOffset + room.substring(domainOffset).indexOf('/'); + } + const roomString = room.substring(0, eventOffset); + let eventId = room.substring(eventOffset + 1); // empty string if no event id given // Previously we pulled the eventID from the segments in such a way // where if there was no eventId then we'd get undefined. However, we From b1c28870878ee0e5fb6f634bf8a4b5ef030b3c12 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 30 Dec 2019 16:08:24 +0000 Subject: [PATCH 149/239] line length --- src/components/views/dialogs/RoomSettingsDialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js index 9ac2b17f23..e01319e3bd 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.js +++ b/src/components/views/dialogs/RoomSettingsDialog.js @@ -55,7 +55,8 @@ export default class RoomSettingsDialog extends React.Component { _getTabs() { const tabs = []; const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state"); - const shouldShowBridgeIcon = featureFlag && BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0; + const shouldShowBridgeIcon = featureFlag && + BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0; tabs.push(new Tab( _td("General"), From fb94be4abdb713bb23b8b22461500b90f682ec92 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 30 Dec 2019 16:11:59 +0000 Subject: [PATCH 150/239] No trailing space --- src/components/views/dialogs/RoomSettingsDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js index e01319e3bd..c31fe1992d 100644 --- a/src/components/views/dialogs/RoomSettingsDialog.js +++ b/src/components/views/dialogs/RoomSettingsDialog.js @@ -55,7 +55,7 @@ export default class RoomSettingsDialog extends React.Component { _getTabs() { const tabs = []; const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state"); - const shouldShowBridgeIcon = featureFlag && + const shouldShowBridgeIcon = featureFlag && BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0; tabs.push(new Tab( From d7a680db71b94c46ebeeba9f93b9acae6c472379 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Sun, 29 Dec 2019 08:54:04 +0000 Subject: [PATCH 151/239] Translated using Weblate (Basque) Currently translated at 100.0% (2001 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index b3e9a731ee..7214c231e0 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -2007,5 +2007,16 @@ "Set up secret storage": "Ezarri biltegi sekretua", "Secure your encrypted messages with a passphrase": "Babestu zure zifratutako mezuak pasa-esaldi batekin", "Storing secrets...": "Sekretuak gordetzen...", - "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri" + "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri", + "The message you are trying to send is too large.": "Bidali nahi duzun mezua handiegia da.", + "This user has not verified all of their devices.": "Erabiltzaileak ez ditu bere gailu guztiak egiaztatu.", + "You have not verified this user. This user has verified all of their devices.": "Ez duzu erabiltzaile hau egiaztatu. Erabiltzaile honek bere gailu guztiak egiaztatu ditu.", + "You have verified this user. This user has verified all of their devices.": "Erabiltzaile hau egiaztatu duzu. Erabiltzaile honek bere gailu guztiak egiaztatu ditu.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Ez dituzu zifratutako gela honetako erabiltzaile batzuk egiaztatu, edo hauek ez dituzte bere gailu guztiak egiaztatu.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Zifratutako gela honetako erabiltzaile guztiak egiaztatu dituzu, eta hauek bere gailu guztiak egiaztatu dituzte.", + "Language Dropdown": "Hizkuntza menua", + "Help": "Laguntza", + "Country Dropdown": "Herrialde menua", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Biltegi sekretua zure oraingo gakoen babes-kopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berdinak izango dira", + "Migrate from Key Backup": "Migratu gakoen babes-kopiatik" } From 44c181576e8aa7c0bc6a17d987ab4dd2dc09efd2 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 27 Dec 2019 19:29:34 +0000 Subject: [PATCH 152/239] Translated using Weblate (Turkish) Currently translated at 47.9% (959 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/ --- src/i18n/strings/tr.json | 68 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 85715846ac..85cfeedd06 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -589,7 +589,7 @@ "The platform you're on": "Bulunduğun platform", "The version of Riot.im": "Riot.im'in sürümü", "Your language of choice": "Seçtiginiz diliniz", - "Which officially provided instance you are using, if any": "", + "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız", "Add Email Address": "E-posta Adresi Ekle", "Add Phone Number": "Telefon Numarası Ekle", "Your identity server's URL": "Kimlik sunucunuzun linki", @@ -899,5 +899,69 @@ "Registration Successful": "Kayıt Başarılı", "Create your account": "Hesabınızı oluşturun", "Forgotten your password?": "Parolanızı mı unuttunuz?", - "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın." + "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın.", + "Whether or not you're logged in (we don't record your username)": "İster oturum açın yasa açmayın (biz kullanıcı adınızı kaydetmiyoruz)", + "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zengin Metin Düzenleyicinin Zengin metin modunu kullanıyor ya da kullanmıyorsunuz", + "Your homeserver's URL": "Ana sunucunuzun URL’i", + "The information being sent to us to help make Riot.im better includes:": "Riot.im i daha iyi yapmamıza yardımcı olacak bize gönderdiğiniz bilgilerin içeriği:", + "Try using turn.matrix.org": "turn.matrix.org i kullanarak dene", + "You do not have permission to start a conference call in this room": "Bu odada bir konferans başlatmak için izniniz yok", + "The file '%(fileName)s' failed to upload.": "%(fileName)s dosyası için yükleme başarısız.", + "The server does not support the room version specified.": "Belirtilen oda sürümünü sunucu desteklemiyor.", + "Who would you like to add to this community?": "Bu topluluğa kimi eklemek isterdiniz?", + "Which rooms would you like to add to this community?": "Hangi odaları bu topluluğa eklemek isterdiniz?", + "Unable to create widget.": "Görsel bileşen oluşturulamıyor.", + "Changes your display nickname in the current room only": "sadece mevcut odada görüntülenen lakabınızı değiştirir", + "Changes the avatar of the current room": "Mevcut odadaki avatarınızı değiştirir", + "Use an identity server to invite by email. Manage in Settings.": "E-posta ile davet etmek için bir kimlik sunucusu kullan. Ayarlardan Yönet.", + "You cannot modify widgets in this room.": "Bu odadaki görsel bileşenleri değiştiremezsiniz.", + "Sends the given message coloured as a rainbow": "Verilen mesajı gökkuşağı renklerinde gönderir", + "Displays list of commands with usages and descriptions": "Komutların listesini kullanımı ve tanımlarıyla gösterir", + "%(senderName)s made no change.": "%(senderName)s değişiklik yapmadı.", + "%(senderName)s changed the pinned messages for the room.": "Oda için sabitlenmiş mesajları %(senderName)s değiştirdi.", + "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından düzenlendi", + "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından eklendi", + "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından silindi", + "%(names)s and %(count)s others are typing …|other": "%(names)s ve diğer %(count)s kişi yazıyor…", + "This homeserver has exceeded one of its resource limits.": "Bu anasunucu kaynak limitlerinden birini aştı.", + "Unable to connect to Homeserver. Retrying...": "Anasunucuya bağlanılamıyor. Yeniden deneniyor...", + "%(items)s and %(count)s others|other": "%(items)s ve diğer %(count)s", + "%(items)s and %(count)s others|one": "%(items)s ve bir diğeri", + "%(name)s (%(userId)s)": "%(name)s (%(userId)s)", + "Unrecognised address": "Tanınmayan adres", + "You do not have permission to invite people to this room.": "Bu odaya kişi davet etme izniniz yok.", + "User %(userId)s is already in the room": "Kullanıcı %(userId)s zaten odada", + "User %(user_id)s does not exist": "Kullanıcı %(user_id)s mevcut değil", + "User %(user_id)s may or may not exist": "Kullanıcı %(user_id)s mevcut olup olmadığı belli değil", + "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Hesabınıza giriş yapamazsınız. Lütfen daha fazla bilgi için ana sunucu yöneticiniz ile bağlantıya geçiniz.", + "You're signed out": "Çıkış yaptınız", + "Clear personal data": "Kişisel veri temizle", + "Command Autocomplete": "Oto tamamlama komutu", + "Community Autocomplete": "Oto tamlama topluluğu", + "DuckDuckGo Results": "DuckDuckGo Sonuçları", + "Emoji Autocomplete": "Emoji Oto Tamamlama", + "Notify the whole room": "Tüm odayı bilgilendir", + "Room Notification": "Oda Bildirimi", + "Set up with a recovery key": "Kurtarma anahtarı ile kur", + "That matches!": "Eşleşti!", + "That doesn't match.": "Eşleşmiyor.", + "Your Recovery Key": "Kurtarma Anahtarınız", + "Download": "İndir", + "Print it and store it somewhere safe": "Yazdır ve güvenli bir yerde sakla", + "Save it on a USB key or backup drive": "Bir USB anahtara kaydet veya sürücüye yedekle", + "Copy it to your personal cloud storage": "Kişisel bulut depolamaya kopyala", + "Your access to encrypted messages is now protected.": "Şifrelenmiş mesajlara erişiminiz şimdi korunuyor.", + "Migrate from Key Backup": "Anahtar Yedeğinden Göç Et", + "Recovery key": "Kurtarma anahtarı", + "Success!": "Başarılı!", + "Retry": "Yeniden Dene", + "Set up with a Recovery Key": "Bir Kurtarma Anahtarı ile Kur", + "Set up Secure Message Recovery": "Güvenli Mesaj Kurtarma Kurulumu", + "Starting backup...": "Yedeklemeye başlanıyor...", + "Create Key Backup": "Anahtar Yedeği Oluştur", + "Unable to create key backup": "Anahtar yedeği oluşturulamıyor", + "Don't ask again": "Yeniden sorma", + "New Recovery Method": "Yeni Kurtarma Yöntemi", + "Go to Settings": "Ayarlara Git", + "Recovery Method Removed": "Kurtarma Yöntemi Silindi" } From 827ddaf7df34a20a0ddf02bb584ae92889e3fb49 Mon Sep 17 00:00:00 2001 From: strix aluco Date: Mon, 30 Dec 2019 08:15:28 +0000 Subject: [PATCH 153/239] Translated using Weblate (Ukrainian) Currently translated at 28.6% (572 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/ --- src/i18n/strings/uk.json | 42 +++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 9a522e6ee2..c6ae464a2b 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -438,8 +438,8 @@ "Incorrect verification code": "Неправильний код перевірки", "Submit": "Надіслати", "Phone": "Телефон", - "Failed to upload profile picture!": "Не вдалося завантажити світлину профілю!", - "Upload new:": "Завантажити нову:", + "Failed to upload profile picture!": "Не вдалося відвантажити світлину профілю!", + "Upload new:": "Відвантажити нову:", "No display name": "Немає імені для показу", "New passwords don't match": "Нові паролі не збігаються", "Passwords can't be empty": "Пароль не може бути пустим", @@ -460,7 +460,7 @@ "Enable Notifications": "Увімкнути сповіщення", "The maximum permitted number of widgets have already been added to this room.": "Максимально дозволену кількість віджетів уже додано до цієї кімнати.", "Drop File Here": "Киньте файл сюди", - "Drop file here to upload": "Киньте файл сюди, щоб вивантажити", + "Drop file here to upload": "Киньте файл сюди, щоб відвантажити", " (unsupported)": " (не підтримується)", "Join as voice or video.": "Приєднатися голосом або відео.", "Ongoing conference call%(supportedText)s.": "Триває дзвінок-конференція%(supportedText)s.", @@ -508,7 +508,7 @@ "Alternatively, you can try to use the public server at turn.matrix.org, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Також ви можете спробувати використати публічний сервер turn.matrix.org, але це буде не настільки надійно, а також цей сервер матиме змогу бачити вашу IP-адресу. Ви можете керувати цим у налаштуваннях.", "Try using turn.matrix.org": "Спробуйте використати turn.matrix.org", "Replying With Files": "Відповісти файлами", - "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете завантажити цей файл без відповіді?", + "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете відвантажити цей файл без відповіді?", "Name or Matrix ID": "Імʼя або Matrix ID", "Identity server has no terms of service": "Сервер ідентифікації не має умов надання послуг", "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "Щоб підтвердити адресу е-пошту або телефон ця дія потребує доступу до типового серверу ідентифікації , але сервер не має жодних умов надання послуг.", @@ -547,5 +547,37 @@ "Forces the current outbound group session in an encrypted room to be discarded": "Примусово відкидає поточний вихідний груповий сеанс у шифрованій кімнаті", "Sends the given message coloured as a rainbow": "Надсилає вказане повідомлення розфарбоване веселкою", "Your Riot is misconfigured": "Ваш Riot налаштовано неправильно", - "Join the discussion": "Приєднатися до обговорення" + "Join the discussion": "Приєднатися до обговорення", + "Upload": "Відвантажити", + "Upload file": "Відвантажити файл", + "Send an encrypted message…": "Надіслати зашифроване повідомлення…", + "Send a message (unencrypted)…": "Надіслати повідомлення (незашифроване)…", + "The conversation continues here.": "Розмова триває тут.", + "This room has been replaced and is no longer active.": "Ця кімната була замінена і не є активною.", + "You do not have permission to post to this room": "У вас нема дозволу дописувати у цю кімнату", + "Sign out": "Вийти", + "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "Щоб уникнути втрати історії ваших листувань, ви маєте експортувати ключі кімнати перед виходом. Вам треба буде повернутися до новішої версії Riot аби зробити це", + "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Раніше ви використовували новішу версію Riot на %(host)s. Для повторного користування цією версією з наскрізним шифруванням вам треба буде вийти та зайти знову. ", + "Incompatible Database": "Несумісна база даних", + "Continue With Encryption Disabled": "Продовжити із вимкненим шифруванням", + "Unknown error": "Невідома помилка", + "Incorrect password": "Неправильний пароль", + "Are you sure you want to sign out?": "Ви впевнені, що хочете вийти?", + "Your homeserver doesn't seem to support this feature.": "Схоже, що ваш домашній сервер не підтримує цю властивість.", + "Sign out and remove encryption keys?": "Вийти та видалити ключі шифрування?", + "Clear Storage and Sign Out": "Очистити сховище та вийти", + "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очищення сховища вашого оглядача може усунути проблему, але воно виведе вас з системи і зробить непрочитною історію ваших зашифрованих листувань.", + "Verification Pending": "Очікується перевірка", + "Upload files (%(current)s of %(total)s)": "Відвантажити файли (%(current)s з %(total)s)", + "Upload files": "Відвантажити файли", + "Upload all": "Відвантажити всі", + "This file is too large to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Файл є надто великим для відвантаження. Допустимий розмір файлів — %(limit)s, але цей файл займає %(sizeOfThisFile)s.", + "These files are too large to upload. The file size limit is %(limit)s.": "Ці файли є надто великими для відвантаження. Допустимий розмір файлів — %(limit)s.", + "Some files are too large to be uploaded. The file size limit is %(limit)s.": "Деякі файли є надто великими для відвантаження. Допустимий розмір файлів — %(limit)s.", + "Upload %(count)s other files|other": "Відвантажити %(count)s інших файли(ів)", + "Upload Error": "Помилка відвантаження", + "Failed to upload image": "Не вдалось відвантажити зображення", + "Upload avatar": "Відвантажити аватар", + "For security, this session has been signed out. Please sign in again.": "З метою безпеки вашу сесію було завершено. Зайдіть, будь ласка, знову.", + "Upload an avatar:": "Відвантажити аватар:" } From 2bfe1e6be3f8db2caad9d26770de5168021d75c7 Mon Sep 17 00:00:00 2001 From: Volodymyr Kostyrko Date: Tue, 31 Dec 2019 11:19:17 +0000 Subject: [PATCH 154/239] Translated using Weblate (Ukrainian) Currently translated at 28.9% (578 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/ --- src/i18n/strings/uk.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index c6ae464a2b..7795060406 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -160,7 +160,7 @@ "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим", "Room not found": "Кімнату не знайдено", "Reject": "Відмовитись", - "Failed to set Direct Message status of room": "Не вдалось встановити статус прямого спілкування в кімнаті", + "Failed to set Direct Message status of room": "Не вдалося встановити статус прямого спілкування в кімнаті", "Monday": "Понеділок", "Remove from Directory": "Прибрати з каталогу", "Enable them now": "Увімкнути їх зараз", @@ -577,7 +577,11 @@ "Upload %(count)s other files|other": "Відвантажити %(count)s інших файли(ів)", "Upload Error": "Помилка відвантаження", "Failed to upload image": "Не вдалось відвантажити зображення", - "Upload avatar": "Відвантажити аватар", + "Upload avatar": "Завантажити аватар", "For security, this session has been signed out. Please sign in again.": "З метою безпеки вашу сесію було завершено. Зайдіть, будь ласка, знову.", - "Upload an avatar:": "Відвантажити аватар:" + "Upload an avatar:": "Завантажити аватар:", + "Send cross-signing keys to homeserver": "Надсилання ключей підпису на домашній сервер", + "Custom (%(level)s)": "Власний (%(level)s)", + "Error upgrading room": "Помилка оновлення кімнати", + "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще." } From fa9fd97a4e5b2a7e94d0185650402e214a649909 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 2 Jan 2020 09:41:50 +0000 Subject: [PATCH 155/239] missing } --- res/css/views/dialogs/_RoomSettingsDialog.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss index b7641a4ad0..4b13684d9f 100644 --- a/res/css/views/dialogs/_RoomSettingsDialog.scss +++ b/res/css/views/dialogs/_RoomSettingsDialog.scss @@ -54,6 +54,7 @@ limitations under the License. mask-repeat: no-repeat; mask-size: 36px; mask-position: center; +} .mx_RoomSettingsDialog_BridgeList { padding: 0; From 31367bac57b3ef6e7f6983cce6386d691b2775b0 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 2 Jan 2020 08:49:30 +0000 Subject: [PATCH 156/239] Translated using Weblate (Bulgarian) Currently translated at 93.5% (1870 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 | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 3115ca140a..d1aa0dc9a8 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1851,5 +1851,38 @@ "Connecting to integration manager...": "Свързане с мениджъра на интеграции...", "Cannot connect to integration manager": "Неуспешна връзка с мениджъра на интеграции", "The integration manager is offline or it cannot reach your homeserver.": "Мениджъра на интеграции е офлайн или не може да се свърже със сървъра ви.", - "Clear notifications": "Изчисти уведомленията" + "Clear notifications": "Изчисти уведомленията", + "Send cross-signing keys to homeserver": "Изпрати ключове за кръстосано-подписване към сървъра", + "Error upgrading room": "Грешка при обновяване на стаята", + "Double check that your server supports the room version chosen and try again.": "Проверете дали сървъра поддържа тази версия на стаята и опитайте пак.", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа на потребители отговарящи на %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа до стаи отговарящи на %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа до сървъри отговарящи на %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа неща отговарящи на %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s обнови невалидно правило за блокиране", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа неща отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до неща отговарящи на %(glob)s поради %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа на потребители отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до стаи отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до сървъри отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до неща отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s", + "The message you are trying to send is too large.": "Съобщението, което се опитвате да изпратите е прекалено голямо.", + "Cross-signing and secret storage are enabled.": "Кръстосано-подписване и секретно складиране са включени.", + "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "За вашия профил има самоличност за кръстосано-подписване в секретно складиране, но все още не е доверена от това устройство.", + "Cross-signing and secret storage are not yet set up.": "Кръстосаното-подписване и секретно складиране все още не са настроени.", + "Bootstrap cross-signing and secret storage": "Инициализирай кръстосано-подписване и секретно складиране", + "Cross-signing public keys:": "Публични ключове за кръстосано-подписване:", + "on device": "на устройството", + "not found": "не са намерени", + "Cross-signing private keys:": "Private ключове за кръстосано подписване:", + "in secret storage": "в секретно складиране", + "Secret storage public key:": "Публичен ключ за секретно складиране:", + "in account data": "в данни за акаунта", + "not stored": "не е складиран" } From ffba19bd613796090bdc899f5cb4b40e96bbeb47 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Jan 2020 16:52:25 +0000 Subject: [PATCH 157/239] Remove E2eIcon onClick It displayed the Encrypted Event Info dialog, but this full of super advanced debug information and base64 strings that no normal users should ever have to see. It's still accessible via the comtext menu (ie. the same place as 'View Source'). --- res/css/views/rooms/_EventTile.scss | 2 +- src/components/views/rooms/EventTile.js | 23 ++++------------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 5359992f84..fbac1e932a 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 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. @@ -353,7 +354,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody { left: 46px; width: 15px; height: 15px; - cursor: pointer; display: block; bottom: 0; right: 0; diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 784c4071aa..e7696de841 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -1,7 +1,7 @@ /* Copyright 2015, 2016 OpenMarket Ltd Copyright 2017 New Vector Ltd -Copyright 2019 The Matrix.org Foundation C.I.C. +Copyright 2019, 2020 The Matrix.org Foundation C.I.C. Copyright 2019 Michael Telatynski <7t3chguy@gmail.com> Licensed under the Apache License, Version 2.0 (the "License"); @@ -443,15 +443,6 @@ module.exports = createReactClass({ }); }, - onCryptoClick: function(e) { - const event = this.props.mxEvent; - - Modal.createTrackedDialogAsync('Encrypted Event Dialog', '', - import('../../../async-components/views/dialogs/EncryptedEventDialog'), - {event}, - ); - }, - onRequestKeysClick: function() { this.setState({ // Indicate in the UI that the keys have been requested (this is expected to @@ -479,11 +470,10 @@ module.exports = createReactClass({ _renderE2EPadlock: function() { const ev = this.props.mxEvent; - const props = {onClick: this.onCryptoClick}; // event could not be decrypted if (ev.getContent().msgtype === 'm.bad.encrypted') { - return ; + return ; } // event is encrypted, display padlock corresponding to whether or not it is verified @@ -491,7 +481,7 @@ module.exports = createReactClass({ if (this.state.verified) { return; // no icon for verified } else { - return (); + return (); } } @@ -508,7 +498,7 @@ module.exports = createReactClass({ return; // we expect this to be unencrypted } // if the event is not encrypted, but it's an e2e room, show the open padlock - return ; + return ; } // no padlock needed @@ -920,7 +910,6 @@ class E2ePadlock extends React.Component { static propTypes = { icon: PropTypes.string.isRequired, title: PropTypes.string.isRequired, - onClick: PropTypes.func, }; constructor() { @@ -931,10 +920,6 @@ class E2ePadlock extends React.Component { }; } - onClick = (e) => { - if (this.props.onClick) this.props.onClick(e); - }; - onHoverStart = () => { this.setState({hover: true}); }; From 39777620a3d299943ed7d8f24fb34ff9263aa231 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Jan 2020 16:58:00 +0000 Subject: [PATCH 158/239] order copyright lines by date --- src/components/views/rooms/EventTile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index e7696de841..d8ca5ef7cd 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -1,8 +1,8 @@ /* Copyright 2015, 2016 OpenMarket Ltd Copyright 2017 New Vector Ltd -Copyright 2019, 2020 The Matrix.org Foundation C.I.C. Copyright 2019 Michael Telatynski <7t3chguy@gmail.com> +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. From 89ac476281763cea379fea4f23ed60a72ae4e031 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Jan 2020 16:59:46 +0000 Subject: [PATCH 159/239] Unused import --- src/components/views/rooms/EventTile.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index d8ca5ef7cd..b71771a916 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -24,7 +24,6 @@ import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; const classNames = require("classnames"); import { _t, _td } from '../../../languageHandler'; -const Modal = require('../../../Modal'); const sdk = require('../../../index'); const TextForEvent = require('../../../TextForEvent'); From 4de0f7257a1846ac75d56bd75bc9941927c55a2b Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 2 Jan 2020 17:40:18 -0700 Subject: [PATCH 160/239] Initial implementation of FTUE user lists design This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR. Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be. Closes https://github.com/vector-im/riot-web/issues/11197 --- package.json | 3 +- res/css/_components.scss | 1 + res/css/views/dialogs/_DMInviteDialog.scss | 81 +++++++ res/themes/dark/css/_dark.scss | 3 + res/themes/light/css/_light.scss | 3 + src/RoomInvite.js | 15 +- .../views/dialogs/DMInviteDialog.js | 212 ++++++++++++++++++ src/i18n/strings/en_EN.json | 6 + src/settings/Settings.js | 6 + src/utils/DMRoomMap.js | 9 + yarn.lock | 5 + 11 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 res/css/views/dialogs/_DMInviteDialog.scss create mode 100644 src/components/views/dialogs/DMInviteDialog.js diff --git a/package.json b/package.json index 7ef14e6635..a1ebc6602d 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,6 @@ "file-saver": "^1.3.3", "filesize": "3.5.6", "flux": "2.1.1", - "react-focus-lock": "^2.2.1", "focus-visible": "^5.0.2", "fuse.js": "^2.2.0", "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", @@ -82,6 +81,7 @@ "glob": "^5.0.14", "glob-to-regexp": "^0.4.1", "highlight.js": "^9.15.8", + "humanize": "^0.0.9", "is-ip": "^2.0.0", "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.6", @@ -99,6 +99,7 @@ "react-addons-css-transition-group": "15.6.2", "react-beautiful-dnd": "^4.0.1", "react-dom": "^16.9.0", + "react-focus-lock": "^2.2.1", "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594", "resize-observer-polyfill": "^1.5.0", "sanitize-html": "^1.18.4", diff --git a/res/css/_components.scss b/res/css/_components.scss index 7b8ca77739..7a9ebfdf26 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -56,6 +56,7 @@ @import "./views/dialogs/_ConfirmUserActionDialog.scss"; @import "./views/dialogs/_CreateGroupDialog.scss"; @import "./views/dialogs/_CreateRoomDialog.scss"; +@import "./views/dialogs/_DMInviteDialog.scss"; @import "./views/dialogs/_DeactivateAccountDialog.scss"; @import "./views/dialogs/_DeviceVerifyDialog.scss"; @import "./views/dialogs/_DevtoolsDialog.scss"; diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss new file mode 100644 index 0000000000..50e9b0a15f --- /dev/null +++ b/res/css/views/dialogs/_DMInviteDialog.scss @@ -0,0 +1,81 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_DMInviteDialog_addressBar { + display: flex; + flex-direction: row; + + .mx_DMInviteDialog_editor { + flex: 1; + width: 100%; // Needed to make the Field inside grow + } + + .mx_Field { + margin: 0; + } + + .mx_DMInviteDialog_goButton { + width: 48px; + margin-left: 10px; + } +} + +.mx_DMInviteDialog_section { + padding-bottom: 10px; + + h3 { + font-size: 12px; + color: $muted-fg-color; + font-weight: bold; + text-transform: uppercase; + } +} + +.mx_DMInviteDialog_roomTile { + cursor: pointer; + padding: 5px 10px; + + &:hover { + background-color: $user-tile-hover-bg-color; + border-radius: 4px; + } + + * { + vertical-align: middle; + } + + .mx_DMInviteDialog_roomTile_name { + font-weight: 600; + font-size: 14px; + color: $primary-fg-color; + margin-left: 7px; + } + + .mx_DMInviteDialog_roomTile_userId { + font-size: 12px; + color: $muted-fg-color; + margin-left: 7px; + } + + .mx_DMInviteDialog_roomTile_time { + text-align: right; + font-size: 12px; + color: $muted-fg-color; + float: right; + line-height: 36px; // Height of the avatar to keep the time vertically aligned + } +} + diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index eadde4c672..d28efbb11f 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -16,6 +16,7 @@ $room-highlight-color: #343a46; // typical text (dark-on-white in light skin) $primary-fg-color: $text-primary-color; $primary-bg-color: $bg-color; +$muted-fg-color: $header-panel-text-primary-color; // used for dialog box text $light-fg-color: $header-panel-text-secondary-color; @@ -172,6 +173,8 @@ $interactive-tooltip-fg-color: #ffffff; $breadcrumb-placeholder-bg-color: #272c35; +$user-tile-hover-bg-color: $header-panel-bg-color; + // ***** Mixins! ***** @define-mixin mx_DialogButton { diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 0a3ef812b8..ac9cb261d3 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -21,6 +21,7 @@ $header-panel-bg-color: #f3f8fd; // typical text (dark-on-white in light skin) $primary-fg-color: #2e2f32; $primary-bg-color: #ffffff; +$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text // used for dialog box text $light-fg-color: #747474; @@ -293,6 +294,8 @@ $interactive-tooltip-fg-color: #ffffff; $breadcrumb-placeholder-bg-color: #e8eef5; +$user-tile-hover-bg-color: $header-panel-bg-color; + // ***** Mixins! ***** @define-mixin mx_DialogButton { diff --git a/src/RoomInvite.js b/src/RoomInvite.js index 48baad5d9f..ba9fe1f541 100644 --- a/src/RoomInvite.js +++ b/src/RoomInvite.js @@ -25,6 +25,7 @@ import sdk from './'; import dis from './dispatcher'; import DMRoomMap from './utils/DMRoomMap'; import { _t } from './languageHandler'; +import SettingsStore from "./settings/SettingsStore"; /** * Invites multiple addresses to a room @@ -41,6 +42,18 @@ function inviteMultipleToRoom(roomId, addrs) { } export function showStartChatInviteDialog() { + if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) { + const DMInviteDialog = sdk.getComponent("dialogs.DMInviteDialog"); + Modal.createTrackedDialog('Start DM', '', DMInviteDialog, { + onFinished: (inviteIds) => { + // TODO: Replace _onStartDmFinished with less hacks + if (inviteIds.length > 0) _onStartDmFinished(true, inviteIds.map(i => ({address: i}))); + // else ignore and just do nothing + }, + }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true); + return; + } + const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog"); Modal.createTrackedDialog('Start a chat', '', AddressPickerDialog, { @@ -99,7 +112,7 @@ export function isValid3pidInvite(event) { return true; } -// TODO: Immutable DMs replaces this +// TODO: Canonical DMs replaces this function _onStartDmFinished(shouldInvite, addrs) { if (!shouldInvite) return; diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js new file mode 100644 index 0000000000..5b67112c14 --- /dev/null +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -0,0 +1,212 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; +import PropTypes from 'prop-types'; +import {_t} from "../../../languageHandler"; +import sdk from "../../../index"; +import MatrixClientPeg from "../../../MatrixClientPeg"; +import {makeUserPermalink} from "../../../utils/permalinks/Permalinks"; +import DMRoomMap from "../../../utils/DMRoomMap"; +import {RoomMember} from "matrix-js-sdk/lib/matrix"; +import * as humanize from "humanize"; + +// TODO: [TravisR] Make this generic for all kinds of invites + +const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first +const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked + +class DMRoomTile extends React.Component { + static propTypes = { + member: PropTypes.object.isRequired, + lastActiveTs: PropTypes.number, + onToggle: PropTypes.func.isRequired, + }; + + constructor() { + super(); + } + + _onClick = (e) => { + // Stop the browser from highlighting text + e.preventDefault(); + e.stopPropagation(); + + this.props.onToggle(this.props.member.userId); + }; + + render() { + const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar"); + + let timestamp = null; + if (this.props.lastActiveTs) { + // TODO: [TravisR] Figure out how to i18n this + // `humanize` wants seconds for a timestamp, so divide by 1000 + const humanTs = humanize.relativeTime(this.props.lastActiveTs / 1000); + timestamp = {humanTs}; + } + + return ( +
    + + {this.props.member.name} + {this.props.member.userId} + {timestamp} +
    + ); + } +} + +export default class DMInviteDialog extends React.Component { + 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")} + + ) + } + + return ( +
    +

    {_t("Recent Conversations")}

    + {toRender.map(r => )} + {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 = ( +
    + +
    + ); + const targets = this.state.targets.map(t =>
    {t}
    ); + + const userId = MatrixClientPeg.get().getUserId(); + return ( + +
    +

    + {_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 6979759cd2..18c3d76e12 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", @@ -1431,6 +1432,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" From 3488eaba3cbed69f552d6a66d4e383b31768217a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 2 Jan 2020 17:44:19 -0700 Subject: [PATCH 161/239] Appease the linter --- src/components/views/dialogs/DMInviteDialog.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index 5b67112c14..6456ef7083 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -95,7 +95,9 @@ export default class DMInviteDialog extends React.Component { 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; + 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}); @@ -145,16 +147,19 @@ export default class DMInviteDialog extends React.Component { {_t("Show more")} - ) + ); } + const tiles = toRender.map(r => ( + + )); return (

    {_t("Recent Conversations")}

    - {toRender.map(r => )} + {tiles} {showMore}
    - ) + ); } render() { @@ -170,7 +175,7 @@ export default class DMInviteDialog extends React.Component { id="inviteTargets" value={this.state.filterText} onChange={this._updateFilter} - placeholder="TODO: Implement filtering/searching (https://github.com/vector-im/riot-web/issues/11199)" + placeholder="TODO: Implement filtering/searching (vector-im/riot-web#11199)" />
    ); From 6f1525c1f341c1dd7fc64727f6a4f22971df4ebc Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 2 Jan 2020 17:47:26 -0700 Subject: [PATCH 162/239] Appease the scss linter --- res/css/views/dialogs/_DMInviteDialog.scss | 94 +++++++++++----------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss index 50e9b0a15f..1153ecb0d4 100644 --- a/res/css/views/dialogs/_DMInviteDialog.scss +++ b/res/css/views/dialogs/_DMInviteDialog.scss @@ -15,67 +15,67 @@ limitations under the License. */ .mx_DMInviteDialog_addressBar { - display: flex; - flex-direction: row; + display: flex; + flex-direction: row; - .mx_DMInviteDialog_editor { - flex: 1; - width: 100%; // Needed to make the Field inside grow - } + .mx_DMInviteDialog_editor { + flex: 1; + width: 100%; // Needed to make the Field inside grow + } - .mx_Field { - margin: 0; - } + .mx_Field { + margin: 0; + } - .mx_DMInviteDialog_goButton { - width: 48px; - margin-left: 10px; - } + .mx_DMInviteDialog_goButton { + width: 48px; + margin-left: 10px; + } } .mx_DMInviteDialog_section { - padding-bottom: 10px; + padding-bottom: 10px; - h3 { - font-size: 12px; - color: $muted-fg-color; - font-weight: bold; - text-transform: uppercase; - } + h3 { + font-size: 12px; + color: $muted-fg-color; + font-weight: bold; + text-transform: uppercase; + } } .mx_DMInviteDialog_roomTile { - cursor: pointer; - padding: 5px 10px; + cursor: pointer; + padding: 5px 10px; - &:hover { - background-color: $user-tile-hover-bg-color; - border-radius: 4px; - } + &:hover { + background-color: $user-tile-hover-bg-color; + border-radius: 4px; + } - * { - vertical-align: middle; - } + * { + vertical-align: middle; + } - .mx_DMInviteDialog_roomTile_name { - font-weight: 600; - font-size: 14px; - color: $primary-fg-color; - margin-left: 7px; - } + .mx_DMInviteDialog_roomTile_name { + font-weight: 600; + font-size: 14px; + color: $primary-fg-color; + margin-left: 7px; + } - .mx_DMInviteDialog_roomTile_userId { - font-size: 12px; - color: $muted-fg-color; - margin-left: 7px; - } + .mx_DMInviteDialog_roomTile_userId { + font-size: 12px; + color: $muted-fg-color; + margin-left: 7px; + } - .mx_DMInviteDialog_roomTile_time { - text-align: right; - font-size: 12px; - color: $muted-fg-color; - float: right; - line-height: 36px; // Height of the avatar to keep the time vertically aligned - } + .mx_DMInviteDialog_roomTile_time { + text-align: right; + font-size: 12px; + color: $muted-fg-color; + float: right; + line-height: 36px; // Height of the avatar to keep the time vertically aligned + } } From 557669b08e3734bf1e0e6fa871f17d76968af0fb Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 11:12:55 +0000 Subject: [PATCH 163/239] Don't crash if a keyshare request is removed ...during the time the dialog is displayed. Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully) --- src/KeyRequestHandler.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js index c3de7988b2..4ee258da53 100644 --- a/src/KeyRequestHandler.js +++ b/src/KeyRequestHandler.js @@ -111,6 +111,12 @@ export default class KeyRequestHandler { this._currentUser = null; this._currentDevice = null; + if (!this._pendingKeyRequests[userId] || !this._pendingKeyRequests[userId][deviceId]) { + // request was removed in the time the dialog was displayed + this._processNextRequest(); + return; + } + if (r) { for (const req of this._pendingKeyRequests[userId][deviceId]) { req.share(); From c2723176e403dcb16a11e57a40db5e800e0fc653 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 12:08:35 +0000 Subject: [PATCH 164/239] Convert /verify to checkDeviceTrust Also de-promiseify the code a bit --- src/SlashCommands.js | 86 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index a9c015fdaf..21fa4a134e 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -780,54 +780,52 @@ export const CommandMap = { const deviceId = matches[2]; const fingerprint = matches[3]; - return success( - // Promise.resolve to handle transition from static result to promise; can be removed - // in future - Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => { - if (!device) { - throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`); - } + return success((async () => { + const device = await cli.getStoredDevice(userId, deviceId); + if (!device) { + throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`); + } + const deviceTrust = await cli.checkDeviceTrust(userId, deviceId); - if (device.isVerified()) { - if (device.getFingerprint() === fingerprint) { - throw new Error(_t('Device already verified!')); - } else { - throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!')); - } + if (deviceTrust.isVerified()) { + if (device.getFingerprint() === fingerprint) { + throw new Error(_t('Device already verified!')); + } else { + throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!')); } + } - if (device.getFingerprint() !== fingerprint) { - const fprint = device.getFingerprint(); - throw new Error( - _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' + - ' %(deviceId)s is "%(fprint)s" which does not match the provided key ' + - '"%(fingerprint)s". This could mean your communications are being intercepted!', - { - fprint, - userId, - deviceId, - fingerprint, - })); - } + if (device.getFingerprint() !== fingerprint) { + const fprint = device.getFingerprint(); + throw new Error( + _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' + + ' %(deviceId)s is "%(fprint)s" which does not match the provided key ' + + '"%(fingerprint)s". This could mean your communications are being intercepted!', + { + fprint, + userId, + deviceId, + fingerprint, + })); + } - return cli.setDeviceVerified(userId, deviceId, true); - }).then(() => { - // Tell the user we verified everything - const InfoDialog = sdk.getComponent('dialogs.InfoDialog'); - Modal.createTrackedDialog('Slash Commands', 'Verified key', InfoDialog, { - title: _t('Verified key'), - description:
    -

    - { - _t('The signing key you provided matches the signing key you received ' + - 'from %(userId)s\'s device %(deviceId)s. Device marked as verified.', - {userId, deviceId}) - } -

    -
    , - }); - }), - ); + await cli.setDeviceVerified(userId, deviceId, true); + + // Tell the user we verified everything + const InfoDialog = sdk.getComponent('dialogs.InfoDialog'); + Modal.createTrackedDialog('Slash Commands', 'Verified key', InfoDialog, { + title: _t('Verified key'), + description:
    +

    + { + _t('The signing key you provided matches the signing key you received ' + + 'from %(userId)s\'s device %(deviceId)s. Device marked as verified.', + {userId, deviceId}) + } +

    +
    , + }); + })()); } } return reject(this.getUsage()); From b6572f7042c04c0e8afad885d22346fe408716fd Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 3 Jan 2020 08:50:36 +0000 Subject: [PATCH 165/239] Translated using Weblate (Bulgarian) Currently translated at 97.4% (1948 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 | 80 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index d1aa0dc9a8..7911eb4607 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1884,5 +1884,83 @@ "in secret storage": "в секретно складиране", "Secret storage public key:": "Публичен ключ за секретно складиране:", "in account data": "в данни за акаунта", - "not stored": "не е складиран" + "not stored": "не е складиран", + "Backup has a valid signature from this user": "Резервното копие има валиден подпис за този потребител", + "Backup has a invalid signature from this user": "Резервното копие има невалиден подпис за този потребител", + "Backup has a signature from unknown user with ID %(deviceId)s": "Резервното копие има подпис от непознат потребител с идентификатор %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "Резервното копие има подпис от непознато устройство с идентификатор %(deviceId)s", + "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Резервния ключ е съхранен в секретно складиране, но тази функция не е включена на това устройство. Включете кръстосано-подписване от Labs за да промените състоянието на резервното копие на ключа.", + "Backup key stored: ": "Резервният ключ е съхранен: ", + "Start using Key Backup with Secure Secret Storage": "Започни използване на резервно копие на ключ в защитено секретно складиране", + "Use an Integration Manager (%(serverName)s) to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции %(serverName)s за управление на ботове, приспособления и стикери.", + "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции за управление на ботове, приспособления и стикери.", + "Manage integrations": "Управление на интеграциите", + "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Мениджърът на интеграции получава конфигурационни данни, може да модифицира приспособления, да изпраща покани за стаи и да настройва нива на достъп от ваше име.", + "Customise your experience with experimental labs features. Learn more.": "Настройте изживяването си с експериментални функции. Научи повече.", + "Ignored/Blocked": "Игнорирани/блокирани", + "Error adding ignored user/server": "Грешка при добавяне на игнориран потребител/сървър", + "Something went wrong. Please try again or view your console for hints.": "Нещо се обърка. Опитайте пак или вижте конзолата за информация какво не е наред.", + "Error subscribing to list": "Грешка при абониране за списък", + "Please verify the room ID or alias and try again.": "Потвърдете идентификатора или адреса на стаята и опитайте пак.", + "Error removing ignored user/server": "Грешка при премахване на игнориран потребител/сървър", + "Error unsubscribing from list": "Грешка при отписването от списък", + "Please try again or view your console for hints.": "Опитайте пак или вижте конзолата за информация какво не е наред.", + "None": "Няма нищо", + "Ban list rules - %(roomName)s": "Списък с правила за блокиране - %(roomName)s", + "Server rules": "Сървърни правила", + "User rules": "Потребителски правила", + "You have not ignored anyone.": "Не сте игнорирали никой.", + "You are currently ignoring:": "В момента игнорирате:", + "You are not subscribed to any lists": "Не сте абонирани към списъци", + "Unsubscribe": "Отпиши", + "View rules": "Виж правилата", + "You are currently subscribed to:": "В момента сте абонирани към:", + "⚠ These settings are meant for advanced users.": "⚠ Тези настройки са за напреднали потребители.", + "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, @bot:* would ignore all users that have the name 'bot' on any server.": "Добавете тук потребители или сървъри, които искате да игнорирате. Използвайте звездички за да кажете на Riot да търси съвпадения с всеки символ. Например: @bot:* ще игнорира всички потребители с име 'bot' на кой да е сървър.", + "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Игнорирането на хора става чрез списъци за блокиране, които съдържат правила кой да бъде блокиран. Абонирането към списък за блокиране означава, че сървърите/потребителите блокирани от този списък ще бъдат скрити от вас.", + "Personal ban list": "Персонален списък за блокиране", + "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Персоналния ви списък за блокиране съдържа потребители/сървъри, от които не искате да виждате съобщения. След игнориране на първия потребител/сървър, ще се появи нова стая в списъка със стаи, наречена 'My Ban List' - останете в тази стая за да работи списъкът с блокиране.", + "Server or user ID to ignore": "Сървър или потребителски идентификатор за игнориране", + "eg: @bot:* or example.org": "напр.: @bot:* или example.org", + "Subscribed lists": "Абонирани списъци", + "Subscribing to a ban list will cause you to join it!": "Абонирането към списък ще направи така, че да се присъедините към него!", + "If this isn't what you want, please use a different tool to ignore users.": "Ако това не е каквото искате, използвайте друг инструмент за игнориране на потребители.", + "Room ID or alias of ban list": "Идентификатор или име на стая списък за блокиране", + "Subscribe": "Абонирай ме", + "Cross-signing": "Кръстосано-подписване", + "This user has not verified all of their devices.": "Този потребител не е потвърдил всичките си устройства.", + "You have not verified this user. This user has verified all of their devices.": "Не сте потвърдили този потребител. Потребителят е потвърдил всичките си устройства.", + "You have verified this user. This user has verified all of their devices.": "Потвърдили сте този потребител. Потребителят е потвърдил всичките си устройства.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Някои потребители в тази стая не са потвърдени от вас или не са потвърдили собствените си устройства.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Всички потребители в тази стая са потвърдени от вас и са потвърдили всичките си устройства.", + "This message cannot be decrypted": "Съобщението не може да бъде дешифровано", + "Unencrypted": "Нешифровано", + "Close preview": "Затвори прегледа", + " wants to chat": " иска да чати", + "Start chatting": "Започни чат", + "Failed to connect to integration manager": "Неуспешна връзка с мениджъра на интеграции", + "Trusted": "Доверени", + "Not trusted": "Недоверени", + "Hide verified sessions": "Скрий потвърдените сесии", + "%(count)s verified sessions|other": "%(count)s потвърдени сесии", + "%(count)s verified sessions|one": "1 потвърдена сесия", + "Direct message": "Директно съобщение", + "Unverify user": "Отпотвърди потребители", + "%(role)s in %(roomName)s": "%(role)s в%(roomName)s", + "Messages in this room are end-to-end encrypted.": "Съобщенията в тази стая са шифровани от край-до-край.", + "Verify": "Потвърди", + "Security": "Сигурност", + "You have ignored this user, so their message is hidden. Show anyways.": "Игнорирали сте този потребител, така че съобщението им е скрито. Покажи така или иначе.", + "Reactions": "Реакции", + " reacted with %(content)s": " реагира с %(content)s", + "Any of the following data may be shared:": "Следните данни може да бъдат споделени:", + "Your display name": "Вашето име", + "Your avatar URL": "Адреса на профилната ви снимка", + "Your user ID": "Потребителския ви идентификатор", + "Your theme": "Вашата тема", + "Riot URL": "Riot URL адрес", + "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." } From c8f9df691b6250d3480b0cacc0bf2736e37f122d Mon Sep 17 00:00:00 2001 From: catborise Date: Thu, 2 Jan 2020 18:15:14 +0000 Subject: [PATCH 166/239] Translated using Weblate (Turkish) Currently translated at 50.8% (1017 of 2001 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/ --- src/i18n/strings/tr.json | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 85cfeedd06..a3a178c358 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -963,5 +963,63 @@ "Don't ask again": "Yeniden sorma", "New Recovery Method": "Yeni Kurtarma Yöntemi", "Go to Settings": "Ayarlara Git", - "Recovery Method Removed": "Kurtarma Yöntemi Silindi" + "Recovery Method Removed": "Kurtarma Yöntemi Silindi", + "Robot": "Robot", + "Hat": "Şapka", + "Glasses": "Gözlük", + "Umbrella": "Şemsiye", + "Hourglass": "Kum saati", + "Clock": "Saat", + "Gift": "Hediye", + "Light bulb": "Ampül", + "Book": "Kitap", + "Pencil": "Kalem", + "Paperclip": "Ataç", + "Scissors": "Makas", + "Key": "Anahtar", + "Hammer": "Çekiç", + "Telephone": "Telefon", + "Flag": "Bayrak", + "Train": "Tren", + "Bicycle": "Bisiklet", + "Aeroplane": "Uçak", + "Rocket": "Füze", + "Ball": "Top", + "Guitar": "Gitar", + "Trumpet": "Trampet", + "Bell": "Zil", + "Anchor": "Çıpa", + "Headphones": "Kulaklık", + "Folder": "Klasör", + "Accept to continue:": "Devam etmek için i kabul ediniz:", + "Upload": "Yükle", + "on device": "cihaz üstünde", + "not found": "bulunamadı", + "in account data": "hesap verisinde", + "Your homeserver does not support device management.": "Aan sunucunuz aygıt yönetimini desteklemiyor.", + "Delete %(count)s devices|other": "%(count)s cihazı silin", + "Delete %(count)s devices|one": "Cihaz sil", + "ID": "ID", + "Connecting to integration manager...": "Entegrasyon yöneticisine bağlanın...", + "Cannot connect to integration manager": "Entegrasyon yöneticisine bağlanılamadı", + "Delete Backup": "Yedek Sil", + "Unable to load key backup status": "Anahtar yedek durumu yüklenemiyor", + "Restore from Backup": "Yedekten Geri Dön", + "This device is backing up your keys. ": "Bu cihaz anahtarlarınızı yedekliyor. ", + "Connect this device to Key Backup": "Anahtar Yedeği için bu cihazı bağlayın", + "not stored": "depolanmadı", + "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s anahtar yedekleniyor...", + "All keys backed up": "Bütün yedekler yedeklendi", + "Backup is not signed by any of your devices": "Yedek hiç bir cihazınız tarafından imzalanmadı", + "Backup version: ": "Yedek sürümü: ", + "Algorithm: ": "Algoritma: ", + "Start using Key Backup": "Anahtar Yedekleme kullanmaya başla", + "Clear notifications": "Bildirimleri temizle", + "Enable desktop notifications for this device": "Bu cihaz için masaüstü bildirimlerini aç", + "Show message in desktop notification": "Masaüstü bildiriminde mesaj göster", + "Display Name": "Ekran Adı", + "Profile picture": "Profil resmi", + "Could not connect to Identity Server": "Kimlik Sunucusuna bağlanılamadı", + "Checking server": "Sunucu kontrol ediliyor", + "Change identity server": "Kimlik sunucu değiştir" } From 99559c5121e5759b6a6801b66db5d13a6f558388 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 3 Jan 2020 13:33:32 +0000 Subject: [PATCH 167/239] Update backup restore paths for SSSS This updates all the various key backup entry points to ensure they use a flow that supports backups stored under secret storage. --- .../keybackup/NewRecoveryMethodDialog.js | 11 +++-- src/components/views/dialogs/LogoutDialog.js | 6 ++- .../keybackup/RestoreKeyBackupDialog.js | 47 +++++++++++++++++-- .../views/rooms/RoomRecoveryReminder.js | 6 ++- .../views/settings/KeyBackupPanel.js | 23 +++------ 5 files changed, 66 insertions(+), 27 deletions(-) diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js index 28281af771..147f109113 100644 --- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js +++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js @@ -1,5 +1,6 @@ /* -Copyright 2018-2019 New Vector Ltd +Copyright 2018, 2019 New Vector Ltd +Copyright 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. @@ -40,9 +41,11 @@ export default class NewRecoveryMethodDialog extends React.PureComponent { onSetupClick = async () => { const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog'); - Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, { - onFinished: this.props.onFinished, - }); + Modal.createTrackedDialog( + 'Restore Backup', '', RestoreKeyBackupDialog, { + onFinished: this.props.onFinished, + }, null, /* priority = */ false, /* static = */ true, + ); } render() { diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js index 47d4153494..6e4f950830 100644 --- a/src/components/views/dialogs/LogoutDialog.js +++ b/src/components/views/dialogs/LogoutDialog.js @@ -1,5 +1,6 @@ /* Copyright 2018, 2019 New Vector Ltd +Copyright 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. @@ -94,7 +95,10 @@ export default class LogoutDialog extends React.Component { // verified, so restore the backup which will give us the keys from it and // allow us to trust it (ie. upload keys to it) const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog'); - Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {}); + Modal.createTrackedDialog( + 'Restore Backup', '', RestoreKeyBackupDialog, null, null, + /* priority = */ false, /* static = */ true, + ); } else { Modal.createTrackedDialogAsync("Key Backup", "Key Backup", import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"), diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js index 45168c381e..2881cc920c 100644 --- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js +++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js @@ -1,5 +1,6 @@ /* Copyright 2018, 2019 New Vector Ltd +Copyright 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. @@ -15,17 +16,18 @@ limitations under the License. */ import React from 'react'; +import { MatrixClient } from 'matrix-js-sdk'; + import sdk from '../../../../index'; import MatrixClientPeg from '../../../../MatrixClientPeg'; import Modal from '../../../../Modal'; - -import { MatrixClient } from 'matrix-js-sdk'; - import { _t } from '../../../../languageHandler'; import {Key} from "../../../../Keyboard"; +import { accessSecretStorage } from '../../../../CrossSigningManager'; const RESTORE_TYPE_PASSPHRASE = 0; const RESTORE_TYPE_RECOVERYKEY = 1; +const RESTORE_TYPE_SECRET_STORAGE = 2; /* * Dialog for restoring e2e keys from a backup and the user's recovery key @@ -35,6 +37,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent { super(props); this.state = { backupInfo: null, + backupKeyStored: null, loading: false, loadError: null, restoreError: null, @@ -148,6 +151,32 @@ export default class RestoreKeyBackupDialog extends React.PureComponent { } } + async _restoreWithSecretStorage() { + this.setState({ + loading: true, + restoreError: null, + restoreType: RESTORE_TYPE_SECRET_STORAGE, + }); + try { + // `accessSecretStorage` may prompt for storage access as needed. + const recoverInfo = await accessSecretStorage(async () => { + return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage( + this.state.backupInfo, + ); + }); + this.setState({ + loading: false, + recoverInfo, + }); + } catch (e) { + console.log("Error restoring backup", e); + this.setState({ + restoreError: e, + loading: false, + }); + } + } + async _loadBackupStatus() { this.setState({ loading: true, @@ -155,10 +184,20 @@ export default class RestoreKeyBackupDialog extends React.PureComponent { }); try { const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion(); + const backupKeyStored = await MatrixClientPeg.get().isKeyBackupKeyStored(); + this.setState({ + backupInfo, + backupKeyStored, + }); + + // If the backup key is stored, we can proceed directly to restore. + if (backupKeyStored) { + return this._restoreWithSecretStorage(); + } + this.setState({ loadError: null, loading: false, - backupInfo, }); } catch (e) { console.log("Error loading backup status", e); diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js index 6b7366bc4f..495364bf4c 100644 --- a/src/components/views/rooms/RoomRecoveryReminder.js +++ b/src/components/views/rooms/RoomRecoveryReminder.js @@ -1,5 +1,6 @@ /* Copyright 2018, 2019 New Vector Ltd +Copyright 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. @@ -70,7 +71,10 @@ export default class RoomRecoveryReminder extends React.PureComponent { // verified, so restore the backup which will give us the keys from it and // allow us to trust it (ie. upload keys to it) const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog'); - Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {}); + Modal.createTrackedDialog( + 'Restore Backup', '', RestoreKeyBackupDialog, null, null, + /* priority = */ false, /* static = */ true, + ); } else { Modal.createTrackedDialogAsync("Key Backup", "Key Backup", import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"), diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 559b1e0ba1..55bfadba88 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -1,6 +1,6 @@ /* Copyright 2018 New Vector Ltd -Copyright 2019 The Matrix.org Foundation C.I.C. +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. @@ -181,22 +181,11 @@ export default class KeyBackupPanel extends React.PureComponent { } _restoreBackup = async () => { - // Use legacy path if backup key not stored in secret storage - if (!this.state.backupKeyStored) { - const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog'); - Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog); - return; - } - - try { - await accessSecretStorage(async () => { - await MatrixClientPeg.get().restoreKeyBackupWithSecretStorage( - this.state.backupInfo, - ); - }); - } catch (e) { - console.log("Error restoring backup", e); - } + const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog'); + Modal.createTrackedDialog( + 'Restore Backup', '', RestoreKeyBackupDialog, null, null, + /* priority = */ false, /* static = */ true, + ); } render() { From 43e4f2dcc0f5d970bd4b4021a713b58358e213f0 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 13:34:43 +0000 Subject: [PATCH 168/239] Use deviceTrust when displaying key backup trust status Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138 --- src/components/views/settings/KeyBackupPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 559b1e0ba1..9f20288fff 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -270,7 +270,7 @@ export default class KeyBackupPanel extends React.PureComponent { {sub} ; const verify = sub => - + {sub} ; const device = sub => {deviceName}; From d5a82a5fc2e9057ec94873e7c5f595ab4c79d569 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 3 Jan 2020 13:45:52 +0000 Subject: [PATCH 169/239] Finish sentence in accessSecretStorage docs --- src/CrossSigningManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js index ab0a22e4d5..f3953b1897 100644 --- a/src/CrossSigningManager.js +++ b/src/CrossSigningManager.js @@ -97,7 +97,7 @@ export const crossSigningCallbacks = { * * Additionally, the secret storage keys are cached during the scope of this function * to ensure the user is prompted only once for their secret storage - * passphrase. The cache is then + * passphrase. The cache is then cleared once the provided function completes. * * @param {Function} [func] An operation to perform once secret storage has been * bootstrapped. Optional. From 4211ec5063d1e531ffe2938dc2ea0b6088253bf4 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 3 Jan 2020 13:51:42 +0000 Subject: [PATCH 170/239] Fix DOM structure in RoomRecoveryReminder Buttons (which end up as
    s) aren't allowed inside

    s. --- res/css/views/rooms/_RoomRecoveryReminder.scss | 1 + src/components/views/rooms/RoomRecoveryReminder.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_RoomRecoveryReminder.scss b/res/css/views/rooms/_RoomRecoveryReminder.scss index 68e2bf861e..85d42ca4b4 100644 --- a/res/css/views/rooms/_RoomRecoveryReminder.scss +++ b/res/css/views/rooms/_RoomRecoveryReminder.scss @@ -40,4 +40,5 @@ limitations under the License. .mx_RoomRecoveryReminder_secondary { font-size: 90%; + margin-top: 1em; } diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js index 495364bf4c..8554c804c0 100644 --- a/src/components/views/rooms/RoomRecoveryReminder.js +++ b/src/components/views/rooms/RoomRecoveryReminder.js @@ -154,14 +154,14 @@ export default class RoomRecoveryReminder extends React.PureComponent { onClick={this.onSetupClick}> {setupCaption} -

    { _t("Not now") } -

    -

    + { _t("Don't ask me again") } -

    +
    ); From 668479d94a477976b4113906b21cce56f01458ac Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Fri, 3 Jan 2020 13:57:59 +0000 Subject: [PATCH 171/239] 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 172/239] 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 173/239] 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 174/239] 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 175/239] 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 5faae1d2f2a0425997c08d5f03b9be80eb136152 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 15:05:41 +0000 Subject: [PATCH 176/239] i18n --- src/i18n/strings/en_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 6979759cd2..2065454525 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1114,7 +1114,6 @@ "%(count)s verified sessions|other": "%(count)s verified sessions", "%(count)s verified sessions|one": "1 verified session", "Direct message": "Direct message", - "Unverify user": "Unverify user", "Remove from community": "Remove from community", "Disinvite this user from community?": "Disinvite this user from community?", "Remove this user from community?": "Remove this user from community?", From 2970a9faaffde5f4eb22b33d15d481c9e83501ec Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 15:16:02 +0000 Subject: [PATCH 177/239] Don't fail if logs exists and is an empty dir --- scripts/ci/end-to-end-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh index ae88ef70c7..a592888292 100755 --- a/scripts/ci/end-to-end-tests.sh +++ b/scripts/ci/end-to-end-tests.sh @@ -36,7 +36,8 @@ echo "--- Install synapse & other dependencies" ./install.sh # install static webserver to server symlinked local copy of riot ./riot/install-webserver.sh -mkdir logs || rm -r logs/* +rm -r logs || true +mkdir logs echo "+++ Running end-to-end tests" TESTS_STARTED=1 ./run.sh --no-sandbox --log-directory logs/ From 731279ab2d0de023743b16fdcefde385f722232d Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 3 Jan 2020 14:53:05 +0000 Subject: [PATCH 178/239] Translated using Weblate (Bulgarian) Currently translated at 99.2% (1985 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 | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 2c53a45fc2..5744640ec8 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1967,8 +1967,37 @@ "Widget added by": "Приспособлението е добавено от", "This widget may use cookies.": "Това приспособление може да използва бисквитки.", "More options": "Още опции", - "Language Dropdown": "Избор на език", + "Language Dropdown": "Падащо меню за избор на език", "Integrations are disabled": "Интеграциите са изключени", "Enable 'Manage Integrations' in Settings to do this.": "Включете 'Управление на интеграции' от настройките за направите това.", - "Integrations not allowed": "Интеграциите не са разрешени" + "Integrations not allowed": "Интеграциите не са разрешени", + "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Вашият Riot не позволява да използвате мениджъра на интеграции за да направите това. Свържете се с администратор.", + "Automatically invite users": "Автоматично кани потребители", + "Upgrade private room": "Обнови лична стая", + "Upgrade public room": "Обнови публична стая", + "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Обновяването на стая е действие за напреднали и обикновено се препоръчва когато стаята е нестабилна поради бъгове, липсващи функции или проблеми със сигурността.", + "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please report a bug.": "Това обикновено влия само на това как стаята се обработва на сървъра. Ако имате проблеми с Riot, съобщете за проблем.", + "You'll upgrade this room from to .": "Ще обновите стаята от до .", + "Upgrade": "Обнови", + "Enter secret storage passphrase": "Въведете парола за секретно складиране", + "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Неуспешен достъп до секретно складиране. Уверете се, че сте въвели правилната парола.", + "Warning: You should only access secret storage from a trusted computer.": "Внимание: Трябва да достъпвате секретно складиране само от доверен компютър.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Въведете парола за да достъпите защитената история на съобщенията и самоличността за кръстосано-подписване и потвърждение на други устройства.", + "If you've forgotten your passphrase you can use your recovery key or set up new recovery options.": "Ако сте забравили паролата си, може да използвате ключ за възстановяване или да настройте опции за възстановяване.", + "Enter secret storage recovery key": "Въведете ключ за възстановяване на секретно складиране", + "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Неуспешен достъп до секретно складиране. Подсигурете се, че сте въвели правилния ключ за възстановяване.", + "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Въведете ключа за възстановяване за да достъпите защитената история на съобщенията и самоличността за кръстосано-подписване и потвърждение на други устройства.", + "If you've forgotten your recovery key you can .": "Ако сте забравили ключа си за възстановяване, може да .", + "Warning: You should only set up key backup from a trusted computer.": "Внимание: Трябва да настройвате резервно копие на ключове само от доверен компютър.", + "If you've forgotten your recovery key you can ": "Ако сте забравили ключа за възстановяване, може да ", + "Notification settings": "Настройки на уведомленията", + "Help": "Помощ", + "Reload": "Презареди", + "Take picture": "Направи снимка", + "Remove for everyone": "Премахни за всички", + "Remove for me": "Премахни за мен", + "User Status": "Потребителски статус", + "Country Dropdown": "Падащо меню за избор на държава", + "Verification Request": "Заявка за потвърждение", + " (1/%(totalCount)s)": " (1/%(totalCount)s)" } From b8683462e8f0bee0654defe92883e36ef99cef44 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 3 Jan 2020 15:34:03 +0000 Subject: [PATCH 179/239] Update backup creation paths for SSSS This updates the various backup creation entry points to ensure they support creating with secret storage if the feature flag is enabled. --- .../keybackup/CreateKeyBackupDialog.js | 53 ++++++++++++++++--- .../keybackup/RecoveryMethodRemovedDialog.js | 2 + src/components/views/dialogs/LogoutDialog.js | 1 + .../keybackup/RestoreKeyBackupDialog.js | 2 +- .../views/rooms/RoomRecoveryReminder.js | 1 + .../views/settings/KeyBackupPanel.js | 34 ++++-------- 6 files changed, 61 insertions(+), 32 deletions(-) diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js index 3fac00c1b3..19720e077a 100644 --- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js +++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js @@ -1,6 +1,6 @@ /* Copyright 2018, 2019 New Vector Ltd -Copyright 2019 The Matrix.org Foundation C.I.C. +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. @@ -17,11 +17,14 @@ limitations under the License. import React from 'react'; import FileSaver from 'file-saver'; +import PropTypes from 'prop-types'; import sdk from '../../../../index'; import MatrixClientPeg from '../../../../MatrixClientPeg'; import { scorePassword } from '../../../../utils/PasswordScorer'; import { _t } from '../../../../languageHandler'; +import { accessSecretStorage } from '../../../../CrossSigningManager'; +import SettingsStore from '../../../../../lib/settings/SettingsStore'; const PHASE_PASSPHRASE = 0; const PHASE_PASSPHRASE_CONFIRM = 1; @@ -49,10 +52,20 @@ function selectText(target) { * on the server. */ export default class CreateKeyBackupDialog extends React.PureComponent { + static propTypes = { + secureSecretStorage: PropTypes.bool, + onFinished: PropTypes.func.isRequired, + } + constructor(props) { super(props); + this._recoveryKeyNode = null; + this._keyBackupInfo = null; + this._setZxcvbnResultTimeout = null; + this.state = { + secureSecretStorage: props.secureSecretStorage, phase: PHASE_PASSPHRASE, passPhrase: '', passPhraseConfirm: '', @@ -61,12 +74,25 @@ export default class CreateKeyBackupDialog extends React.PureComponent { zxcvbnResult: null, setPassPhrase: false, }; + + if (this.state.secureSecretStorage === undefined) { + this.state.secureSecretStorage = + SettingsStore.isFeatureEnabled("feature_cross_signing"); + } + + // If we're using secret storage, skip ahead to the backing up step, as + // `accessSecretStorage` will handle passphrases as needed. + if (this.state.secureSecretStorage) { + this.state.phase = PHASE_BACKINGUP; + } } - componentWillMount() { - this._recoveryKeyNode = null; - this._keyBackupInfo = null; - this._setZxcvbnResultTimeout = null; + componentDidMount() { + // If we're using secret storage, skip ahead to the backing up step, as + // `accessSecretStorage` will handle passphrases as needed. + if (this.state.secureSecretStorage) { + this._createBackup(); + } } componentWillUnmount() { @@ -103,15 +129,26 @@ export default class CreateKeyBackupDialog extends React.PureComponent { } _createBackup = async () => { + const { secureSecretStorage } = this.state; this.setState({ phase: PHASE_BACKINGUP, error: null, }); let info; try { - info = await MatrixClientPeg.get().createKeyBackupVersion( - this._keyBackupInfo, - ); + if (secureSecretStorage) { + await accessSecretStorage(async () => { + info = await MatrixClientPeg.get().prepareKeyBackupVersion( + null /* random key */, + { secureSecretStorage: true }, + ); + info = await MatrixClientPeg.get().createKeyBackupVersion(info); + }); + } else { + info = await MatrixClientPeg.get().createKeyBackupVersion( + this._keyBackupInfo, + ); + } await MatrixClientPeg.get().scheduleAllGroupSessionsForBackup(); this.setState({ phase: PHASE_DONE, diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js index 1975fbe6d6..4383908e23 100644 --- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js +++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js @@ -1,5 +1,6 @@ /* Copyright 2019 New Vector Ltd +Copyright 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. @@ -35,6 +36,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent { this.props.onFinished(); Modal.createTrackedDialogAsync("Key Backup", "Key Backup", import("./CreateKeyBackupDialog"), + null, null, /* priority = */ false, /* static = */ true, ); } diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js index 6e4f950830..ede03f13cc 100644 --- a/src/components/views/dialogs/LogoutDialog.js +++ b/src/components/views/dialogs/LogoutDialog.js @@ -102,6 +102,7 @@ export default class LogoutDialog extends React.Component { } else { Modal.createTrackedDialogAsync("Key Backup", "Key Backup", import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"), + null, null, /* priority = */ false, /* static = */ true, ); } diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js index 2881cc920c..106d8cd6f8 100644 --- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js +++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js @@ -76,7 +76,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent { onFinished: () => { this._loadBackupStatus(); }, - }, + }, null, /* priority = */ false, /* static = */ true, ); } diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js index 8554c804c0..aa8134d680 100644 --- a/src/components/views/rooms/RoomRecoveryReminder.js +++ b/src/components/views/rooms/RoomRecoveryReminder.js @@ -78,6 +78,7 @@ export default class RoomRecoveryReminder extends React.PureComponent { } else { Modal.createTrackedDialogAsync("Key Backup", "Key Backup", import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"), + null, null, /* priority = */ false, /* static = */ true, ); } } diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 55bfadba88..765dd16717 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -128,36 +128,24 @@ export default class KeyBackupPanel extends React.PureComponent { Modal.createTrackedDialogAsync('Key Backup', 'Key Backup', import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'), { + secureSecretStorage: false, onFinished: () => { this._loadBackupStatus(); }, - }, + }, null, /* priority = */ false, /* static = */ true, ); } _startNewBackupWithSecureSecretStorage = async () => { - const cli = MatrixClientPeg.get(); - let info; - try { - await accessSecretStorage(async () => { - info = await cli.prepareKeyBackupVersion( - null /* random key */, - { secureSecretStorage: true }, - ); - info = await cli.createKeyBackupVersion(info); - }); - await MatrixClientPeg.get().scheduleAllGroupSessionsForBackup(); - this._loadBackupStatus(); - } catch (e) { - console.error("Error creating key backup", e); - // TODO: If creating a version succeeds, but backup fails, should we - // delete the version, disable backup, or do nothing? If we just - // disable without deleting, we'll enable on next app reload since - // it is trusted. - if (info && info.version) { - MatrixClientPeg.get().deleteKeyBackupVersion(info.version); - } - } + Modal.createTrackedDialogAsync('Key Backup', 'Key Backup', + import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'), + { + secureSecretStorage: true, + onFinished: () => { + this._loadBackupStatus(); + }, + }, null, /* priority = */ false, /* static = */ true, + ); } _deleteBackup = () => { From 2125bcf5a67d37142615b839d5c67cd0e77c082f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 15:38:59 +0000 Subject: [PATCH 180/239] Comment remaining non-cross-signing-compliant components Fixes https://github.com/vector-im/riot-web/issues/11748 --- src/async-components/views/dialogs/EncryptedEventDialog.js | 3 +++ src/components/views/elements/DeviceVerifyButtons.js | 2 ++ src/components/views/rooms/MemberDeviceInfo.js | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js index 15bb1e046b..ea3c109e05 100644 --- a/src/async-components/views/dialogs/EncryptedEventDialog.js +++ b/src/async-components/views/dialogs/EncryptedEventDialog.js @@ -23,6 +23,9 @@ import { _t } from '../../../languageHandler'; const sdk = require('../../../index'); const MatrixClientPeg = require("../../../MatrixClientPeg"); +// XXX: This component is not cross-signing aware. +// https://github.com/vector-im/riot-web/issues/11752 tracks either updating this +// component or taking it out to pasture. module.exports = createReactClass({ displayName: 'EncryptedEventDialog', diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js index bb08f8b234..14b4ad1760 100644 --- a/src/components/views/elements/DeviceVerifyButtons.js +++ b/src/components/views/elements/DeviceVerifyButtons.js @@ -22,6 +22,8 @@ import sdk from '../../../index'; import Modal from '../../../Modal'; import { _t } from '../../../languageHandler'; +// XXX: This component is *not* cross-signing aware. Once everything is +// cross-signing, this component should just go away. export default createReactClass({ displayName: 'DeviceVerifyButtons', diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js index ff88c6f6e6..ba90850b35 100644 --- a/src/components/views/rooms/MemberDeviceInfo.js +++ b/src/components/views/rooms/MemberDeviceInfo.js @@ -23,6 +23,8 @@ import classNames from 'classnames'; export default class MemberDeviceInfo extends React.Component { render() { const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons'); + // XXX: These checks are not cross-signing aware but this component is only used + // from the old, pre-cross-signing memberinfopanel const iconClasses = classNames({ mx_MemberDeviceInfo_icon: true, mx_MemberDeviceInfo_icon_blacklisted: this.props.device.isBlocked(), From e12ed04da8cf2914f002a599ec0d9e5ca079434d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 3 Jan 2020 15:59:14 +0000 Subject: [PATCH 181/239] Remove unused import --- src/components/views/settings/KeyBackupPanel.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 765dd16717..30d0416968 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -22,7 +22,6 @@ import MatrixClientPeg from '../../../MatrixClientPeg'; import { _t } from '../../../languageHandler'; import Modal from '../../../Modal'; import SettingsStore from '../../../../lib/settings/SettingsStore'; -import { accessSecretStorage } from '../../../CrossSigningManager'; export default class KeyBackupPanel extends React.PureComponent { constructor(props) { From 33d35c83ba2cd472f0ade060a5162c1c6f2d6306 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 3 Jan 2020 15:42:11 +0000 Subject: [PATCH 182/239] Translated using Weblate (Bulgarian) Currently translated at 100.0% (2000 of 2000 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 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 5744640ec8..e179c9d61b 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1999,5 +1999,21 @@ "User Status": "Потребителски статус", "Country Dropdown": "Падащо меню за избор на държава", "Verification Request": "Заявка за потвърждение", - " (1/%(totalCount)s)": " (1/%(totalCount)s)" + " (1/%(totalCount)s)": " (1/%(totalCount)s)", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Секретно Складиране ще бъде настроено със съществуващия ви резервен ключ. Паролата и ключа за секретно складиране ще бъдат същите каквито са за резервно складиране", + "Warning: You should only set up secret storage from a trusted computer.": "Внимание: Желателно е да настройвате секретно складиране само от доверен компютър.", + "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Ще използваме секретно складиране за да предоставим опцията да се съхрани шифровано копие на идентичността ви за кръстосано-подписване, за потвърждаване на други устройства и ключове. Защитете достъпа си до шифровани съобщения с парола за да е защитено.", + "Set up with a recovery key": "Настрой с ключ за възстановяване", + "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Като предпазна мярка, ако забравите паролата, може да го използвате за да възстановите достъпа до шифрованите съобщения.", + "As a safety net, you can use it to restore your access to encrypted messages.": "Като предпазна мярка, може да го използвате за да възстановите достъпа до шифрованите съобщения.", + "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Съхранявайте ключа за възстановяване на сигурно място, като в password manager (или сейф).", + "Your recovery key has been copied to your clipboard, paste it to:": "Ключа за възстановяване беше копиран в клиборд, поставете го в:", + "Your recovery key is in your Downloads folder.": "Ключа за възстановяване е във вашата папка Изтегляния.", + "Your access to encrypted messages is now protected.": "Достъпът ви до шифровани съобщения вече е защитен.", + "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Без настройка на секретно складиране, ако излезе от профила или използвате друго устройство, няма да можете да възстановите достъпа до шифровани съобщения или идентичността за кръстосано-подписване за потвърждаване на други устройства.", + "Set up secret storage": "Настрой секретно складиране", + "Migrate from Key Backup": "Мигрирай от резервно копие на ключове", + "Secure your encrypted messages with a passphrase": "Защитете шифрованите съобщения с парола", + "Storing secrets...": "Складиране на тайни...", + "Unable to set up secret storage": "Неуспешна настройка на секретно складиране" } From 752482964a4c5ce98825011c4797bf4c878b58d5 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 Jan 2020 10:24:07 -0700 Subject: [PATCH 183/239] Purify the components --- src/components/views/dialogs/DMInviteDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index 6456ef7083..ff498e3e75 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -29,7 +29,7 @@ import * as humanize from "humanize"; const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked -class DMRoomTile extends React.Component { +class DMRoomTile extends React.PureComponent { static propTypes = { member: PropTypes.object.isRequired, lastActiveTs: PropTypes.number, @@ -70,7 +70,7 @@ class DMRoomTile extends React.Component { } } -export default class DMInviteDialog extends React.Component { +export default class DMInviteDialog extends React.PureComponent { static propTypes = { // Takes an array of user IDs/emails to invite. onFinished: PropTypes.func.isRequired, From 31d5617c97e34deda775a05c1e0337f2c7bd23d8 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 Jan 2020 19:41:06 -0700 Subject: [PATCH 184/239] 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")}     - {this._renderRecents()} + {this._renderSection('recents')} + {this._renderSection('suggestions')} ); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index cac3f2f619..4666a1fe9d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1431,8 +1431,9 @@ "View Servers in Room": "View Servers in Room", "Toolbox": "Toolbox", "Developer Tools": "Developer Tools", - "Show more": "Show more", "Recent Conversations": "Recent Conversations", + "Suggestions": "Suggestions", + "Show more": "Show more", "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", From df25a988104a978b23cc3aa45ae739c97cfe31ef Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 Jan 2020 20:35:30 -0700 Subject: [PATCH 185/239] Implement basic filtering for invite targets Part of https://github.com/vector-im/riot-web/issues/11200 --- res/css/views/dialogs/_DMInviteDialog.scss | 4 + src/HtmlUtils.js | 5 ++ .../views/dialogs/DMInviteDialog.js | 75 +++++++++++++++++-- 3 files changed, 78 insertions(+), 6 deletions(-) diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss index 1153ecb0d4..364c796f16 100644 --- a/res/css/views/dialogs/_DMInviteDialog.scss +++ b/res/css/views/dialogs/_DMInviteDialog.scss @@ -77,5 +77,9 @@ limitations under the License. float: right; line-height: 36px; // Height of the avatar to keep the time vertically aligned } + + .mx_DMInviteDialog_roomTile_highlight { + font-weight: 900; + } } diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index 7cdff26a21..ce677e6c68 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -528,3 +528,8 @@ export function checkBlockNode(node) { return false; } } + +export function htmlEntitiesEncode(str: string) { + // Source: https://stackoverflow.com/a/18750001/7037379 + return str.replace(/[\u00A0-\u9999<>&]/gim, i => `&#${i.charCodeAt(0)};`); +} diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index bdeae6bc3e..ba3221d632 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -24,6 +24,7 @@ import DMRoomMap from "../../../utils/DMRoomMap"; import {RoomMember} from "matrix-js-sdk/lib/matrix"; import * as humanize from "humanize"; import SdkConfig from "../../../SdkConfig"; +import {htmlEntitiesEncode} from "../../../HtmlUtils"; // TODO: [TravisR] Make this generic for all kinds of invites @@ -35,6 +36,7 @@ class DMRoomTile extends React.PureComponent { member: PropTypes.object.isRequired, lastActiveTs: PropTypes.number, onToggle: PropTypes.func.isRequired, + highlightWord: PropTypes.string, }; _onClick = (e) => { @@ -45,6 +47,44 @@ class DMRoomTile extends React.PureComponent { this.props.onToggle(this.props.member.userId); }; + _highlightName(str: string) { + if (!this.props.highlightWord) return str; + + // First encode the thing to avoid injection + str = htmlEntitiesEncode(str); + + // We convert things to lowercase for index searching, but pull substrings from + // the submitted text to preserve case. + const lowerStr = str.toLowerCase(); + const filterStr = this.props.highlightWord.toLowerCase(); + + const result = []; + + let i = 0; + let ii; + while ((ii = lowerStr.indexOf(filterStr, i)) >= 0) { + // Push any text we missed (first bit/middle of text) + if (ii > i) { + // Push any text we aren't highlighting (middle of text match) + result.push({str.substring(i, ii)}); + } + + i = ii; // copy over ii only if we have a match (to preserve i for end-of-text matching) + + // Highlight the word the user entered + const substr = str.substring(i, filterStr.length + i); + result.push({substr}); + i += substr.length; + } + + // Push any text we missed (end of text) + if (i < (str.length - 1)) { + result.push({str.substring(i)}); + } + + return result; + } + render() { const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar"); @@ -59,8 +99,8 @@ class DMRoomTile extends React.PureComponent { return (
    - {this.props.member.name} - {this.props.member.userId} + {this._highlightName(this.props.member.name)} + {this._highlightName(this.props.member.userId)} {timestamp}
    ); @@ -158,7 +198,7 @@ export default class DMInviteDialog extends React.PureComponent { } return b.score - a.score; }); - return members.map(m => ({userId: m.userId, user: m.member})); + return members.map(m => ({userId: m.member.userId, user: m.member})); } _startDm = () => { @@ -190,14 +230,32 @@ export default class DMInviteDialog extends React.PureComponent { }; _renderSection(kind: "recents"|"suggestions") { - const sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions; + let 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"); + // Hide the section if there's nothing to filter by if (!sourceMembers || sourceMembers.length === 0) return null; + // Do some simple filtering on the input before going much further. If we get no results, say so. + if (this.state.filterText) { + const filterBy = this.state.filterText.toLowerCase(); + sourceMembers = sourceMembers + .filter(m => m.user.name.toLowerCase().includes(filterBy) || m.userId.toLowerCase().includes(filterBy)); + + if (sourceMembers.length === 0) { + return ( +
    +

    {sectionName}

    +

    {_t("No results")}

    +
    + ); + } + } + + // 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++; @@ -217,7 +275,13 @@ export default class DMInviteDialog extends React.PureComponent { } const tiles = toRender.map(r => ( - + )); return (
    @@ -241,7 +305,6 @@ export default class DMInviteDialog extends React.PureComponent { id="inviteTargets" value={this.state.filterText} onChange={this._updateFilter} - placeholder="TODO: Implement filtering/searching (vector-im/riot-web#11199)" />
    ); From 8b4c1e3dec79f699951d87fb11eb29541637c943 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 Jan 2020 21:17:48 -0700 Subject: [PATCH 186/239] Support searching in the user directory for invite targets Part of https://github.com/vector-im/riot-web/issues/11200 --- .../views/dialogs/DMInviteDialog.js | 84 ++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index ba3221d632..aec64919a0 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -25,14 +25,41 @@ import {RoomMember} from "matrix-js-sdk/lib/matrix"; import * as humanize from "humanize"; import SdkConfig from "../../../SdkConfig"; import {htmlEntitiesEncode} from "../../../HtmlUtils"; +import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo"; // TODO: [TravisR] Make this generic for all kinds of invites const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked +class DirectoryMember { + _userId: string; + _displayName: string; + _avatarUrl: string; + + constructor(userDirResult: {user_id: string, display_name: string, avatar_url: string}) { + this._userId = userDirResult.user_id; + this._displayName = userDirResult.display_name; + this._avatarUrl = userDirResult.avatar_url; + } + + // These next members are to implement the contract expected by DMRoomTile + get name(): string { + return this._displayName || this._userId; + } + + get userId(): string { + return this._userId; + } + + getMxcAvatarUrl(): string { + return this._avatarUrl; + } +} + class DMRoomTile extends React.PureComponent { static propTypes = { + // Has properties to match RoomMember: userId (str), name (str), getMxcAvatarUrl(): string member: PropTypes.object.isRequired, lastActiveTs: PropTypes.number, onToggle: PropTypes.func.isRequired, @@ -86,7 +113,7 @@ class DMRoomTile extends React.PureComponent { } render() { - const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar"); + const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar"); let timestamp = null; if (this.props.lastActiveTs) { @@ -96,9 +123,20 @@ class DMRoomTile extends React.PureComponent { timestamp = {humanTs}; } + const avatarSize = 36; + const avatarUrl = getHttpUriForMxc( + MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(), + avatarSize, avatarSize, "crop"); + return (
    - + {this._highlightName(this.props.member.name)} {this._highlightName(this.props.member.userId)} {timestamp} @@ -113,6 +151,8 @@ export default class DMInviteDialog extends React.PureComponent { onFinished: PropTypes.func.isRequired, }; + _debounceTimer: number = null; + constructor() { super(); @@ -123,6 +163,7 @@ export default class DMInviteDialog extends React.PureComponent { numRecentsShown: INITIAL_ROOMS_SHOWN, suggestions: this._buildSuggestions(), numSuggestionsShown: INITIAL_ROOMS_SHOWN, + serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions }; } @@ -210,7 +251,35 @@ export default class DMInviteDialog extends React.PureComponent { }; _updateFilter = (e) => { - this.setState({filterText: e.target.value}); + const term = e.target.value; + this.setState({filterText: term}); + + // Debounce server lookups to reduce spam. We don't clear the existing server + // results because they might still be vaguely accurate, likewise for races which + // could happen here. + if (this._debounceTimer) { + clearTimeout(this._debounceTimer); + } + this._debounceTimer = setTimeout(() => { + MatrixClientPeg.get().searchUserDirectory({term}).then(r => { + if (term !== this.state.filterText) { + // Discard the results - we were probably too slow on the server-side to make + // these results useful. This is a race we want to avoid because we could overwrite + // more accurate results. + return; + } + this.setState({ + serverResultsMixin: r.results.map(u => ({ + userId: u.user_id, + user: new DirectoryMember(u), + })), + }); + }).catch(e => { + console.error("Error searching user directory:"); + console.error(e); + this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal + }); + }, 150); // 150ms debounce (human reaction time + some) }; _showMoreRecents = () => { @@ -236,6 +305,15 @@ export default class DMInviteDialog extends React.PureComponent { const lastActive = (m) => kind === 'recents' ? m.lastActive : null; const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions"); + // Mix in the server results if we have any, but only if we're searching + if (this.state.filterText && this.state.serverResultsMixin && kind === 'suggestions') { + // only pick out the server results that aren't already covered though + const uniqueServerResults = this.state.serverResultsMixin + .filter(u => !sourceMembers.some(m => m.userId === u.userId)); + + sourceMembers = sourceMembers.concat(uniqueServerResults); + } + // Hide the section if there's nothing to filter by if (!sourceMembers || sourceMembers.length === 0) return null; From 295dcbfe487ebb9bb4928d029a052f28cb6a079c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 4 Jan 2020 13:34:05 +0000 Subject: [PATCH 187/239] Fix ability to remove avatars Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/room_settings/RoomProfileSettings.js | 2 ++ src/components/views/settings/ProfileSettings.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js index 2093a31a28..abcdce23f8 100644 --- a/src/components/views/room_settings/RoomProfileSettings.js +++ b/src/components/views/room_settings/RoomProfileSettings.js @@ -98,6 +98,8 @@ export default class RoomProfileSettings extends React.Component { newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false); newState.originalAvatarUrl = newState.avatarUrl; newState.avatarFile = null; + } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) { + await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {url: undefined}, ''); } if (this.state.originalTopic !== this.state.topic) { diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js index 480b414911..72ff7e3d15 100644 --- a/src/components/views/settings/ProfileSettings.js +++ b/src/components/views/settings/ProfileSettings.js @@ -88,6 +88,8 @@ export default class ProfileSettings extends React.Component { newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false); newState.originalAvatarUrl = newState.avatarUrl; newState.avatarFile = null; + } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) { + await client.setAvatarUrl(""); // use empty string as Synapse 500's on undefined } this.setState(newState); From 2ccc8caa6974ed3787436815aea95e5fc38a5205 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 5 Jan 2020 15:50:06 +0000 Subject: [PATCH 188/239] Fix indent --- .../settings/tabs/room/BridgeSettingsTab.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js index c3c85ec31c..5536a2eb06 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -88,12 +88,12 @@ export default class BridgeSettingsTab extends React.Component { network.avatar, 32, 32, "crop", ); networkIcon = ; + width={32} + height={32} + resizeMethod='crop' + name={ networkName } + idName={ networkName } + url={ avatarUrl } />; } let channelIcon = null; @@ -103,12 +103,12 @@ export default class BridgeSettingsTab extends React.Component { channel.avatar, 32, 32, "crop", ); channelIcon = ; + width={32} + height={32} + resizeMethod='crop' + name={ networkName } + idName={ networkName } + url={ avatarUrl } />; } const heading = _t("Connected to on ", { }, { From 814c0aa4c2469fa71c2372609d85c4185a4320ca Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 20:52:54 +0000 Subject: [PATCH 189/239] Send enabled_labs over rageshake as comma delimited list Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/rageshake/submit-rageshake.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js index 457958eb82..44f1039016 100644 --- a/src/rageshake/submit-rageshake.js +++ b/src/rageshake/submit-rageshake.js @@ -27,6 +27,7 @@ import rageshake from './rageshake'; // polyfill textencoder if necessary import * as TextEncodingUtf8 from 'text-encoding-utf-8'; +import SettingsStore from "../settings/SettingsStore"; let TextEncoder = window.TextEncoder; if (!TextEncoder) { TextEncoder = TextEncodingUtf8.TextEncoder; @@ -85,6 +86,12 @@ export default async function sendBugReport(bugReportEndpoint, opts) { body.append('label', opts.label); } + // add labs options + const enabledLabs = SettingsStore.getLabsFeatures().filter(SettingsStore.isFeatureEnabled); + if (enabledLabs.length) { + body.append('enabled_labs', enabledLabs.join(', ')); + } + if (opts.sendLogs) { progressCallback(_t("Collecting logs")); const logs = await rageshake.getLogsForReport(); From cf071c5ac659898f19865411bfb3e9c874bc2da8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 21:23:34 +0000 Subject: [PATCH 190/239] Deduplicate recent emoji Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/emojipicker/EmojiPicker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js index 4d49b25100..0325dfd807 100644 --- a/src/components/views/emojipicker/EmojiPicker.js +++ b/src/components/views/emojipicker/EmojiPicker.js @@ -47,10 +47,10 @@ class EmojiPicker extends React.Component { viewportHeight: 280, }; - // Convert recent emoji characters to emoji data, removing unknowns. - this.recentlyUsed = recent.get() + // Convert recent emoji characters to emoji data, removing unknowns and duplicates + this.recentlyUsed = Array.from(new Set(recent.get() .map(unicode => getEmojiFromUnicode(unicode)) - .filter(data => !!data); + .filter(data => !!data))); this.memoizedDataByCategory = { recent: this.recentlyUsed, ...DATA_BY_CATEGORY, From ba2f4aa973db060afd62807b837e9ee266b245ab Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 21:26:32 +0000 Subject: [PATCH 191/239] tidy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/emojipicker/EmojiPicker.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js index 0325dfd807..a9cf2a4732 100644 --- a/src/components/views/emojipicker/EmojiPicker.js +++ b/src/components/views/emojipicker/EmojiPicker.js @@ -48,9 +48,7 @@ class EmojiPicker extends React.Component { }; // Convert recent emoji characters to emoji data, removing unknowns and duplicates - this.recentlyUsed = Array.from(new Set(recent.get() - .map(unicode => getEmojiFromUnicode(unicode)) - .filter(data => !!data))); + this.recentlyUsed = Array.from(new Set(recent.get().map(getEmojiFromUnicode).filter(Boolean))); this.memoizedDataByCategory = { recent: this.recentlyUsed, ...DATA_BY_CATEGORY, From c2c4426396312670617632a21f62eb8620c0ebd6 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Sat, 4 Jan 2020 10:32:00 +0000 Subject: [PATCH 192/239] Translated using Weblate (Albanian) Currently translated at 99.1% (1988 of 2006 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/ --- src/i18n/strings/sq.json | 47 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 4d67df4fa4..15576d8d9a 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -1964,5 +1964,50 @@ "Set up secret storage": "Ujdisni depozitë të fshehtë", "Secure your encrypted messages with a passphrase": "Sigurojini mesazhet tuaj të fshehtëzuar me një frazëkalim", "Storing secrets...": "Po depozitohen të fshehta…", - "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë" + "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s hoqi rregullin për dëbim përdoruesish që kanë përputhje me %(glob)s", + "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s hoqi rregullin që dëbon dhoma që kanë përputhje me %(glob)s", + "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s hoqi rregullin që dëbon shërbyes që kanë përputhje me %(glob)s", + "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s hoqi një rregull dëbimi mbi përputhje me %(glob)s", + "%(senderName)s updated an invalid ban rule": "%(senderName)s përditësoi një rregull të pavlefshëm dëbimesh", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s përditësoi rregullin mbi dëbim përdoruesish që kanë përputhje me %(glob)s për %(reason)s", + "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s përditësoi rregullin për dëbim dhomash që kanë përputhje me %(glob)s për %(reason)s", + "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s përditësoi rregullin për dëbim shërbyesish që kanë përputhje me %(glob)s për %(reason)s", + "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s përditësoi një rregull dëbimi rreth përputhjesh me %(glob)s për %(reason)s", + "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull mbi dëbim përdoruesish që kanë përputhje me %(glob)s për %(reason)s", + "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull mbi dëbim dhomash që kanë përputhje me %(glob)s për %(reason)s", + "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull mbi dëbim shërbyesish që kanë përputhje me %(glob)s për %(reason)s", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull dëbimi rreth përputhjesh me %(glob)s për %(reason)s", + "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte përdorues me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s", + "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte dhoma me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s", + "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte shërbyes me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s", + "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s përditësoi një rregull dëbimesh mbi përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s", + "The message you are trying to send is too large.": "Mesazhi që po rrekeni të dërgoni është shumë i madh.", + "New DM invite dialog (under development)": "Dialog ftese të re për MD (në zhvillim)", + "not stored": "e padepozituar", + "Backup has a valid signature from this user": "Kopjeruajtja ka një nënshkrim të vlefshëm prej këtij përdoruesi", + "Backup has a invalid signature from this user": "Kopjeruajtja ka një nënshkrim të pavlefshëm prej këtij përdoruesi", + "Backup has a signature from unknown user with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një përdorues i panjohur me ID %(deviceId)s", + "Backup has a signature from unknown device with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një pajisje e panjohur me ID %(deviceId)s", + "Backup key stored: ": "Kyç kopjeruajtjeje i depozituar: ", + "Start using Key Backup with Secure Secret Storage": "Fillo të përdorësh Kopejruajtje Kyçesh me Depozitim Kyçi të Fshehtë", + "This user has not verified all of their devices.": "Ky përdorues s’ka verifikuar krejt pajisjet e tij.", + "You have not verified this user. This user has verified all of their devices.": "S’e keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt pajisjet e veta.", + "You have verified this user. This user has verified all of their devices.": "E keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt pajisjet e veta.", + "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Disa përdorues në këtë dhomë të fshehtëzuar nuk janë verifikuar nga ju ose nuk kanë verifikuar pajisjet e tyre.", + "All users in this encrypted room are verified by you and they have verified their own devices.": "Krejt përdorues në këtë dhomë të fshehtëzuar janë verifikuar nga ju dhe kanë verifikuar pajisjet e tyre.", + "Close preview": "Mbylle paraparjen", + "Hide verified sessions": "Fshih sesione të verifikuar", + "%(count)s verified sessions|other": "%(count)s sesione të verifikuar", + "%(count)s verified sessions|one": "1 sesion i verifikuar", + "Language Dropdown": "Menu Hapmbyll Gjuhësh", + "Show more": "Shfaq më tepër", + "Recent Conversations": "Biseda Së Fundi", + "Direct Messages": "Mesazhe të Drejtpërdrejtë", + "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Nëse s’gjeni dot dikë, kërkojuni emrin e përdoruesit, ose jepuni emrin tuaj të përdoruesit (%(userId)s) ose profile link.", + "Go": "Shko", + "Help": "Ndihmë", + "Country Dropdown": "Menu Hapmbyll Vendesh", + "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Depozita e Fshehtë do të ujdiset duke përdorur hollësitë tuaja ekzistuese për kopjeruajtje kyçesh.Frazëkalimi juaj për në depozitën e fshehtë dhe kyçi i rimarrjes do të jenë të njëjtë me ata për kopjeruajtjen tuaj të kyçeve", + "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh" } From b8f1ca679b744d6be4373e0b02e04020d6697858 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sat, 4 Jan 2020 13:20:53 +0000 Subject: [PATCH 193/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2006 of 2006 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index e6ce4077e5..b755e16735 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2019,5 +2019,11 @@ "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同", "Migrate from Key Backup": "從金鑰備份導入", - "Help": "說明" + "Help": "說明", + "New DM invite dialog (under development)": "新的直接訊息邀請對話框（開發中）", + "Show more": "顯示更多", + "Recent Conversations": "最近的對話", + "Direct Messages": "直接訊息", + "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "如果您找不到某人，請向他們詢問他們的使用者名稱，或是分享您的使用者名稱 (%(userId)s) 或簡介連結。", + "Go": "到" } From e6c80160861b9a33d0f217be048c37cb8e50be57 Mon Sep 17 00:00:00 2001 From: Samu Voutilainen Date: Sat, 4 Jan 2020 16:49:31 +0000 Subject: [PATCH 194/239] Translated using Weblate (Finnish) Currently translated at 100.0% (2006 of 2006 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/ --- src/i18n/strings/fi.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 8881456d8c..e53afb2598 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -2019,5 +2019,11 @@ "Migrate from Key Backup": "Siirrä tiedot vanhasta avainten varmuuskopiointijärjestelmästä", "Secure your encrypted messages with a passphrase": "Turvaa salatut viestisi salalauseella", "Storing secrets...": "Tallennetaan salaisuuksia...", - "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui" + "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui", + "New DM invite dialog (under development)": "Uusi dialogi kutsuille yksityiskeskusteluun (kehitysversio)", + "Show more": "Näytä lisää", + "Recent Conversations": "Viimeaikaiset keskustelut", + "Direct Messages": "Yksityisviestit", + "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Jos et löydä jotakuta, kysy hänen käyttäjätunnusta, tai anna oma käyttäjätunnuksesi (%(userId)s) tai linkin profiiliisi hänelle.", + "Go": "Mene" } From d1405233bd82a67beaae0f04a6c0669cce4fcbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Sat, 4 Jan 2020 08:16:36 +0000 Subject: [PATCH 195/239] Translated using Weblate (French) Currently translated at 100.0% (2006 of 2006 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 727d171ca4..a44df701f9 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2019,5 +2019,11 @@ "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés", "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés", - "Help": "Aide" + "Help": "Aide", + "New DM invite dialog (under development)": "Nouveau dialogue d’invitation aux MD (en développement)", + "Show more": "En savoir plus", + "Recent Conversations": "Conversations récentes", + "Direct Messages": "Messages directs", + "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur ou partagez votre nom d’utilisateur (%(userId)s) ou votre lien de profil.", + "Go": "C’est parti" } From 8128b97f3571ce2a19fca74e1293cbbf82956db4 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Sun, 5 Jan 2020 21:12:03 +0000 Subject: [PATCH 196/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (2006 of 2006 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 2f31f75407..df482cd072 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2020,5 +2020,11 @@ "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal", "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből", - "Help": "Segítség" + "Help": "Segítség", + "New DM invite dialog (under development)": "Új KB (DM) meghívó párbeszédablak (fejlesztés alatt)", + "Show more": "Mutass többet", + "Recent Conversations": "Legújabb Beszélgetések", + "Direct Messages": "Közvetlen Beszélgetések", + "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Ha nem találsz meg valakit, kérdezd meg a felhasználói nevét vagy oszd meg a te felhasználói nevedet (%(userId)s) vagy a profil hivatkozást.", + "Go": "Menj" } From a231419a775350df8628f4b1885e01b61417dfc2 Mon Sep 17 00:00:00 2001 From: catborise Date: Sat, 4 Jan 2020 09:27:22 +0000 Subject: [PATCH 197/239] Translated using Weblate (Turkish) Currently translated at 53.2% (1067 of 2006 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/ --- src/i18n/strings/tr.json | 52 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index a3a178c358..159cb61965 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -1021,5 +1021,55 @@ "Profile picture": "Profil resmi", "Could not connect to Identity Server": "Kimlik Sunucusuna bağlanılamadı", "Checking server": "Sunucu kontrol ediliyor", - "Change identity server": "Kimlik sunucu değiştir" + "Change identity server": "Kimlik sunucu değiştir", + "Sorry, your homeserver is too old to participate in this room.": "Üzgünüm, ana sunucunuz bu odaya katılabilmek için oldukça eski.", + "Please contact your homeserver administrator.": "Lütfen anasunucu yöneticiniz ile bağlantıya geçin.", + "Message Pinning": "Mesaj Sabitleme", + "Multiple integration managers": "Çoklu entegrasyon yöneticileri", + "New DM invite dialog (under development)": "Yeni DM davet diyalog kutusu (geliştirilmekte)", + "Enable Emoji suggestions while typing": "Yazarken Emoji önerilerini aç", + "Show join/leave messages (invites/kicks/bans unaffected)": "Katılma/ayrılma mesajları göster (davetler/atılmalar/yasaklamalar etkilenmeyecek)", + "Show avatar changes": "Avatar değişikliklerini göster", + "Always show encryption icons": "Şifreleme ikonlarını her zaman göster", + "Enable big emoji in chat": "Sohbette büyük emojileri aç", + "Send typing notifications": "Yazma bildirimlerini gönder", + "Send analytics data": "Analiz verilerini gönder", + "Show developer tools": "Geliştirici araçlarını göster", + "Low bandwidth mode": "Düşük bant genişliği modu", + "Messages containing my username": "Kullanıcı adımı içeren mesajlar", + "When rooms are upgraded": "Odaların güncellenme zamanları", + "My Ban List": "Yasaklı Listem", + "Verified!": "Doğrulandı!", + "You've successfully verified this user.": "Bu kullanıcıyı başarılı şekilde doğruladınız.", + "Unable to find a supported verification method.": "Desteklenen doğrulama yöntemi bulunamadı.", + "Dog": "Köpek", + "Cat": "Kedi", + "Lion": "Aslan", + "Horse": "At", + "Unicorn": "Tek boynuzlu at", + "Pig": "Domuz", + "Elephant": "Fil", + "Rabbit": "Tavşan", + "Panda": "Panda", + "Penguin": "Penguen", + "Turtle": "Kaplumbağa", + "Fish": "Balık", + "Octopus": "Ahtapot", + "Butterfly": "Kelebek", + "Flower": "Çiçek", + "Tree": "Ağaç", + "Cactus": "Kaktüs", + "Mushroom": "Mantar", + "Globe": "Dünya", + "Moon": "Ay", + "Cloud": "Bulut", + "Fire": "Ateş", + "Banana": "Muz", + "Apple": "Elma", + "Strawberry": "Çilek", + "Corn": "Mısır", + "Pizza": "Pizza", + "Cake": "Kek", + "Heart": "Kalp", + "Trophy": "Ödül" } From b6098ddb47e138a3aca2a37d444788db08afa0dc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 21:58:36 +0000 Subject: [PATCH 198/239] Delegate all room alias validation to the RoomAliasField validator Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/room_settings/AliasSettings.js | 79 ++++++++++--------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js index aa9d46c9d5..8e75680a89 100644 --- a/src/components/views/room_settings/AliasSettings.js +++ b/src/components/views/room_settings/AliasSettings.js @@ -17,7 +17,7 @@ limitations under the License. import EditableItemList from "../elements/EditableItemList"; -const React = require('react'); +import React, {createRef} from 'react'; import PropTypes from 'prop-types'; const MatrixClientPeg = require('../../../MatrixClientPeg'); const sdk = require("../../../index"); @@ -28,22 +28,41 @@ import AccessibleButton from "../elements/AccessibleButton"; const Modal = require("../../../Modal"); class EditableAliasesList extends EditableItemList { + constructor(props) { + super(props); + + this._aliasField = createRef(); + } + + _onAliasAdded = async () => { + await this._aliasField.current.validate({ allowEmpty: false }); + + if (this._aliasField.current.isValid) { + if (this.props.onItemAdded) this.props.onItemAdded(this.props.newItem); + return; + } + + this._aliasField.current.focus(); + this._aliasField.current.validate({ allowEmpty: false, focused: true }); + }; + _renderNewItemField() { const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField'); const onChange = (alias) => this._onNewItemChanged({target: {value: alias}}); return (
    - + { _t("Add") } @@ -99,11 +118,6 @@ export default class AliasSettings extends React.Component { return dict; } - isAliasValid(alias) { - // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668 - return (alias.match(/^#([^/:,]+?):(.+)$/) && encodeURI(alias) === alias); - } - changeCanonicalAlias(alias) { if (!this.props.canSetCanonicalAlias) return; @@ -139,38 +153,31 @@ export default class AliasSettings extends React.Component { const localDomain = MatrixClientPeg.get().getDomain(); if (!alias.includes(':')) alias += ':' + localDomain; - if (this.isAliasValid(alias) && alias.endsWith(localDomain)) { - MatrixClientPeg.get().createAlias(alias, this.props.roomId).then(() => { - const localAliases = this.state.domainToAliases[localDomain] || []; - const domainAliases = Object.assign({}, this.state.domainToAliases); - domainAliases[localDomain] = [...localAliases, alias]; - this.setState({ - domainToAliases: domainAliases, - // Reset the add field - newAlias: "", - }); + MatrixClientPeg.get().createAlias(alias, this.props.roomId).then(() => { + const localAliases = this.state.domainToAliases[localDomain] || []; + const domainAliases = Object.assign({}, this.state.domainToAliases); + domainAliases[localDomain] = [...localAliases, alias]; - if (!this.state.canonicalAlias) { - this.changeCanonicalAlias(alias); - } - }).catch((err) => { - console.error(err); - Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, { - title: _t("Error creating alias"), - description: _t( - "There was an error creating that alias. It may not be allowed by the server " + - "or a temporary failure occurred.", - ), - }); + this.setState({ + domainToAliases: domainAliases, + // Reset the add field + newAlias: "", }); - } else { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Invalid alias format', '', ErrorDialog, { - title: _t('Invalid alias format'), - description: _t('\'%(alias)s\' is not a valid format for an alias', { alias: alias }), + + if (!this.state.canonicalAlias) { + this.changeCanonicalAlias(alias); + } + }).catch((err) => { + console.error(err); + Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, { + title: _t("Error creating alias"), + description: _t( + "There was an error creating that alias. It may not be allowed by the server " + + "or a temporary failure occurred.", + ), }); - } + }); }; onLocalAliasDeleted = (index) => { From 4a836349ab5dbfc0c83f7e7983a64ced93604594 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 22:01:59 +0000 Subject: [PATCH 199/239] regenerate i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index cac3f2f619..9cae17157a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1081,8 +1081,6 @@ "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.", "Error creating alias": "Error creating alias", "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", "Error removing alias": "Error removing alias", "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.", "Main address": "Main address", From 378a82e6fb760657b5f77c1d13cad81c298af0da Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 22:22:09 +0000 Subject: [PATCH 200/239] Use html-entities instead Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 3 ++- src/components/views/rooms/LinkPreviewWidget.js | 10 ++++++---- yarn.lock | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7ef14e6635..7e2c242b3a 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,6 @@ "file-saver": "^1.3.3", "filesize": "3.5.6", "flux": "2.1.1", - "react-focus-lock": "^2.2.1", "focus-visible": "^5.0.2", "fuse.js": "^2.2.0", "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", @@ -82,6 +81,7 @@ "glob": "^5.0.14", "glob-to-regexp": "^0.4.1", "highlight.js": "^9.15.8", + "html-entities": "^1.2.1", "is-ip": "^2.0.0", "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.6", @@ -99,6 +99,7 @@ "react-addons-css-transition-group": "15.6.2", "react-beautiful-dnd": "^4.0.1", "react-dom": "^16.9.0", + "react-focus-lock": "^2.2.1", "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594", "resize-observer-polyfill": "^1.5.0", "sanitize-html": "^1.18.4", diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js index 06c0201af8..4822848233 100644 --- a/src/components/views/rooms/LinkPreviewWidget.js +++ b/src/components/views/rooms/LinkPreviewWidget.js @@ -18,7 +18,9 @@ limitations under the License. import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; -import { linkifyElement } from '../../../HtmlUtils'; +import { AllHtmlEntities } from 'html-entities'; + +import {linkifyElement} from '../../../HtmlUtils'; import SettingsStore from "../../../settings/SettingsStore"; import { _t } from "../../../languageHandler"; @@ -128,15 +130,15 @@ module.exports = createReactClass({ } const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - // Escape to prevent any HTML injections, we can't replace & as the description may contain & encoded html entities - const safeDescription = (p["og:description"] || "").replace("<", "<").replace(">", ">"); return (
    { img }
    { p["og:site_name"] ? (" - " + p["og:site_name"]) : null }
    -
    +
    + { AllHtmlEntities.decode(p["og:description"] || "") } +
    Date: Sun, 5 Jan 2020 23:32:49 +0000 Subject: [PATCH 201/239] Update BridgeSettingsTab.js --- .../settings/tabs/room/BridgeSettingsTab.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js index 5536a2eb06..3022885701 100644 --- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js +++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js @@ -88,12 +88,13 @@ export default class BridgeSettingsTab extends React.Component { network.avatar, 32, 32, "crop", ); networkIcon = ; + width={32} + height={32} + resizeMethod='crop' + name={ networkName } + idName={ networkName } + url={ avatarUrl } + />; } let channelIcon = null; @@ -103,12 +104,13 @@ export default class BridgeSettingsTab extends React.Component { channel.avatar, 32, 32, "crop", ); channelIcon = ; + width={32} + height={32} + resizeMethod='crop' + name={ networkName } + idName={ networkName } + url={ avatarUrl } + />; } const heading = _t("Connected to on ", { }, { From dcdf68d7e1cb9f9eb4f18c627fe0029d7c57db67 Mon Sep 17 00:00:00 2001 From: Justin Sleep Date: Sun, 5 Jan 2020 17:35:05 -0600 Subject: [PATCH 202/239] Explicitly define diff colors in light theme Signed-off-by: Justin Sleep --- res/themes/dark/css/_dark.scss | 2 +- res/themes/light/css/_light.scss | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index d1d0e333a0..212513347d 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -244,7 +244,7 @@ $breadcrumb-placeholder-bg-color: #272c35; } } -// Fixes diff color inversion by swapping add / del colors +// diff highlight colors .hljs-addition { background: #fdd; } diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 0a3ef812b8..f4fc459596 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -338,3 +338,12 @@ $breadcrumb-placeholder-bg-color: #e8eef5; color: $accent-color; text-decoration: none; } + +// diff highlight colors +.hljs-addition { + background: #dfd; +} + +.hljs-deletion { + background: #fdd; +} From 8ec8a7c01534818178259b0708681e9b3f43b50a Mon Sep 17 00:00:00 2001 From: Justin Sleep Date: Sun, 5 Jan 2020 17:58:07 -0600 Subject: [PATCH 203/239] Comment rationale for swapping dark theme colors Signed-off-by: Justin Sleep --- res/themes/dark/css/_dark.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 212513347d..0c47943301 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -245,6 +245,7 @@ $breadcrumb-placeholder-bg-color: #272c35; } // diff highlight colors +// intentionally swapped to avoid inversion .hljs-addition { background: #fdd; } From d31c863563e8d33e99a8890503968a308210f96f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 00:13:16 +0000 Subject: [PATCH 204/239] Remove all usages of slate in favour of CIDER Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .eslintignore.errorfiles | 1 - package.json | 4 - src/SlateComposerHistoryManager.js | 86 - src/autocomplete/PlainWithPillsSerializer.js | 92 - src/components/structures/LoggedInView.js | 7 - src/components/structures/RoomView.js | 43 +- .../views/rooms/MessageComposerInput.js | 1516 ----------------- .../views/rooms/SlateMessageComposer.js | 485 ------ .../tabs/user/PreferencesUserSettingsTab.js | 1 - src/i18n/strings/en_EN.json | 21 +- src/settings/Settings.js | 5 - src/stores/MessageComposerStore.js | 66 - .../views/rooms/MessageComposerInput-test.js | 2 +- yarn.lock | 151 +- 14 files changed, 15 insertions(+), 2465 deletions(-) delete mode 100644 src/SlateComposerHistoryManager.js delete mode 100644 src/autocomplete/PlainWithPillsSerializer.js delete mode 100644 src/components/views/rooms/MessageComposerInput.js delete mode 100644 src/components/views/rooms/SlateMessageComposer.js delete mode 100644 src/stores/MessageComposerStore.js diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles index 7d998f8c4b..c3bb34ae26 100644 --- a/.eslintignore.errorfiles +++ b/.eslintignore.errorfiles @@ -33,7 +33,6 @@ src/components/views/rooms/RoomList.js src/components/views/rooms/RoomPreviewBar.js src/components/views/rooms/SearchBar.js src/components/views/rooms/SearchResultTile.js -src/components/views/rooms/SlateMessageComposer.js src/components/views/settings/ChangeAvatar.js src/components/views/settings/ChangePassword.js src/components/views/settings/DevicesPanel.js diff --git a/package.json b/package.json index a1ebc6602d..ad446e26cc 100644 --- a/package.json +++ b/package.json @@ -103,10 +103,6 @@ "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594", "resize-observer-polyfill": "^1.5.0", "sanitize-html": "^1.18.4", - "slate": "^0.41.2", - "slate-html-serializer": "^0.6.1", - "slate-md-serializer": "github:matrix-org/slate-md-serializer#f7c4ad3", - "slate-react": "^0.18.10", "text-encoding-utf-8": "^1.0.1", "url": "^0.11.0", "velocity-animate": "^1.5.2", diff --git a/src/SlateComposerHistoryManager.js b/src/SlateComposerHistoryManager.js deleted file mode 100644 index 948dcf64ff..0000000000 --- a/src/SlateComposerHistoryManager.js +++ /dev/null @@ -1,86 +0,0 @@ -//@flow -/* -Copyright 2017 Aviral Dasgupta - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import {Value} from 'slate'; - -import _clamp from 'lodash/clamp'; - -type MessageFormat = 'rich' | 'markdown'; - -class HistoryItem { - // We store history items in their native format to ensure history is accurate - // and then convert them if our RTE has subsequently changed format. - value: Value; - format: MessageFormat = 'rich'; - - constructor(value: ?Value, format: ?MessageFormat) { - this.value = value; - this.format = format; - } - - static fromJSON(obj: Object): HistoryItem { - return new HistoryItem( - Value.fromJSON(obj.value), - obj.format, - ); - } - - toJSON(): Object { - return { - value: this.value.toJSON(), - format: this.format, - }; - } -} - -export default class SlateComposerHistoryManager { - history: Array = []; - prefix: string; - lastIndex: number = 0; // used for indexing the storage - currentIndex: number = 0; // used for indexing the loaded validated history Array - - constructor(roomId: string, prefix: string = 'mx_composer_history_') { - this.prefix = prefix + roomId; - - // TODO: Performance issues? - let item; - for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) { - try { - this.history.push( - HistoryItem.fromJSON(JSON.parse(item)), - ); - } catch (e) { - console.warn("Throwing away unserialisable history", e); - } - } - this.lastIndex = this.currentIndex; - // reset currentIndex to account for any unserialisable history - this.currentIndex = this.history.length; - } - - save(value: Value, format: MessageFormat) { - const item = new HistoryItem(value, format); - this.history.push(item); - this.currentIndex = this.history.length; - sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item.toJSON())); - } - - getItem(offset: number): ?HistoryItem { - this.currentIndex = _clamp(this.currentIndex + offset, 0, this.history.length - 1); - return this.history[this.currentIndex]; - } -} diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js deleted file mode 100644 index 09bb3772ac..0000000000 --- a/src/autocomplete/PlainWithPillsSerializer.js +++ /dev/null @@ -1,92 +0,0 @@ -/* -Copyright 2018 New Vector Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Based originally on slate-plain-serializer - -import { Block } from 'slate'; - -/** - * Plain text serializer, which converts a Slate `value` to a plain text string, - * serializing pills into various different formats as required. - * - * @type {PlainWithPillsSerializer} - */ - -class PlainWithPillsSerializer { - /* - * @param {String} options.pillFormat - either 'md', 'plain', 'id' - */ - constructor(options = {}) { - const { - pillFormat = 'plain', - } = options; - this.pillFormat = pillFormat; - } - - /** - * Serialize a Slate `value` to a plain text string, - * serializing pills as either MD links, plain text representations or - * ID representations as required. - * - * @param {Value} value - * @return {String} - */ - serialize = value => { - return this._serializeNode(value.document); - } - - /** - * Serialize a `node` to plain text. - * - * @param {Node} node - * @return {String} - */ - _serializeNode = node => { - if ( - node.object == 'document' || - (node.object == 'block' && Block.isBlockList(node.nodes)) - ) { - return node.nodes.map(this._serializeNode).join('\n'); - } else if (node.type == 'emoji') { - return node.data.get('emojiUnicode'); - } else if (node.type == 'pill') { - const completion = node.data.get('completion'); - // over the wire the @room pill is just plaintext - if (completion === '@room') return completion; - - switch (this.pillFormat) { - case 'plain': - return completion; - case 'md': - return `[${ completion }](${ node.data.get('href') })`; - case 'id': - return node.data.get('completionId') || completion; - } - } else if (node.nodes) { - return node.nodes.map(this._serializeNode).join(''); - } else { - return node.text; - } - } -} - -/** - * Export. - * - * @type {PlainWithPillsSerializer} - */ - -export default PlainWithPillsSerializer; diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js index 7261af3bf0..3420e69ce6 100644 --- a/src/components/structures/LoggedInView.js +++ b/src/components/structures/LoggedInView.js @@ -393,13 +393,6 @@ const LoggedInView = createReactClass({ return; } - // XXX: Remove after CIDER replaces Slate completely: https://github.com/vector-im/riot-web/issues/11036 - // If using Slate, consume the Backspace without first focusing as it causes an implosion - if (ev.key === Key.BACKSPACE && !SettingsStore.getValue("useCiderComposer")) { - ev.stopPropagation(); - return; - } - if (!isClickShortcut && ev.key !== Key.TAB && !canElementReceiveInput(ev.target)) { // synchronous dispatch so we focus before key generates input dis.dispatch({action: 'focus_composer'}, true); diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 939f422a36..c552e2f8f5 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -157,8 +157,6 @@ module.exports = createReactClass({ canReact: false, canReply: false, - - useCider: false, }; }, @@ -180,18 +178,10 @@ module.exports = createReactClass({ WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate); - this._onCiderUpdated(); - this._ciderWatcherRef = SettingsStore.watchSetting( - "useCiderComposer", null, this._onCiderUpdated); - this._roomView = createRef(); this._searchResultsPanel = createRef(); }, - _onCiderUpdated: function() { - this.setState({useCider: SettingsStore.getValue("useCiderComposer")}); - }, - _onRoomViewStoreUpdate: function(initial) { if (this.unmounted) { return; @@ -1806,29 +1796,16 @@ module.exports = createReactClass({ myMembership === 'join' && !this.state.searchResults ); if (canSpeak) { - if (this.state.useCider) { - const MessageComposer = sdk.getComponent('rooms.MessageComposer'); - messageComposer = - ; - } else { - const SlateMessageComposer = sdk.getComponent('rooms.SlateMessageComposer'); - messageComposer = - ; - } + const MessageComposer = sdk.getComponent('rooms.MessageComposer'); + messageComposer = + ; } // TODO: Why aren't we storing the term/scope/count in this format diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js deleted file mode 100644 index 595ec0681f..0000000000 --- a/src/components/views/rooms/MessageComposerInput.js +++ /dev/null @@ -1,1516 +0,0 @@ -/* -Copyright 2015, 2016 OpenMarket Ltd -Copyright 2017, 2018 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. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -import React from 'react'; -import PropTypes from 'prop-types'; - -import { Editor } from 'slate-react'; -import { getEventTransfer } from 'slate-react'; -import { Value, Block, Inline, Range } from 'slate'; -import type { Change } from 'slate'; - -import Html from 'slate-html-serializer'; -import Md from 'slate-md-serializer'; -import Plain from 'slate-plain-serializer'; -import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer"; - -import classNames from 'classnames'; - -import MatrixClientPeg from '../../../MatrixClientPeg'; -import type {MatrixClient} from 'matrix-js-sdk/lib/matrix'; -import {processCommandInput} from '../../../SlashCommands'; -import { isOnlyCtrlOrCmdKeyEvent, Key} from '../../../Keyboard'; -import Modal from '../../../Modal'; -import sdk from '../../../index'; -import { _t } from '../../../languageHandler'; -import Analytics from '../../../Analytics'; - -import dis from '../../../dispatcher'; - -import * as HtmlUtils from '../../../HtmlUtils'; -import Autocomplete from './Autocomplete'; -import {Completion} from "../../../autocomplete/Autocompleter"; -import Markdown from '../../../Markdown'; -import MessageComposerStore from '../../../stores/MessageComposerStore'; -import ContentMessages from '../../../ContentMessages'; - -import EMOTICON_REGEX from 'emojibase-regex/emoticon'; - -import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore"; -import {getPrimaryPermalinkEntity, makeUserPermalink} from "../../../utils/permalinks/Permalinks"; -import ReplyPreview from "./ReplyPreview"; -import RoomViewStore from '../../../stores/RoomViewStore'; -import ReplyThread from "../elements/ReplyThread"; -import {ContentHelpers} from 'matrix-js-sdk'; -import AccessibleButton from '../elements/AccessibleButton'; -import {findEditableEvent} from '../../../utils/EventUtils'; -import SlateComposerHistoryManager from "../../../SlateComposerHistoryManager"; -import TypingStore from "../../../stores/TypingStore"; -import {EMOTICON_TO_EMOJI} from "../../../emoji"; - -const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$'); - -// the Slate node type to default to for unstyled text -const DEFAULT_NODE = 'paragraph'; - -// map HTML elements through to our Slate schema node types -// used for the HTML deserializer. -// (The names here are chosen to match the MD serializer's schema for convenience) -const BLOCK_TAGS = { - p: 'paragraph', - blockquote: 'block-quote', - ul: 'bulleted-list', - h1: 'heading1', - h2: 'heading2', - h3: 'heading3', - h4: 'heading4', - h5: 'heading5', - h6: 'heading6', - li: 'list-item', - ol: 'numbered-list', - pre: 'code', -}; - -const MARK_TAGS = { - strong: 'bold', - b: 'bold', // deprecated - em: 'italic', - i: 'italic', // deprecated - code: 'code', - u: 'underlined', - del: 'deleted', - strike: 'deleted', // deprecated - s: 'deleted', // deprecated -}; - -const SLATE_SCHEMA = { - inlines: { - pill: { - isVoid: true, - }, - emoji: { - isVoid: true, - }, - }, -}; - -function onSendMessageFailed(err, room) { - // XXX: temporary logging to try to diagnose - // https://github.com/vector-im/riot-web/issues/3148 - console.log('MessageComposer got send failure: ' + err.name + '('+err+')'); - dis.dispatch({ - action: 'message_send_failed', - }); -} - -function rangeEquals(a: Range, b: Range): boolean { - return (a.anchor.key === b.anchor.key - && a.anchor.offset === b.anchorOffset - && a.focus.key === b.focusKey - && a.focus.offset === b.focusOffset - && a.isFocused === b.isFocused - && a.isBackward === b.isBackward); -} - -/* - * The textInput part of the MessageComposer - */ -export default class MessageComposerInput extends React.Component { - static propTypes = { - // js-sdk Room object - room: PropTypes.object.isRequired, - - onInputStateChanged: PropTypes.func, - }; - - client: MatrixClient; - autocomplete: Autocomplete; - historyManager: SlateComposerHistoryManager; - - constructor(props) { - super(props); - - const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'); - - Analytics.setRichtextMode(isRichTextEnabled); - - this.client = MatrixClientPeg.get(); - - // track whether we should be trying to show autocomplete suggestions on the current editor - // contents. currently it's only suppressed when navigating history to avoid ugly flashes - // of unexpected corrections as you navigate. - // XXX: should this be in state? - this.suppressAutoComplete = false; - - // track whether we've just pressed an arrowkey left or right in order to skip void nodes. - // see https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095 - this.direction = ''; - - this.plainWithMdPills = new PlainWithPillsSerializer({ pillFormat: 'md' }); - this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' }); - this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' }); - - this.md = new Md({ - rules: [ - { - // if serialize returns undefined it falls through to the default hardcoded - // serialization rules - serialize: (obj, children) => { - if (obj.object !== 'inline') return; - switch (obj.type) { - case 'pill': - return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`; - case 'emoji': - return obj.data.get('emojiUnicode'); - } - }, - }, { - serialize: (obj, children) => { - if (obj.object !== 'mark') return; - // XXX: slate-md-serializer consumes marks other than bold, italic, code, inserted, deleted - switch (obj.type) { - case 'underlined': - return `${ children }`; - case 'deleted': - return `${ children }`; - case 'code': - // XXX: we only ever get given `code` regardless of whether it was inline or block - // XXX: workaround for https://github.com/tommoor/slate-md-serializer/issues/14 - // strip single backslashes from children, as they would have been escaped here - return `\`${ children.split('\\').map((v) => v ? v : '\\').join('') }\``; - } - }, - }, - ], - }); - - this.html = new Html({ - rules: [ - { - deserialize: (el, next) => { - const tag = el.tagName.toLowerCase(); - let type = BLOCK_TAGS[tag]; - if (type) { - return { - object: 'block', - type: type, - nodes: next(el.childNodes), - }; - } - type = MARK_TAGS[tag]; - if (type) { - return { - object: 'mark', - type: type, - nodes: next(el.childNodes), - }; - } - // special case links - if (tag === 'a') { - const href = el.getAttribute('href'); - const permalinkEntity = getPrimaryPermalinkEntity(href); - if (permalinkEntity) { - return { - object: 'inline', - type: 'pill', - data: { - href, - completion: el.innerText, - completionId: permalinkEntity, - }, - }; - } else { - return { - object: 'inline', - type: 'link', - data: { href }, - nodes: next(el.childNodes), - }; - } - } - }, - serialize: (obj, children) => { - if (obj.object === 'block') { - return this.renderNode({ - node: obj, - children: children, - }); - } else if (obj.object === 'mark') { - return this.renderMark({ - mark: obj, - children: children, - }); - } else if (obj.object === 'inline') { - // special case links, pills and emoji otherwise we - // end up with React components getting rendered out(!) - switch (obj.type) { - case 'pill': - return { obj.data.get('completion') }; - case 'link': - return { children }; - case 'emoji': - // XXX: apparently you can't return plain strings from serializer rules - // until https://github.com/ianstormtaylor/slate/pull/1854 is merged. - // So instead we temporarily wrap emoji from RTE in a span. - return { obj.data.get('emojiUnicode') }; - } - return this.renderNode({ - node: obj, - children: children, - }); - } - }, - }, - ], - }); - - const savedState = MessageComposerStore.getEditorState(this.props.room.roomId); - this.state = { - // whether we're in rich text or markdown mode - isRichTextEnabled, - - // the currently displayed editor state (note: this is always what is modified on input) - editorState: this.createEditorState( - isRichTextEnabled, - savedState ? savedState.editor_state : undefined, - savedState ? savedState.rich_text : undefined, - ), - - // the original editor state, before we started tabbing through completions - originalEditorState: null, - - // the virtual state "above" the history stack, the message currently being composed that - // we want to persist whilst browsing history - currentlyComposedEditorState: null, - - // whether there were any completions - someCompletions: null, - }; - } - - /* - * "Does the right thing" to create an Editor value, based on: - * - whether we've got rich text mode enabled - * - contentState was passed in - * - whether the contentState that was passed in was rich text - */ - createEditorState(wantRichText: boolean, editorState: ?Value, wasRichText: ?boolean): Value { - if (editorState instanceof Value) { - if (wantRichText && !wasRichText) { - return this.mdToRichEditorState(editorState); - } - if (wasRichText && !wantRichText) { - return this.richToMdEditorState(editorState); - } - return editorState; - } else { - // ...or create a new one. and explicitly focus it otherwise tab in-out issues - const base = Plain.deserialize('', { defaultBlock: DEFAULT_NODE }); - return base.change().focus().value; - } - } - - componentWillMount() { - this.dispatcherRef = dis.register(this.onAction); - this.historyManager = new SlateComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_'); - } - - componentWillUnmount() { - dis.unregister(this.dispatcherRef); - } - - _collectEditor = (e) => { - this._editor = e; - } - - onAction = (payload) => { - const editorState = this.state.editorState; - - switch (payload.action) { - case 'reply_to_event': - case 'focus_composer': - this.focusComposer(); - break; - case 'insert_mention': - { - // Pretend that we've autocompleted this user because keeping two code - // paths for inserting a user pill is not fun - const selection = this.getSelectionRange(this.state.editorState); - const member = this.props.room.getMember(payload.user_id); - const completion = member ? - member.rawDisplayName : payload.user_id; - this.setDisplayedCompletion({ - completion, - completionId: payload.user_id, - selection, - href: makeUserPermalink(payload.user_id), - suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ', - }); - } - break; - case 'quote': { - const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, { - forComposerQuote: true, - returnString: true, - }); - const fragment = this.html.deserialize(html); - // FIXME: do we want to put in a permalink to the original quote here? - // If so, what should be the format, and how do we differentiate it from replies? - - const quote = Block.create('block-quote'); - if (this.state.isRichTextEnabled) { - let change = editorState.change(); - const anchorText = editorState.anchorText; - if ((!anchorText || anchorText.text === '') && editorState.anchorBlock.nodes.size === 1) { - // replace the current block rather than split the block - // XXX: this destroys our focus by deleting the thing we are anchored/focused on - change = change.replaceNodeByKey(editorState.anchorBlock.key, quote); - } else { - // insert it into the middle of the block (splitting it) - change = change.insertBlock(quote); - } - - // XXX: heuristic to strip out wrapping

    which breaks quoting in RT mode - if (fragment.document.nodes.size && fragment.document.nodes.get(0).type === DEFAULT_NODE) { - change = change.insertFragmentByKey(quote.key, 0, fragment.document.nodes.get(0)); - } else { - change = change.insertFragmentByKey(quote.key, 0, fragment.document); - } - - // XXX: this is to bring back the focus in a sane place and add a paragraph after it - change = change.select(Range.create({ - anchor: { - key: quote.key, - }, - focus: { - key: quote.key, - }, - })).moveToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus(); - - this.onChange(change); - } else { - const fragmentChange = fragment.change(); - fragmentChange.moveToRangeOfNode(fragment.document) - .wrapBlock(quote); - - // FIXME: handle pills and use commonmark rather than md-serialize - const md = this.md.serialize(fragmentChange.value); - const change = editorState.change() - .insertText(md + '\n\n') - .focus(); - this.onChange(change); - } - } - break; - } - }; - - onChange = (change: Change, originalEditorState?: Value) => { - let editorState = change.value; - - if (this.direction !== '') { - const focusedNode = editorState.focusInline || editorState.focusText; - if (editorState.schema.isVoid(focusedNode)) { - // XXX: does this work in RTL? - const edge = this.direction === 'Previous' ? 'End' : 'Start'; - if (editorState.selection.isCollapsed) { - change = change[`moveTo${ edge }Of${ this.direction }Text`](); - } else { - const block = this.direction === 'Previous' ? editorState.previousText : editorState.nextText; - if (block) { - change = change[`moveFocusTo${ edge }OfNode`](block); - } - } - editorState = change.value; - } - } - - // when in autocomplete mode and selection changes hide the autocomplete. - // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively - if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide && - !rangeEquals(this.state.editorState.selection, editorState.selection) && - // XXX: the heuristic failed when inlines like pills weren't taken into account. This is inideal - this.state.editorState.document.toJSON() === editorState.document.toJSON()) { - this.autocomplete.hide(); - } - - if (Plain.serialize(editorState) !== '') { - TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, true); - } else { - TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, false); - } - - if (editorState.startText !== null) { - const text = editorState.startText.text; - const currentStartOffset = editorState.selection.start.offset; - - // Automatic replacement of plaintext emoji to Unicode emoji - if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) { - // The first matched group includes just the matched plaintext emoji - const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(text.slice(0, currentStartOffset)); - if (emoticonMatch) { - const query = emoticonMatch[1].toLowerCase().replace("-", ""); - const data = EMOTICON_TO_EMOJI.get(query); - - // only perform replacement if we found a match, otherwise we would be not letting user type - if (data) { - const range = Range.create({ - anchor: { - key: editorState.startText.key, - offset: currentStartOffset - emoticonMatch[1].length - 1, - }, - focus: { - key: editorState.startText.key, - offset: currentStartOffset - 1, - }, - }); - change = change.insertTextAtRange(range, data.unicode); - editorState = change.value; - } - } - } - } - - if (this.props.onInputStateChanged && editorState.blocks.size > 0) { - let blockType = editorState.blocks.first().type; - // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks); - - if (blockType === 'list-item') { - const parent = editorState.document.getParent(editorState.blocks.first().key); - if (parent.type === 'numbered-list') { - blockType = 'numbered-list'; - } else if (parent.type === 'bulleted-list') { - blockType = 'bulleted-list'; - } - } - const inputState = { - marks: editorState.activeMarks, - blockType, - }; - this.props.onInputStateChanged(inputState); - } - - // Record the editor state for this room so that it can be retrieved after switching to another room and back - MessageComposerStore.setEditorState(this.props.room.roomId, editorState, this.state.isRichTextEnabled); - - this.setState({ - editorState, - originalEditorState: originalEditorState || null, - }); - }; - - mdToRichEditorState(editorState: Value): Value { - // for consistency when roundtripping, we could use slate-md-serializer rather than - // commonmark, but then we would lose pills as the MD deserialiser doesn't know about - // them and doesn't have any extensibility hooks. - // - // The code looks like this: - // - // const markdown = this.plainWithMdPills.serialize(editorState); - // - // // weirdly, the Md serializer can't deserialize '' to a valid Value... - // if (markdown !== '') { - // editorState = this.md.deserialize(markdown); - // } - // else { - // editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE }); - // } - - // so, instead, we use commonmark proper (which is arguably more logical to the user - // anyway, as they'll expect the RTE view to match what they'll see in the timeline, - // but the HTML->MD conversion is anyone's guess). - - const textWithMdPills = this.plainWithMdPills.serialize(editorState); - const markdown = new Markdown(textWithMdPills); - // HTML deserialize has custom rules to turn permalinks into pill objects. - return this.html.deserialize(markdown.toHTML()); - } - - richToMdEditorState(editorState: Value): Value { - // FIXME: this conversion loses pills (turning them into pure MD links). - // We need to add a pill-aware deserialize method - // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills. - return Plain.deserialize( - // FIXME: we compile the MD out of the RTE state using slate-md-serializer - // which doesn't roundtrip symmetrically with commonmark, which we use for - // compiling MD out of the MD editor state above. - this.md.serialize(editorState), - { defaultBlock: DEFAULT_NODE }, - ); - } - - enableRichtext(enabled: boolean) { - if (enabled === this.state.isRichTextEnabled) return; - - Analytics.setRichtextMode(enabled); - - this.setState({ - editorState: this.createEditorState( - enabled, - this.state.editorState, - this.state.isRichTextEnabled, - ), - isRichTextEnabled: enabled, - }, () => { - this._editor.focus(); - if (this.props.onInputStateChanged) { - this.props.onInputStateChanged({ - isRichTextEnabled: enabled, - }); - } - }); - - SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled); - } - - /** - * Check if the current selection has a mark with `type` in it. - * - * @param {String} type - * @return {Boolean} - */ - - hasMark = type => { - const { editorState } = this.state; - return editorState.activeMarks.some(mark => mark.type === type); - }; - - /** - * Check if the any of the currently selected blocks are of `type`. - * - * @param {String} type - * @return {Boolean} - */ - - hasBlock = type => { - const { editorState } = this.state; - return editorState.blocks.some(node => node.type === type); - }; - - onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => { - this.suppressAutoComplete = false; - this.direction = ''; - - // Navigate autocomplete list with arrow keys - if (this.autocomplete.countCompletions() > 0) { - if (!(ev.ctrlKey || ev.shiftKey || ev.altKey || ev.metaKey)) { - switch (ev.key) { - case Key.ARROW_UP: - this.autocomplete.moveSelection(-1); - ev.preventDefault(); - return true; - case Key.ARROW_DOWN: - this.autocomplete.moveSelection(+1); - ev.preventDefault(); - return true; - } - } - } - - // skip void nodes - see - // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095 - if (ev.key === Key.ARROW_LEFT) { - this.direction = 'Previous'; - } else if (ev.key === Key.ARROW_RIGHT) { - this.direction = 'Next'; - } - - switch (ev.key) { - case Key.ENTER: - return this.handleReturn(ev, change); - case Key.BACKSPACE: - return this.onBackspace(ev, change); - case Key.ARROW_UP: - return this.onVerticalArrow(ev, true); - case Key.ARROW_DOWN: - return this.onVerticalArrow(ev, false); - case Key.TAB: - return this.onTab(ev); - case Key.ESCAPE: - return this.onEscape(ev); - case Key.SPACE: - return this.onSpace(ev, change); - } - - if (isOnlyCtrlOrCmdKeyEvent(ev)) { - const ctrlCmdCommand = { - // C-m => Toggles between rich text and markdown modes - [Key.M]: 'toggle-mode', - [Key.B]: 'bold', - [Key.I]: 'italic', - [Key.U]: 'underlined', - [Key.J]: 'inline-code', - }[ev.key]; - - if (ctrlCmdCommand) { - ev.preventDefault(); // to prevent clashing with Mac's minimize window - return this.handleKeyCommand(ctrlCmdCommand); - } - } - }; - - onSpace = (ev: KeyboardEvent, change: Change): Change => { - if (ev.metaKey || ev.altKey || ev.shiftKey || ev.ctrlKey) { - return; - } - - // drop a point in history so the user can undo a word - // XXX: this seems nasty but adding to history manually seems a no-go - ev.preventDefault(); - return change.withoutMerging(() => { - change.insertText(ev.key); - }); - }; - - onBackspace = (ev: KeyboardEvent, change: Change): Change => { - if (ev.metaKey || ev.altKey || ev.shiftKey) { - return; - } - - const { editorState } = this.state; - - // Allow Ctrl/Cmd-Backspace when focus starts at the start of the composer (e.g select-all) - // for some reason if slate sees you Ctrl-backspace and your anchor.offset=0 it just resets your focus - // XXX: Doing this now seems to put slate into a broken state, and it didn't appear to be doing - // what it claims to do on the old version of slate anyway... - /*if (!editorState.isCollapsed && editorState.selection.anchor.offset === 0) { - return change.delete(); - }*/ - - if (this.state.isRichTextEnabled) { - // let backspace exit lists - const isList = this.hasBlock('list-item'); - - if (isList && editorState.selection.anchor.offset == 0) { - change - .setBlocks(DEFAULT_NODE) - .unwrapBlock('bulleted-list') - .unwrapBlock('numbered-list'); - return change; - } else if (editorState.selection.anchor.offset == 0 && editorState.isCollapsed) { - // turn blocks back into paragraphs - if ((this.hasBlock('block-quote') || - this.hasBlock('heading1') || - this.hasBlock('heading2') || - this.hasBlock('heading3') || - this.hasBlock('heading4') || - this.hasBlock('heading5') || - this.hasBlock('heading6') || - this.hasBlock('code'))) { - return change.setBlocks(DEFAULT_NODE); - } - - // remove paragraphs entirely if they're nested - const parent = editorState.document.getParent(editorState.anchorBlock.key); - if (editorState.selection.anchor.offset == 0 && - this.hasBlock('paragraph') && - parent.nodes.size == 1 && - parent.object !== 'document') { - return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText) - .moveToEndOfNode(parent) - .focus(); - } - } - } - return; - }; - - handleKeyCommand = (command: string): boolean => { - if (command === 'toggle-mode') { - this.enableRichtext(!this.state.isRichTextEnabled); - return true; - } - - //const newState: ?Value = null; - - // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown. - if (this.state.isRichTextEnabled) { - const type = command; - const { editorState } = this.state; - const change = editorState.change(); - const { document } = editorState; - switch (type) { - // list-blocks: - case 'bulleted-list': - case 'numbered-list': { - // Handle the extra wrapping required for list buttons. - const isList = this.hasBlock('list-item'); - const isType = editorState.blocks.some(block => { - return !!document.getClosest(block.key, parent => parent.type === type); - }); - - if (isList && isType) { - change - .setBlocks(DEFAULT_NODE) - .unwrapBlock('bulleted-list') - .unwrapBlock('numbered-list'); - } else if (isList) { - change - .unwrapBlock( - type === 'bulleted-list' ? 'numbered-list' : 'bulleted-list', - ) - .wrapBlock(type); - } else { - change.setBlocks('list-item').wrapBlock(type); - } - } - break; - - // simple blocks - case 'paragraph': - case 'block-quote': - case 'heading1': - case 'heading2': - case 'heading3': - case 'heading4': - case 'heading5': - case 'heading6': - case 'list-item': - case 'code': { - const isActive = this.hasBlock(type); - const isList = this.hasBlock('list-item'); - - if (isList) { - change - .setBlocks(isActive ? DEFAULT_NODE : type) - .unwrapBlock('bulleted-list') - .unwrapBlock('numbered-list'); - } else { - change.setBlocks(isActive ? DEFAULT_NODE : type); - } - } - break; - - // marks: - case 'bold': - case 'italic': - case 'inline-code': - case 'underlined': - case 'deleted': { - change.toggleMark(type === 'inline-code' ? 'code' : type); - } - break; - - default: - console.warn(`ignoring unrecognised RTE command ${type}`); - return false; - } - - this.onChange(change); - - return true; - } else { -/* - const contentState = this.state.editorState.getCurrentContent(); - const multipleLinesSelected = RichText.hasMultiLineSelection(this.state.editorState); - - const selectionState = this.state.editorState.getSelection(); - const start = selectionState.getStartOffset(); - const end = selectionState.getEndOffset(); - - // If multiple lines are selected or nothing is selected, insert a code block - // instead of applying inline code formatting. This is an attempt to mimic what - // happens in non-MD mode. - const treatInlineCodeAsBlock = multipleLinesSelected || start === end; - const textMdCodeBlock = (text) => `\`\`\`\n${text}\n\`\`\`\n`; - const modifyFn = { - 'bold': (text) => `**${text}**`, - 'italic': (text) => `*${text}*`, - 'underline': (text) => `${text}`, - 'strike': (text) => `${text}`, - // ("code" is triggered by ctrl+j by draft-js by default) - 'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``, - 'code': textMdCodeBlock, - 'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n', - 'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''), - 'ordered-list-item': (text) => text.split('\n').map((line, i) => `\n${i + 1}. ${line}`).join(''), - }[command]; - - const selectionAfterOffset = { - 'bold': -2, - 'italic': -1, - 'underline': -4, - 'strike': -6, - 'code': treatInlineCodeAsBlock ? -5 : -1, - 'code': -5, - 'blockquote': -2, - }[command]; - - // Returns a function that collapses a selection to its end and moves it by offset - const collapseAndOffsetSelection = (selection, offset) => { - const key = selection.endKey(); - return new Range({ - anchorKey: key, anchor.offset: offset, - focus.key: key, focus.offset: offset, - }); - }; - - if (modifyFn) { - - const previousSelection = this.state.editorState.getSelection(); - const newContentState = RichText.modifyText(contentState, previousSelection, modifyFn); - newState = EditorState.push( - this.state.editorState, - newContentState, - 'insert-characters', - ); - - let newSelection = newContentState.getSelectionAfter(); - // If the selection range is 0, move the cursor inside the formatted body - if (previousSelection.getStartOffset() === previousSelection.getEndOffset() && - previousSelection.getStartKey() === previousSelection.getEndKey() && - selectionAfterOffset !== undefined - ) { - const selectedBlock = newContentState.getBlockForKey(previousSelection.getAnchorKey()); - const blockLength = selectedBlock.getText().length; - const newOffset = blockLength + selectionAfterOffset; - newSelection = collapseAndOffsetSelection(newSelection, newOffset); - } - - newState = EditorState.forceSelection(newState, newSelection); - } - } - - if (newState != null) { - this.setState({editorState: newState}); - return true; - } -*/ - } - return false; - }; - - onPaste = (event: Event, change: Change, editor: Editor): Change => { - const transfer = getEventTransfer(event); - - switch (transfer.type) { - case 'files': - // This actually not so much for 'files' as such (at time of writing - // neither chrome nor firefox let you paste a plain file copied - // from Finder) but more images copied from a different website - // / word processor etc. - return ContentMessages.sharedInstance().sendContentListToRoom( - transfer.files, this.props.room.roomId, this.client, - ); - case 'html': { - if (this.state.isRichTextEnabled) { - // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means - // that we will silently discard nested blocks (e.g. nested lists) :( - const fragment = this.html.deserialize(transfer.html); - return change - // XXX: this somehow makes Slate barf on undo and get too empty and break entirely - // .setOperationFlag("skip", false) - // .setOperationFlag("merge", false) - .insertFragment(fragment.document); - } else { - // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain - return change.withoutMerging(() => { - change.insertText(transfer.text); - }); - } - } - case 'text': - // don't skip/merge so that multiple consecutive pastes can be undone individually - return change.withoutMerging(() => { - change.insertText(transfer.text); - }); - } - }; - - handleReturn = (ev, change) => { - const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0; - if (ev.shiftKey || (isMac && ev.altKey)) { - return change.insertText('\n'); - } - - if (this.autocomplete.hasSelection()) { - this.autocomplete.hide(); - ev.preventDefault(); - return true; - } - - const editorState = this.state.editorState; - - const lastBlock = editorState.blocks.last(); - if (['code', 'block-quote', 'list-item'].includes(lastBlock.type)) { - const text = lastBlock.text; - if (text === '') { - // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock` - return change - .setBlocks(DEFAULT_NODE) - .unwrapBlock('bulleted-list') - .unwrapBlock('numbered-list'); - } - - // TODO strip trailing lines from blockquotes/list entries - // the below code seemingly works but doesn't account for edge cases like return with caret not at end - /* const trailingNewlines = text.match(/\n*$/); - if (trailingNewlines && trailingNewlines[0]) { - remove trailing newlines at the end of this block before making a new one - return change.deleteBackward(trailingNewlines[0].length); - }*/ - - return; - } - - let contentText; - let contentHTML; - - // only look for commands if the first block contains simple unformatted text - // i.e. no pills or rich-text formatting and begins with a /. - let cmd; let commandText; - const firstChild = editorState.document.nodes.get(0); - const firstGrandChild = firstChild && firstChild.nodes.get(0); - if (firstChild && firstGrandChild && - firstChild.object === 'block' && firstGrandChild.object === 'text' && - firstGrandChild.text[0] === '/') { - commandText = this.plainWithIdPills.serialize(editorState); - cmd = processCommandInput(this.props.room.roomId, commandText); - } - - if (cmd) { - if (!cmd.error) { - this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown'); - this.setState({ - editorState: this.createEditorState(), - }, ()=>{ - this._editor.focus(); - }); - } - if (cmd.promise) { - cmd.promise.then(()=>{ - console.log("Command success."); - }, (err)=>{ - console.error("Command failure: %s", err); - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Server error', '', ErrorDialog, { - title: _t("Server error"), - description: ((err && err.message) ? err.message : _t( - "Server unavailable, overloaded, or something else went wrong.", - )), - }); - }); - } else if (cmd.error) { - console.error(cmd.error); - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - // TODO possibly track which command they ran (not its Arguments) here - Modal.createTrackedDialog('Command error', '', ErrorDialog, { - title: _t("Command error"), - description: cmd.error, - }); - } - return true; - } - - const replyingToEv = RoomViewStore.getQuotingEvent(); - const mustSendHTML = Boolean(replyingToEv); - - if (this.state.isRichTextEnabled) { - // We should only send HTML if any block is styled or contains inline style - let shouldSendHTML = false; - - if (mustSendHTML) shouldSendHTML = true; - - if (!shouldSendHTML) { - shouldSendHTML = !!editorState.document.findDescendant(node => { - // N.B. node.getMarks() might be private? - return ((node.object === 'block' && node.type !== 'paragraph') || - (node.object === 'inline') || - (node.object === 'text' && node.getMarks().size > 0)); - }); - } - - contentText = this.plainWithPlainPills.serialize(editorState); - if (contentText === '') return true; - - if (shouldSendHTML) { - contentHTML = HtmlUtils.processHtmlForSending(this.html.serialize(editorState)); - } - } else { - const sourceWithPills = this.plainWithMdPills.serialize(editorState); - if (sourceWithPills === '') return true; - - const mdWithPills = new Markdown(sourceWithPills); - - // if contains no HTML and we're not quoting (needing HTML) - if (mdWithPills.isPlainText() && !mustSendHTML) { - // N.B. toPlainText is only usable here because we know that the MD - // didn't contain any formatting in the first place... - contentText = mdWithPills.toPlaintext(); - } else { - // to avoid ugliness on clients which ignore the HTML body we don't - // send pills in the plaintext body. - contentText = this.plainWithPlainPills.serialize(editorState); - contentHTML = mdWithPills.toHTML(); - } - } - - let sendHtmlFn = ContentHelpers.makeHtmlMessage; - let sendTextFn = ContentHelpers.makeTextMessage; - - this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown'); - - if (commandText && commandText.startsWith('/me')) { - if (replyingToEv) { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Emote Reply Fail', '', ErrorDialog, { - title: _t("Unable to reply"), - description: _t("At this time it is not possible to reply with an emote."), - }); - return false; - } - - contentText = contentText.substring(4); - // bit of a hack, but the alternative would be quite complicated - if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, ''); - sendHtmlFn = ContentHelpers.makeHtmlEmote; - sendTextFn = ContentHelpers.makeEmoteMessage; - } - - let content = contentHTML ? - sendHtmlFn(contentText, contentHTML) : - sendTextFn(contentText); - - if (replyingToEv) { - const replyContent = ReplyThread.makeReplyMixIn(replyingToEv); - content = Object.assign(replyContent, content); - - // Part of Replies fallback support - prepend the text we're sending - // with the text we're replying to - const nestedReply = ReplyThread.getNestedReplyText(replyingToEv, this.props.permalinkCreator); - if (nestedReply) { - if (content.formatted_body) { - content.formatted_body = nestedReply.html + content.formatted_body; - } - content.body = nestedReply.body + content.body; - } - - // Clear reply_to_event as we put the message into the queue - // if the send fails, retry will handle resending. - dis.dispatch({ - action: 'reply_to_event', - event: null, - }); - } - - this.client.sendMessage(this.props.room.roomId, content).then((res) => { - dis.dispatch({ - action: 'message_sent', - }); - }).catch((e) => { - onSendMessageFailed(e, this.props.room); - }); - - this.setState({ - editorState: this.createEditorState(), - }, ()=>{ this._editor.focus(); }); - - return true; - }; - - onVerticalArrow = (e, up) => { - if (e.ctrlKey || e.shiftKey || e.metaKey) return; - - const shouldSelectHistory = e.altKey; - const shouldEditLastMessage = !e.altKey && up && !RoomViewStore.getQuotingEvent(); - - if (shouldSelectHistory) { - // Try select composer history - const selected = this.selectHistory(up); - if (selected) { - // We're selecting history, so prevent the key event from doing anything else - e.preventDefault(); - } - } else if (shouldEditLastMessage) { - // selection must be collapsed - const selection = this.state.editorState.selection; - if (!selection.isCollapsed) return; - // and we must be at the edge of the document (up=start, down=end) - const document = this.state.editorState.document; - if (up) { - if (!selection.anchor.isAtStartOfNode(document)) return; - } else { - if (!selection.anchor.isAtEndOfNode(document)) return; - } - - const editEvent = findEditableEvent(this.props.room, false); - if (editEvent) { - // We're selecting history, so prevent the key event from doing anything else - e.preventDefault(); - dis.dispatch({ - action: 'edit_event', - event: editEvent, - }); - } - } - }; - - selectHistory = (up) => { - const delta = up ? -1 : 1; - - // True if we are not currently selecting history, but composing a message - if (this.historyManager.currentIndex === this.historyManager.history.length) { - // We can't go any further - there isn't any more history, so nop. - if (!up) { - return; - } - this.setState({ - currentlyComposedEditorState: this.state.editorState, - }); - } else if (this.historyManager.currentIndex + delta === this.historyManager.history.length) { - // True when we return to the message being composed currently - this.setState({ - editorState: this.state.currentlyComposedEditorState, - }); - this.historyManager.currentIndex = this.historyManager.history.length; - return; - } - - let editorState; - const historyItem = this.historyManager.getItem(delta); - if (!historyItem) return; - - if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) { - editorState = this.richToMdEditorState(historyItem.value); - } else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) { - editorState = this.mdToRichEditorState(historyItem.value); - } else { - editorState = historyItem.value; - } - - // Move selection to the end of the selected history - const change = editorState.change().moveToEndOfNode(editorState.document); - - // We don't call this.onChange(change) now, as fixups on stuff like pills - // should already have been done and persisted in the history. - editorState = change.value; - - this.suppressAutoComplete = true; - - this.setState({ editorState }, ()=>{ - this._editor.focus(); - }); - return true; - }; - - onTab = async (e) => { - this.setState({ - someCompletions: null, - }); - e.preventDefault(); - if (this.autocomplete.countCompletions() === 0) { - // Force completions to show for the text currently entered - const completionCount = await this.autocomplete.forceComplete(); - this.setState({ - someCompletions: completionCount > 0, - }); - // Select the first item by moving "down" - await this.autocomplete.moveSelection(+1); - } else { - await this.autocomplete.moveSelection(e.shiftKey ? -1 : +1); - } - }; - - onEscape = async (e) => { - e.preventDefault(); - if (this.autocomplete) { - this.autocomplete.onEscape(e); - } - await this.setDisplayedCompletion(null); // restore originalEditorState - }; - - onAutocompleteConfirm = (displayedCompletion: ?Completion) => { - this.focusComposer(); - // XXX: this fails if the composer isn't focused so focus it and delay the completion until next tick - setImmediate(() => { - this.setDisplayedCompletion(displayedCompletion); - }); - }; - - /* If passed null, restores the original editor content from state.originalEditorState. - * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState. - */ - setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => { - const activeEditorState = this.state.originalEditorState || this.state.editorState; - - if (displayedCompletion == null) { - if (this.state.originalEditorState) { - const editorState = this.state.originalEditorState; - this.setState({editorState}); - } - return false; - } - - const { - range = null, - completion = '', - completionId = '', - href = null, - suffix = '', - } = displayedCompletion; - - let inline; - if (href) { - inline = Inline.create({ - type: 'pill', - data: { completion, completionId, href }, - }); - } else if (completion === '@room') { - inline = Inline.create({ - type: 'pill', - data: { completion, completionId }, - }); - } - - let editorState = activeEditorState; - - if (range) { - const change = editorState.change() - .moveToAnchor() - .moveAnchorTo(range.start) - .moveFocusTo(range.end) - .focus(); - editorState = change.value; - } - - let change; - if (inline) { - change = editorState.change() - .insertInlineAtRange(editorState.selection, inline) - .insertText(suffix) - .focus(); - } else { - change = editorState.change() - .insertTextAtRange(editorState.selection, completion) - .insertText(suffix) - .focus(); - } - // for good hygiene, keep editorState updated to track the result of the change - // even though we don't do anything subsequently with it - editorState = change.value; - - this.onChange(change, activeEditorState); - - return true; - }; - - renderNode = props => { - const { attributes, children, node, isSelected } = props; - - switch (node.type) { - case 'paragraph': - return

    {children}

    ; - case 'block-quote': - return
    {children}
    ; - case 'bulleted-list': - return
      {children}
    ; - case 'heading1': - return

    {children}

    ; - case 'heading2': - return

    {children}

    ; - case 'heading3': - return

    {children}

    ; - case 'heading4': - return

    {children}

    ; - case 'heading5': - return
    {children}
    ; - case 'heading6': - return
    {children}
    ; - case 'list-item': - return
  • {children}
    • ; - case 'numbered-list': - return
      {children}
    ; - case 'code': - return 
    {children}
    ; - case 'link': - return {children}; - case 'pill': { - const { data } = node; - const url = data.get('href'); - const completion = data.get('completion'); - - const shouldShowPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar"); - const Pill = sdk.getComponent('elements.Pill'); - - if (completion === '@room') { - return ; - } else if (Pill.isPillUrl(url)) { - return ; - } else { - const { text } = node; - return - { text } - ; - } - } - case 'emoji': { - const { data } = node; - return data.get('emojiUnicode'); - } - } - }; - - renderMark = props => { - const { children, mark, attributes } = props; - switch (mark.type) { - case 'bold': - return {children}; - case 'italic': - return {children}; - case 'code': - return {children}; - case 'underlined': - return {children}; - case 'deleted': - return {children}; - } - }; - - onFormatButtonClicked = (name, e) => { - e.preventDefault(); - - // XXX: horrible evil hack to ensure the editor is focused so the act - // of focusing it doesn't then cancel the format button being pressed - // FIXME: can we just tell handleKeyCommand's change to invoke .focus()? - if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') { - this._editor.focus(); - setTimeout(()=>{ - this.handleKeyCommand(name); - }, 500); // can't find any callback to hook this to. onFocus and onChange and willComponentUpdate fire too early. - return; - } - - this.handleKeyCommand(name); - }; - - getAutocompleteQuery(editorState: Value) { - // We can just return the current block where the selection begins, which - // should be enough to capture any autocompletion input, given autocompletion - // providers only search for the first match which intersects with the current selection. - // This avoids us having to serialize the whole thing to plaintext and convert - // selection offsets in & out of the plaintext domain. - - if (editorState.selection.anchor.key) { - return editorState.document.getDescendant(editorState.selection.anchor.key).text; - } else { - return ''; - } - } - - getSelectionRange(editorState: Value) { - let beginning = false; - const firstChild = editorState.document.nodes.get(0); - const firstGrandChild = firstChild && firstChild.nodes.get(0); - beginning = (firstChild && firstGrandChild && - firstChild.object === 'block' && firstGrandChild.object === 'text' && - editorState.selection.anchor.key === firstGrandChild.key); - - // return a character range suitable for handing to an autocomplete provider. - // the range is relative to the anchor of the current editor selection. - // if the selection spans multiple blocks, then we collapse it for the calculation. - const range = { - beginning, // whether the selection is in the first block of the editor or not - start: editorState.selection.anchor.offset, - end: (editorState.selection.anchor.key == editorState.selection.focus.key) ? - editorState.selection.focus.offset : editorState.selection.anchor.offset, - }; - if (range.start > range.end) { - const tmp = range.start; - range.start = range.end; - range.end = tmp; - } - return range; - } - - onMarkdownToggleClicked = (e) => { - e.preventDefault(); // don't steal focus from the editor! - this.handleKeyCommand('toggle-mode'); - }; - - focusComposer = () => { - this._editor.focus(); - }; - - render() { - const activeEditorState = this.state.originalEditorState || this.state.editorState; - - const className = classNames('mx_MessageComposer_input', { - mx_MessageComposer_input_error: this.state.someCompletions === false, - }); - - const isEmpty = Plain.serialize(this.state.editorState) === ''; - - let {placeholder} = this.props; - // XXX: workaround for placeholder being shown when there is a formatting block e.g blockquote but no text - if (isEmpty && this.state.editorState.startBlock && this.state.editorState.startBlock.type !== DEFAULT_NODE) { - placeholder = undefined; - } - - const markdownClasses = classNames({ - mx_MessageComposer_input_markdownIndicator: true, - mx_MessageComposer_markdownDisabled: this.state.isRichTextEnabled, - }); - - return ( -
    -
    - - this.autocomplete = e} - room={this.props.room} - onConfirm={this.onAutocompleteConfirm} - onSelectionChange={this.setDisplayedCompletion} - query={ this.suppressAutoComplete ? '' : this.getAutocompleteQuery(activeEditorState) } - selection={this.getSelectionRange(activeEditorState)} - /> -
    -
    - - -
    -
    - ); - } -} diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js deleted file mode 100644 index 2b68e0d338..0000000000 --- a/src/components/views/rooms/SlateMessageComposer.js +++ /dev/null @@ -1,485 +0,0 @@ -/* -Copyright 2015, 2016 OpenMarket Ltd -Copyright 2017, 2018 New Vector Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -import React, {createRef} from 'react'; -import PropTypes from 'prop-types'; -import { _t, _td } from '../../../languageHandler'; -import CallHandler from '../../../CallHandler'; -import MatrixClientPeg from '../../../MatrixClientPeg'; -import sdk from '../../../index'; -import dis from '../../../dispatcher'; -import RoomViewStore from '../../../stores/RoomViewStore'; -import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore"; -import Stickerpicker from './Stickerpicker'; -import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks'; -import ContentMessages from '../../../ContentMessages'; - -import E2EIcon from './E2EIcon'; - -const formatButtonList = [ - _td("bold"), - _td("italic"), - _td("deleted"), - _td("underlined"), - _td("inline-code"), - _td("block-quote"), - _td("bulleted-list"), - _td("numbered-list"), -]; - -function ComposerAvatar(props) { - const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar'); - return
    - -
    ; -} - -ComposerAvatar.propTypes = { - me: PropTypes.object.isRequired, -} - -function CallButton(props) { - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const onVoiceCallClick = (ev) => { - dis.dispatch({ - action: 'place_call', - type: "voice", - room_id: props.roomId, - }); - }; - - return -} - -CallButton.propTypes = { - roomId: PropTypes.string.isRequired -} - -function VideoCallButton(props) { - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const onCallClick = (ev) => { - dis.dispatch({ - action: 'place_call', - type: ev.shiftKey ? "screensharing" : "video", - room_id: props.roomId, - }); - }; - - return ; -} - -VideoCallButton.propTypes = { - roomId: PropTypes.string.isRequired, -}; - -function HangupButton(props) { - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const onHangupClick = () => { - const call = CallHandler.getCallForRoom(props.roomId); - if (!call) { - return; - } - dis.dispatch({ - action: 'hangup', - // hangup the call for this room, which may not be the room in props - // (e.g. conferences which will hangup the 1:1 room instead) - room_id: call.roomId, - }); - }; - return ; -} - -HangupButton.propTypes = { - roomId: PropTypes.string.isRequired, -} - -function FormattingButton(props) { - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - return ; -} - -FormattingButton.propTypes = { - showFormatting: PropTypes.bool.isRequired, - onClickHandler: PropTypes.func.isRequired, -} - -class UploadButton extends React.Component { - static propTypes = { - roomId: PropTypes.string.isRequired, - } - constructor(props) { - super(props); - this.onUploadClick = this.onUploadClick.bind(this); - this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this); - - this._uploadInput = createRef(); - } - - onUploadClick(ev) { - if (MatrixClientPeg.get().isGuest()) { - dis.dispatch({action: 'require_registration'}); - return; - } - this._uploadInput.current.click(); - } - - onUploadFileInputChange(ev) { - if (ev.target.files.length === 0) return; - - // take a copy so we can safely reset the value of the form control - // (Note it is a FileList: we can't use slice or sesnible iteration). - const tfiles = []; - for (let i = 0; i < ev.target.files.length; ++i) { - tfiles.push(ev.target.files[i]); - } - - ContentMessages.sharedInstance().sendContentListToRoom( - tfiles, this.props.roomId, MatrixClientPeg.get(), - ); - - // This is the onChange handler for a file form control, but we're - // not keeping any state, so reset the value of the form control - // to empty. - // NB. we need to set 'value': the 'files' property is immutable. - ev.target.value = ''; - } - - render() { - const uploadInputStyle = {display: 'none'}; - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - return ( - - - - ); - } -} - -export default class SlateMessageComposer extends React.Component { - constructor(props) { - super(props); - this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this); - this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this); - this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this); - this.onInputStateChanged = this.onInputStateChanged.bind(this); - this.onEvent = this.onEvent.bind(this); - this._onRoomStateEvents = this._onRoomStateEvents.bind(this); - this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this); - this._onTombstoneClick = this._onTombstoneClick.bind(this); - this.renderPlaceholderText = this.renderPlaceholderText.bind(this); - this.renderFormatBar = this.renderFormatBar.bind(this); - - this.state = { - inputState: { - marks: [], - blockType: null, - isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'), - }, - showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'), - isQuoting: Boolean(RoomViewStore.getQuotingEvent()), - tombstone: this._getRoomTombstone(), - canSendMessages: this.props.room.maySendMessage(), - }; - } - - componentDidMount() { - // N.B. using 'event' rather than 'RoomEvents' otherwise the crypto handler - // for 'event' fires *after* 'RoomEvent', and our room won't have yet been - // marked as encrypted. - // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something. - MatrixClientPeg.get().on("event", this.onEvent); - MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents); - this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate); - this._waitForOwnMember(); - } - - _waitForOwnMember() { - // if we have the member already, do that - const me = this.props.room.getMember(MatrixClientPeg.get().getUserId()); - if (me) { - this.setState({me}); - return; - } - // Otherwise, wait for member loading to finish and then update the member for the avatar. - // The members should already be loading, and loadMembersIfNeeded - // will return the promise for the existing operation - this.props.room.loadMembersIfNeeded().then(() => { - const me = this.props.room.getMember(MatrixClientPeg.get().getUserId()); - this.setState({me}); - }); - } - - componentWillUnmount() { - if (MatrixClientPeg.get()) { - MatrixClientPeg.get().removeListener("event", this.onEvent); - MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents); - } - if (this._roomStoreToken) { - this._roomStoreToken.remove(); - } - } - - onEvent(event) { - if (event.getType() !== 'm.room.encryption') return; - if (event.getRoomId() !== this.props.room.roomId) return; - this.forceUpdate(); - } - - _onRoomStateEvents(ev, state) { - if (ev.getRoomId() !== this.props.room.roomId) return; - - if (ev.getType() === 'm.room.tombstone') { - this.setState({tombstone: this._getRoomTombstone()}); - } - if (ev.getType() === 'm.room.power_levels') { - this.setState({canSendMessages: this.props.room.maySendMessage()}); - } - } - - _getRoomTombstone() { - return this.props.room.currentState.getStateEvents('m.room.tombstone', ''); - } - - _onRoomViewStoreUpdate() { - const isQuoting = Boolean(RoomViewStore.getQuotingEvent()); - if (this.state.isQuoting === isQuoting) return; - this.setState({ isQuoting }); - } - - - onInputStateChanged(inputState) { - // Merge the new input state with old to support partial updates - inputState = Object.assign({}, this.state.inputState, inputState); - this.setState({inputState}); - } - - _onAutocompleteConfirm(range, completion) { - if (this.messageComposerInput) { - this.messageComposerInput.setDisplayedCompletion(range, completion); - } - } - - onFormatButtonClicked(name, event) { - event.preventDefault(); - this.messageComposerInput.onFormatButtonClicked(name, event); - } - - onToggleFormattingClicked() { - SettingsStore.setValue("MessageComposer.showFormatting", null, SettingLevel.DEVICE, !this.state.showFormatting); - this.setState({showFormatting: !this.state.showFormatting}); - } - - onToggleMarkdownClicked(e) { - e.preventDefault(); // don't steal focus from the editor! - this.messageComposerInput.enableRichtext(!this.state.inputState.isRichTextEnabled); - } - - _onTombstoneClick(ev) { - ev.preventDefault(); - - const replacementRoomId = this.state.tombstone.getContent()['replacement_room']; - const replacementRoom = MatrixClientPeg.get().getRoom(replacementRoomId); - let createEventId = null; - if (replacementRoom) { - const createEvent = replacementRoom.currentState.getStateEvents('m.room.create', ''); - if (createEvent && createEvent.getId()) createEventId = createEvent.getId(); - } - - const viaServers = [this.state.tombstone.getSender().split(':').splice(1).join(':')]; - dis.dispatch({ - action: 'view_room', - highlighted: true, - event_id: createEventId, - room_id: replacementRoomId, - auto_join: true, - - // Try to join via the server that sent the event. This converts @something:example.org - // into a server domain by splitting on colons and ignoring the first entry ("@something"). - via_servers: viaServers, - opts: { - // These are passed down to the js-sdk's /join call - viaServers: viaServers, - }, - }); - } - - renderPlaceholderText() { - const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId); - if (this.state.isQuoting) { - if (roomIsEncrypted) { - return _t('Send an encrypted reply…'); - } else { - return _t('Send a reply (unencrypted)…'); - } - } else { - if (roomIsEncrypted) { - return _t('Send an encrypted message…'); - } else { - return _t('Send a message (unencrypted)…'); - } - } - } - - renderFormatBar() { - const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); - const {marks, blockType} = this.state.inputState; - const formatButtons = formatButtonList.map((name) => { - // special-case to match the md serializer and the special-case in MessageComposerInput.js - const markName = name === 'inline-code' ? 'code' : name; - const active = marks.some(mark => mark.type === markName) || blockType === name; - const suffix = active ? '-on' : ''; - const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name); - const className = 'mx_MessageComposer_format_button mx_filterFlipColor'; - return ( - - ); - }) - - return ( -
    -
    - { formatButtons } -
    - - -
    -
    - ); - } - - render() { - const controls = [ - this.state.me ? : null, - this.props.e2eStatus ? : null, - ]; - - if (!this.state.tombstone && this.state.canSendMessages) { - // This also currently includes the call buttons. Really we should - // check separately for whether we can call, but this is slightly - // complex because of conference calls. - - const MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput"); - const showFormattingButton = this.state.inputState.isRichTextEnabled; - const callInProgress = this.props.callState && this.props.callState !== 'ended'; - - controls.push( - this.messageComposerInput = c} - key="controls_input" - room={this.props.room} - placeholder={this.renderPlaceholderText()} - onInputStateChanged={this.onInputStateChanged} - permalinkCreator={this.props.permalinkCreator} />, - showFormattingButton ? : null, - , - , - callInProgress ? : null, - callInProgress ? null : , - callInProgress ? null : , - ); - } else if (this.state.tombstone) { - const replacementRoomId = this.state.tombstone.getContent()['replacement_room']; - - const continuesLink = replacementRoomId ? ( - - {_t("The conversation continues here.")} - - ) : ''; - - controls.push(
    -
    - - - {_t("This room has been replaced and is no longer active.")} -
    - { continuesLink } -
    -
    ); - } else { - controls.push( -
    - { _t('You do not have permission to post to this room') } -
    , - ); - } - - const showFormatBar = this.state.showFormatting && this.state.inputState.isRichTextEnabled; - - return ( -
    -
    -
    - { controls } -
    -
    - { showFormatBar ? this.renderFormatBar() : null } -
    - ); - } -} - -SlateMessageComposer.propTypes = { - // js-sdk Room object - room: PropTypes.object.isRequired, - - // string representing the current voip call state - callState: PropTypes.string, - - // string representing the current room app drawer state - showApps: PropTypes.bool -}; diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js index 6fc854c155..a8a393887b 100644 --- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js @@ -26,7 +26,6 @@ import PlatformPeg from "../../../../../PlatformPeg"; export default class PreferencesUserSettingsTab extends React.Component { static COMPOSER_SETTINGS = [ - 'useCiderComposer', 'MessageComposerInput.autoReplaceEmoji', 'MessageComposerInput.suggestEmoji', 'sendTypingNotifications', diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5d32066fd8..9c2105afab 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -362,7 +362,6 @@ "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)", "Show info about bridges in room settings": "Show info about bridges in room settings", - "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages", "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing", "Use compact timeline layout": "Use compact timeline layout", "Show a placeholder for removed messages": "Show a placeholder for removed messages", @@ -956,13 +955,6 @@ "Strikethrough": "Strikethrough", "Code block": "Code block", "Quote": "Quote", - "Server error": "Server error", - "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.", - "Command error": "Command error", - "Unable to reply": "Unable to reply", - "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.", - "Markdown is disabled": "Markdown is disabled", - "Markdown is enabled": "Markdown is enabled", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", @@ -1064,16 +1056,9 @@ "This Room": "This Room", "All Rooms": "All Rooms", "Search…": "Search…", - "bold": "bold", - "italic": "italic", - "deleted": "deleted", - "underlined": "underlined", - "inline-code": "inline-code", - "block-quote": "block-quote", - "bulleted-list": "bulleted-list", - "numbered-list": "numbered-list", - "Show Text Formatting Toolbar": "Show Text Formatting Toolbar", - "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar", + "Server error": "Server error", + "Command error": "Command error", + "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.", "Failed to connect to integration manager": "Failed to connect to integration manager", "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled", "Add some now": "Add some now", diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 1d24e81469..14208e1f03 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -161,11 +161,6 @@ export const SETTINGS = { displayName: _td("Show info about bridges in room settings"), default: false, }, - "useCiderComposer": { - displayName: _td("Use the new, faster, composer for writing messages"), - supportedLevels: LEVELS_ACCOUNT_SETTINGS, - default: true, - }, "MessageComposerInput.suggestEmoji": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td('Enable Emoji suggestions while typing'), diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js deleted file mode 100644 index ab2dbfedec..0000000000 --- a/src/stores/MessageComposerStore.js +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2017, 2018 Vector Creations Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -import { Value } from 'slate'; - -const localStoragePrefix = 'editor_state_'; - -/** - * A class for storing application state to do with the message composer (specifically in-progress message drafts). - * It does not worry about cleaning up on log out as this is handled in Lifecycle.js by localStorage.clear() - */ -class MessageComposerStore { - constructor() { - this.prefix = localStoragePrefix; - } - - _getKey(roomId: string): string { - return this.prefix + roomId; - } - - setEditorState(roomId: string, editorState: Value, richText: boolean) { - localStorage.setItem(this._getKey(roomId), JSON.stringify({ - editor_state: editorState.toJSON({ - preserveSelection: true, - // XXX: re-hydrating history is not currently supported by fromJSON - // preserveHistory: true, - // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath - preserveKeys: true, - }), - rich_text: richText, - })); - } - - getEditorState(roomId): {editor_state: Value, rich_text: boolean} { - const stateStr = localStorage.getItem(this._getKey(roomId)); - - let state; - if (stateStr) { - state = JSON.parse(stateStr); - - // if it does not have the fields we expect then bail - if (!state || state.rich_text === undefined || state.editor_state === undefined) return; - state.editor_state = Value.fromJSON(state.editor_state); - } - - return state; - } -} - -let singletonMessageComposerStore = null; -if (!singletonMessageComposerStore) { - singletonMessageComposerStore = new MessageComposerStore(); -} -module.exports = singletonMessageComposerStore; diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js index 60380eecd2..518e7e06ac 100644 --- a/test/components/views/rooms/MessageComposerInput-test.js +++ b/test/components/views/rooms/MessageComposerInput-test.js @@ -19,7 +19,7 @@ function addTextToDraft(text) { } } -// FIXME: These tests need to be updated from Draft to Slate. +// FIXME: These tests need to be updated from Draft to CIDER. xdescribe('MessageComposerInput', () => { let parentDiv = null, diff --git a/yarn.lock b/yarn.lock index fc2b9e04c4..a491ba3941 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2592,11 +2592,6 @@ dir-glob@^2.2.2: dependencies: path-type "^3.0.0" -direction@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/direction/-/direction-0.1.5.tgz#ce5d797f97e26f8be7beff53f7dc40e1c1a9ec4c" - integrity sha1-zl15f5fib4vnvv9T99xA4cGp7Ew= - doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -3065,11 +3060,6 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -esrever@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8" - integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g= - estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" @@ -3653,11 +3643,6 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-document@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-document/-/get-document-1.0.0.tgz#4821bce66f1c24cb0331602be6cb6b12c4f01c4b" - integrity sha1-SCG85m8cJMsDMWAr5strEsTwHEs= - get-stdin@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" @@ -3675,13 +3660,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -get-window@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-window/-/get-window-1.1.2.tgz#65fbaa999fb87f86ea5d30770f4097707044f47f" - integrity sha512-yjWpFcy9fjhLQHW1dPtg9ga4pmizLY8y4ZSHdGrAQ1NU277MRhnGnnLPxe19X8W5lWVsCZz++5xEuNozWMVmTw== - dependencies: - get-document "1" - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -4509,16 +4487,6 @@ is-hexadecimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee" integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA== -is-hotkey@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-hotkey/-/is-hotkey-0.1.4.tgz#c34d2c85d6ec8d09a871dcf71931c8067a824c7d" - integrity sha512-Py+aW4r5mBBY18TGzGz286/gKS+fCQ0Hee3qkaiSmEPiD0PqFpe0wuA3l7rTOUKyeXl8Mxf3XzJxIoTlSv+kxA== - -is-in-browser@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= - is-ip@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-2.0.0.tgz#68eea07e8a0a0a94c2d080dd674c731ab2a461ab" @@ -4651,11 +4619,6 @@ is-whitespace-character@^1.0.0: resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac" integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ== -is-window@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d" - integrity sha1-LIlspT25feRdPDMTOmXYyfVjSA0= - is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4715,11 +4678,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-base64@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/isomorphic-base64/-/isomorphic-base64-1.0.2.tgz#f426aae82569ba8a4ec5ca73ad21a44ab1ee7803" - integrity sha1-9Caq6CVpuopOxcpzrSGkSrHueAM= - isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" @@ -5154,7 +5112,7 @@ lodash.unescape@4.0.1: resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw= -lodash@^4.1.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -5379,11 +5337,6 @@ memoize-one@^3.0.1: resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17" integrity sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA== -memoize-one@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.1.0.tgz#a2387c58c03fff27ca390c31b764a79addf3f906" - integrity sha512-2GApq0yI/b22J2j9rhbrAlsHb0Qcz+7yWxeLG8h+95sl1XPUgeLimQSOdur4Vw7cUhrBHwaUZxWFZueojqNRzA== - memory-fs@^0.4.0, memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -6715,11 +6668,6 @@ react-focus-lock@^2.2.1: dependencies: gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566 -react-immutable-proptypes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4" - integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ= - react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: version "16.12.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" @@ -7271,11 +7219,6 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -selection-is-backward@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/selection-is-backward/-/selection-is-backward-1.0.0.tgz#97a54633188a511aba6419fc5c1fa91b467e6be1" - integrity sha1-l6VGMxiKURq6ZBn8XB+pG0Z+a+E= - "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -7371,93 +7314,6 @@ slash@^2.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== -slate-base64-serializer@^0.2.69: - version "0.2.112" - resolved "https://registry.yarnpkg.com/slate-base64-serializer/-/slate-base64-serializer-0.2.112.tgz#791d04a0ae7b9796844f068a904e185f2afc91f9" - integrity sha512-Vo94bkCq8cbFj7Lutdh2RaM9S4WlLxnnMqZPKGUyefklUN4q2EzM/WUH7s9CIlLUH1qRfC/b0V25VJZr5XXTzA== - dependencies: - isomorphic-base64 "^1.0.2" - -slate-dev-environment@^0.2.0, slate-dev-environment@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/slate-dev-environment/-/slate-dev-environment-0.2.2.tgz#bd8946e1fe4cf5447060c84a362a1d026ed8b77f" - integrity sha512-JZ09llrRQu6JUsLJCUlGC0lB1r1qIAabAkSd454iyYBq6lDuY//Bypi3Jo8yzIfzZ4+mRLdQvl9e8MbeM9l48Q== - dependencies: - is-in-browser "^1.1.3" - -slate-dev-logger@^0.1.43: - version "0.1.43" - resolved "https://registry.yarnpkg.com/slate-dev-logger/-/slate-dev-logger-0.1.43.tgz#77f6ca7207fcbf453a5516f3aa8b19794d1d26dc" - integrity sha512-GkcPMGzmPVm85AL+jaKnzhIA0UH9ktQDEIDM+FuQtz+TAPcpPCQiRAaZ6I2p2uD0Hq9bImhKSCtHIa0qRxiVGw== - -slate-dev-warning@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/slate-dev-warning/-/slate-dev-warning-0.0.1.tgz#f6c36731babea5e301b5bd504fe64911dd24200a" - integrity sha512-QdXa+qmOG46VrTfnzn2gUVzs1WiO3Q+zCv3XomzMNGdgAJjCgHBs3jaeQD845h15loS3OJ181gCNAkB3dby6Hw== - -slate-hotkeys@^0.2.5: - version "0.2.9" - resolved "https://registry.yarnpkg.com/slate-hotkeys/-/slate-hotkeys-0.2.9.tgz#0cc9eb750a49ab9ef11601305b7c82b5402348e3" - integrity sha512-y+C/s5vJEmBxo8fIqHmUcdViGwALL/A6Qow3sNG1OHYD5SI11tC2gfYtGbPh+2q0H7O4lufffCmFsP5bMaDHqA== - dependencies: - is-hotkey "0.1.4" - slate-dev-environment "^0.2.2" - -slate-html-serializer@^0.6.1: - version "0.6.32" - resolved "https://registry.yarnpkg.com/slate-html-serializer/-/slate-html-serializer-0.6.32.tgz#69b0fcdb89a0bdcea28b60b6a90b944651ad3277" - integrity sha512-x1RP1R2HMaVFflk9UXiuepcbN4wMoJRv0VWtxFw8efGNFmJfNBWME4iXAy6GNFRV0rRPlG3xCuQv2wHZ/+JMYw== - dependencies: - slate-dev-logger "^0.1.43" - type-of "^2.0.1" - -"slate-md-serializer@github:matrix-org/slate-md-serializer#f7c4ad3": - version "3.1.0" - resolved "https://codeload.github.com/matrix-org/slate-md-serializer/tar.gz/f7c4ad394f5af34d4c623de7909ce95ab78072d3" - -slate-plain-serializer@^0.6.8: - version "0.6.39" - resolved "https://registry.yarnpkg.com/slate-plain-serializer/-/slate-plain-serializer-0.6.39.tgz#5fb8d4dc530a2e7e0689548d48964ce242c4516a" - integrity sha512-EGl+Y+9Fw9IULtPg8sttydaeiAoaibJolMXNfqI79+5GWTQwJFIbg24keKvsTw+3f2RieaPu8fcrKyujKtZ7ZQ== - -slate-prop-types@^0.4.67: - version "0.4.67" - resolved "https://registry.yarnpkg.com/slate-prop-types/-/slate-prop-types-0.4.67.tgz#c6aa74195466546a44fcb85d1c7b15fefe36ce6b" - integrity sha512-FmdwitAw1Y69JHm326dfwP6Zd6R99jz1Im8jvKcnG2hytk72I1vIv6ct2CkNGwc3sg90+OIO/Rf18frYxxoTzw== - -slate-react@^0.18.10: - version "0.18.11" - resolved "https://registry.yarnpkg.com/slate-react/-/slate-react-0.18.11.tgz#f452e7eb73f0271422d2a17e8090dcd8d889aef6" - integrity sha512-7u0+LLabGaxjWYb0oTqUDcs3iCvJdaZwcGW6hLc1hFv06KkwaIxAqYpP8dUBRVlQd+0/X0TdyagCmf0IjFSPhg== - dependencies: - debug "^3.1.0" - get-window "^1.1.1" - is-window "^1.0.2" - lodash "^4.1.1" - memoize-one "^4.0.0" - prop-types "^15.5.8" - react-immutable-proptypes "^2.1.0" - selection-is-backward "^1.0.0" - slate-base64-serializer "^0.2.69" - slate-dev-environment "^0.2.0" - slate-dev-warning "^0.0.1" - slate-hotkeys "^0.2.5" - slate-plain-serializer "^0.6.8" - slate-prop-types "^0.4.67" - -slate@^0.41.2: - version "0.41.3" - resolved "https://registry.yarnpkg.com/slate/-/slate-0.41.3.tgz#fa468de5db53afc453a0a7d7875b4de05737a900" - integrity sha512-I/ymHWRxtoSOWYKh/SFgW3Vkkojt5ywWf7Wh4oBvaKic/3mAsM1wymyZmhnvSKK59IeE0JJzD4uyyQaM1KEFHA== - dependencies: - debug "^3.1.0" - direction "^0.1.5" - esrever "^0.2.0" - is-plain-object "^2.0.4" - lodash "^4.17.4" - slate-dev-warning "^0.0.1" - type-of "^2.0.1" - slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -8264,11 +8120,6 @@ type-is@~1.6.17: media-typer "0.3.0" mime-types "~2.1.24" -type-of@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972" - integrity sha1-5yoXQYllaOn2KDeNgW1pEvfyOXI= - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" From 64754a3f88c8f531100b46359da7bce45267f2c6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 00:18:24 +0000 Subject: [PATCH 205/239] Add comment and delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/LinkPreviewWidget.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js index 4822848233..3b5545e0e0 100644 --- a/src/components/views/rooms/LinkPreviewWidget.js +++ b/src/components/views/rooms/LinkPreviewWidget.js @@ -19,7 +19,6 @@ import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import createReactClass from 'create-react-class'; import { AllHtmlEntities } from 'html-entities'; - import {linkifyElement} from '../../../HtmlUtils'; import SettingsStore from "../../../settings/SettingsStore"; import { _t } from "../../../languageHandler"; @@ -129,6 +128,10 @@ module.exports = createReactClass({ ; } + // The description includes &-encoded HTML entities, we decode those as React treats the thing as an + // opaque string. This does not allow any HTML to be injected into the DOM. + const description = AllHtmlEntities.decode(p["og:description"] || ""); + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); return (
    @@ -137,7 +140,7 @@ module.exports = createReactClass({
    { p["og:site_name"] ? (" - " + p["og:site_name"]) : null }
    - { AllHtmlEntities.decode(p["og:description"] || "") } + { description }
    From c802f9a302f0463d9029802df93a6d613baa658c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 00:23:19 +0000 Subject: [PATCH 206/239] remove unused stale Test Suite Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .eslintignore.errorfiles | 1 - .../views/rooms/MessageComposerInput-test.js | 303 ------------------ 2 files changed, 304 deletions(-) delete mode 100644 test/components/views/rooms/MessageComposerInput-test.js diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles index c3bb34ae26..36b03b121c 100644 --- a/.eslintignore.errorfiles +++ b/.eslintignore.errorfiles @@ -57,7 +57,6 @@ src/utils/Receipt.js src/Velociraptor.js test/components/structures/MessagePanel-test.js test/components/views/dialogs/InteractiveAuthDialog-test.js -test/components/views/rooms/MessageComposerInput-test.js test/mock-clock.js test/notifications/ContentRules-test.js test/notifications/PushRuleVectorState-test.js diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js deleted file mode 100644 index 518e7e06ac..0000000000 --- a/test/components/views/rooms/MessageComposerInput-test.js +++ /dev/null @@ -1,303 +0,0 @@ -import React from 'react'; -import ReactTestUtils from 'react-dom/test-utils'; -import ReactDOM from 'react-dom'; -import expect from 'expect'; -import sinon from 'sinon'; -import * as testUtils from '../../../test-utils'; -import sdk from 'matrix-react-sdk'; -const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput'); -import MatrixClientPeg from '../../../../src/MatrixClientPeg'; -import {sleep} from "../../../../src/utils/promise"; - -function addTextToDraft(text) { - const components = document.getElementsByClassName('public-DraftEditor-content'); - if (components && components.length) { - const textarea = components[0]; - const textEvent = document.createEvent('TextEvent'); - textEvent.initTextEvent('textInput', true, true, null, text); - textarea.dispatchEvent(textEvent); - } -} - -// FIXME: These tests need to be updated from Draft to CIDER. - -xdescribe('MessageComposerInput', () => { - let parentDiv = null, - sandbox = null, - client = null, - mci = null, - room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org'); - - beforeEach(function() { - testUtils.beforeEach(this); - sandbox = testUtils.stubClient(sandbox); - client = MatrixClientPeg.get(); - client.credentials = {userId: '@me:domain.com'}; - - parentDiv = document.createElement('div'); - document.body.appendChild(parentDiv); - mci = ReactDOM.render( - , - parentDiv); - }); - - afterEach((done) => { - // hack: let the component finish mounting before unmounting, to avoid - // warnings - // (please can we make the components not setState() after - // they are unmounted?) - sleep(10).done(() => { - if (parentDiv) { - ReactDOM.unmountComponentAtNode(parentDiv); - parentDiv.remove(); - parentDiv = null; - } - sandbox.restore(); - done(); - }); - }); - - // XXX this fails - xit('should change mode if indicator is clicked', (done) => { - mci.enableRichtext(true); - - setTimeout(() => { - const indicator = ReactTestUtils.findRenderedDOMComponentWithClass( - mci, - 'mx_MessageComposer_input_markdownIndicator'); - ReactTestUtils.Simulate.click(indicator); - - expect(mci.state.isRichTextEnabled).toEqual(false, 'should have changed mode'); - done(); - }); - }); - - it('should not send messages when composer is empty', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(true); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(false, 'should not send message'); - }); - - it('should not change content unnecessarily on RTE -> Markdown conversion', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(true); - addTextToDraft('a'); - mci.handleKeyCommand('toggle-mode'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('a'); - }); - - it('should not change content unnecessarily on Markdown -> RTE conversion', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('a'); - mci.handleKeyCommand('toggle-mode'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('a'); - }); - - it('should send emoji messages when rich text is enabled', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(true); - addTextToDraft('☹'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true, 'should send message'); - }); - - it('should send emoji messages when Markdown is enabled', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('☹'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true, 'should send message'); - }); - - // FIXME - // it('should convert basic Markdown to rich text correctly', () => { - // const spy = sinon.spy(client, 'sendHtmlMessage'); - // mci.enableRichtext(false); - // addTextToDraft('*abc*'); - // mci.handleKeyCommand('toggle-mode'); - // mci.handleReturn(sinon.stub()); - // console.error(spy.args[0][2]); - // expect(spy.args[0][2]).toContain('abc'); - // }); - // - // it('should convert basic rich text to Markdown correctly', () => { - // const spy = sinon.spy(client, 'sendHtmlMessage'); - // mci.enableRichtext(true); - // process.nextTick(() => { - // - // }); - // mci.handleKeyCommand('italic'); - // addTextToDraft('abc'); - // mci.handleKeyCommand('toggle-mode'); - // mci.handleReturn(sinon.stub()); - // expect(['_abc_', '*abc*']).toContain(spy.args[0][1]); - // }); - - it('should insert formatting characters in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - mci.handleKeyCommand('italic'); - mci.handleReturn(sinon.stub()); - expect(['__', '**']).toContain(spy.args[0][1].body); - }); - - it('should not entity-encode " in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('"'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('"'); - }); - - it('should escape characters without other markup in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('\\*escaped\\*'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('*escaped*'); - }); - - it('should escape characters with other markup in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('\\*escaped\\* *italic*'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('\\*escaped\\* *italic*'); - expect(spy.args[0][1].formatted_body).toEqual('*escaped* italic'); - }); - - it('should not convert -_- into a horizontal rule in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('-_-'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('-_-'); - }); - - it('should not strip tags in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('striked-out'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('striked-out'); - expect(spy.args[0][1].formatted_body).toEqual('striked-out'); - }); - - it('should not strike-through ~~~ in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('~~~striked-out~~~'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('~~~striked-out~~~'); - }); - - it('should not mark single unmarkedup paragraphs as HTML in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.'); - }); - - it('should not mark two unmarkedup paragraphs as HTML in Markdown mode', () => { - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.'); - mci.handleReturn(sinon.stub()); - - expect(spy.calledOnce).toEqual(true); - expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.'); - }); - - it('should strip tab-completed mentions so that only the display name is sent in the plain body in Markdown mode', () => { - // Sending a HTML message because we have entities in the composer (because of completions) - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(false); - mci.setDisplayedCompletion({ - completion: 'Some Member', - selection: mci.state.editorState.getSelection(), - href: `https://matrix.to/#/@some_member:domain.bla`, - }); - - mci.handleReturn(sinon.stub()); - - expect(spy.args[0][1].body).toEqual( - 'Some Member', - 'the plaintext body should only include the display name', - ); - expect(spy.args[0][1].formatted_body).toEqual( - 'Some Member', - 'the html body should contain an anchor tag with a matrix.to href and display name text', - ); - }); - - it('should strip tab-completed mentions so that only the display name is sent in the plain body in RTE mode', () => { - // Sending a HTML message because we have entities in the composer (because of completions) - const spy = sinon.spy(client, 'sendMessage'); - mci.enableRichtext(true); - mci.setDisplayedCompletion({ - completion: 'Some Member', - selection: mci.state.editorState.getSelection(), - href: `https://matrix.to/#/@some_member:domain.bla`, - }); - - mci.handleReturn(sinon.stub()); - - expect(spy.args[0][1].body).toEqual('Some Member'); - expect(spy.args[0][1].formatted_body).toEqual('Some Member'); - }); - - it('should not strip non-tab-completed mentions when manually typing MD', () => { - // Sending a HTML message because we have entities in the composer (because of completions) - const spy = sinon.spy(client, 'sendMessage'); - // Markdown mode enabled - mci.enableRichtext(false); - addTextToDraft('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)'); - - mci.handleReturn(sinon.stub()); - - expect(spy.args[0][1].body).toEqual('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)'); - expect(spy.args[0][1].formatted_body).toEqual('My Not-Tab-Completed Mention'); - }); - - it('should not strip arbitrary typed (i.e. not tab-completed) MD links', () => { - // Sending a HTML message because we have entities in the composer (because of completions) - const spy = sinon.spy(client, 'sendMessage'); - // Markdown mode enabled - mci.enableRichtext(false); - addTextToDraft('[Click here](https://some.lovely.url)'); - - mci.handleReturn(sinon.stub()); - - expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)'); - expect(spy.args[0][1].formatted_body).toEqual('Click here'); - }); -}); From 98ede6437e8d0132bec7ebe61a0dd3cc375c2729 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Sun, 5 Jan 2020 23:04:42 -0600 Subject: [PATCH 207/239] Use display name when pinned messages are changed Signed-off-by: Aaron Raimist --- src/TextForEvent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TextForEvent.js b/src/TextForEvent.js index c3c8396e26..2e79ff2044 100644 --- a/src/TextForEvent.js +++ b/src/TextForEvent.js @@ -473,7 +473,7 @@ function textForPowerEvent(event) { } function textForPinnedEvent(event) { - const senderName = event.getSender(); + const senderName = event.sender ? event.sender.name : event.getSender(); return _t("%(senderName)s changed the pinned messages for the room.", {senderName}); } From ac1d9b03bfbf1358ec3e092dc5a35c2e9c4598ad Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 09:35:14 +0000 Subject: [PATCH 208/239] undo one of the "fixes" Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/elements/SettingsFlag.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js index d62f3182fc..a3a6d18d33 100644 --- a/src/components/views/elements/SettingsFlag.js +++ b/src/components/views/elements/SettingsFlag.js @@ -34,13 +34,12 @@ module.exports = createReactClass({ getInitialState: function() { return { - // convert to Boolean to protect against null-capable "tri-state" Settings e.g fallbackICEServerAllowed - value: Boolean(SettingsStore.getValueAt( + value: SettingsStore.getValueAt( this.props.level, this.props.name, this.props.roomId, this.props.isExplicit, - )), + ), }; }, From 2af4cdf532f7e82388840f4afb13e352cdc97090 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Mon, 6 Jan 2020 10:05:50 +0000 Subject: [PATCH 209/239] Translated using Weblate (Albanian) Currently translated at 99.1% (1995 of 2014 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/ --- src/i18n/strings/sq.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 15576d8d9a..e833009d59 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -2009,5 +2009,12 @@ "Help": "Ndihmë", "Country Dropdown": "Menu Hapmbyll Vendesh", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Depozita e Fshehtë do të ujdiset duke përdorur hollësitë tuaja ekzistuese për kopjeruajtje kyçesh.Frazëkalimi juaj për në depozitën e fshehtë dhe kyçi i rimarrjes do të jenë të njëjtë me ata për kopjeruajtjen tuaj të kyçeve", - "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh" + "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh", + "Show info about bridges in room settings": "Shfaq te rregullime dhome të dhëna rreth urash", + "This bridge was provisioned by ": "Kjo urë është dhënë nga ", + "This bridge is managed by .": "Kjo urë administrohet nga .", + "Connected to on ": "Lidhur me në ", + "Connected via %(protocolName)s": "Lidhur përmes %(protocolName)s", + "Bridge Info": "Të dhëna Ure", + "Below is a list of bridges connected to this room.": "Më poshtë keni një listë urash të lidhura në këtë dhomë." } From 3b91b31534e7261d04fad63ad97791572eb2d2ef Mon Sep 17 00:00:00 2001 From: Osoitz Date: Mon, 6 Jan 2020 05:49:40 +0000 Subject: [PATCH 210/239] Translated using Weblate (Basque) Currently translated at 100.0% (2014 of 2014 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 7214c231e0..e0e667ecce 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -2018,5 +2018,19 @@ "Help": "Laguntza", "Country Dropdown": "Herrialde menua", "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as they were for your key backup": "Biltegi sekretua zure oraingo gakoen babes-kopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berdinak izango dira", - "Migrate from Key Backup": "Migratu gakoen babes-kopiatik" + "Migrate from Key Backup": "Migratu gakoen babes-kopiatik", + "New DM invite dialog (under development)": "Mezu zuzen bidezko gonbidapen elkarrizketa-koadro berria (garapenean)", + "Show info about bridges in room settings": "Erakutsi zubiei buruzko informazioa gelaren ezarpenetan", + "This bridge was provisioned by ": "Zubi hau erabiltzaileak hornitu du", + "This bridge is managed by .": "Zubi hau erabiltzaileak kudeatzen du.", + "Bridged into , on ": " kanalera zubia, protokoloan", + "Connected to on ": " kanalera konektatuta, sarean", + "Connected via %(protocolName)s": "%(protocolName)s bidez konektatuta", + "Bridge Info": "Zubiaren informazioa", + "Below is a list of bridges connected to this room.": "Behean gela honetara konektatutako zubien informazioa dago.", + "Show more": "Erakutsi gehiago", + "Recent Conversations": "Azken elkarrizketak", + "Direct Messages": "Mezu zuzenak", + "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Ez baduzu baten bat aurkitzen, eska egiezu bere erabiltzaile-izena, edo eman egiezu zurea (%(userId)s) edo profilera esteka.", + "Go": "Joan" } From 51a1507f47d06993574760ae190e7575096c2645 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Mon, 6 Jan 2020 07:27:45 +0000 Subject: [PATCH 211/239] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2014 of 2014 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index b755e16735..db75121f07 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2025,5 +2025,13 @@ "Recent Conversations": "最近的對話", "Direct Messages": "直接訊息", "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "如果您找不到某人，請向他們詢問他們的使用者名稱，或是分享您的使用者名稱 (%(userId)s) 或簡介連結。", - "Go": "到" + "Go": "到", + "Show info about bridges in room settings": "顯示關於聊天室設定中橋接相關的資訊", + "This bridge was provisioned by ": "此橋接由 配置", + "This bridge is managed by .": "此橋接由 管理。", + "Bridged into , on ": "橋接於 ，在 上", + "Connected to on ": "連線到 於 ", + "Connected via %(protocolName)s": "透過 %(protocolName)s 連線", + "Bridge Info": "橋接資訊", + "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。" } From d8a88387f349e2c995fbefa8d19e976f925559d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Mon, 6 Jan 2020 07:24:10 +0000 Subject: [PATCH 212/239] Translated using Weblate (French) Currently translated at 100.0% (2014 of 2014 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index a44df701f9..c2ee7c575b 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2025,5 +2025,13 @@ "Recent Conversations": "Conversations récentes", "Direct Messages": "Messages directs", "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur ou partagez votre nom d’utilisateur (%(userId)s) ou votre lien de profil.", - "Go": "C’est parti" + "Go": "C’est parti", + "Show info about bridges in room settings": "Afficher des informations à propos des passerelles dans les paramètres du salon", + "This bridge was provisioned by ": "Cette passerelle est fournie par ", + "This bridge is managed by .": "Cette passerelle est gérée par .", + "Bridged into , on ": "Relié à , sur ", + "Connected to on ": "Connecté à sur ", + "Connected via %(protocolName)s": "Connecté via %(protocolName)s", + "Bridge Info": "Informations de la passerelle", + "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon." } From 393c610b5a6faea93014b1a68ffd05f03805f45b Mon Sep 17 00:00:00 2001 From: Szimszon Date: Mon, 6 Jan 2020 07:06:31 +0000 Subject: [PATCH 213/239] Translated using Weblate (Hungarian) Currently translated at 100.0% (2014 of 2014 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index df482cd072..92113c3238 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2026,5 +2026,13 @@ "Recent Conversations": "Legújabb Beszélgetések", "Direct Messages": "Közvetlen Beszélgetések", "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Ha nem találsz meg valakit, kérdezd meg a felhasználói nevét vagy oszd meg a te felhasználói nevedet (%(userId)s) vagy a profil hivatkozást.", - "Go": "Menj" + "Go": "Menj", + "Show info about bridges in room settings": "Híd információk megmutatása a szoba beállításoknál", + "This bridge was provisioned by ": "Ezt a hidat ez a felhasználó hozta létre: ", + "This bridge is managed by .": "Ezt a hidat ez a felhasználó kezeli: .", + "Bridged into , on ": "Híd ide: , ezzel a protokollal: ", + "Connected to on ": "Ide csatlakozva: itt: ", + "Connected via %(protocolName)s": "Ezzel a protokollal csatlakozva: %(protocolName)s", + "Bridge Info": "Híd információ", + "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról." } From d5eb4ff310d2cd328f8795bd6eea37b90a4db86a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 13:02:32 +0000 Subject: [PATCH 214/239] Update src/components/views/settings/ProfileSettings.js Co-Authored-By: J. Ryan Stinnett --- src/components/views/settings/ProfileSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js index 72ff7e3d15..b56321c1c9 100644 --- a/src/components/views/settings/ProfileSettings.js +++ b/src/components/views/settings/ProfileSettings.js @@ -89,7 +89,7 @@ export default class ProfileSettings extends React.Component { newState.originalAvatarUrl = newState.avatarUrl; newState.avatarFile = null; } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) { - await client.setAvatarUrl(""); // use empty string as Synapse 500's on undefined + await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined } this.setState(newState); From c551f2983a2495805f9158e1d335e4ae195ad018 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 13:28:29 +0000 Subject: [PATCH 215/239] Add TextualBody-test.js Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 + src/components/views/elements/Pill.js | 2 +- src/utils/pillify.js | 1 + .../views/messages/TextualBody-test.js | 195 +++++++++ test/test-utils.js | 1 + yarn.lock | 376 +++++++++++++++++- 6 files changed, 567 insertions(+), 10 deletions(-) create mode 100644 test/components/views/messages/TextualBody-test.js diff --git a/package.json b/package.json index ad446e26cc..2f8d5f9f7a 100644 --- a/package.json +++ b/package.json @@ -127,6 +127,8 @@ "babel-preset-react": "^6.24.1", "chokidar": "^2.1.2", "concurrently": "^4.0.1", + "enzyme": "^3.10.0", + "enzyme-adapter-react-16": "^1.15.1", "eslint": "^5.12.0", "eslint-config-google": "^0.7.1", "eslint-plugin-babel": "^5.2.1", diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index 99005de03b..da40c53700 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -261,7 +261,7 @@ const Pill = createReactClass({ } const classes = classNames("mx_Pill", pillClass, { - "mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId, + "mx_UserPill_me": userId === MatrixClientPeg.get().getUserId(), "mx_UserPill_selected": this.props.isSelected, }); diff --git a/src/utils/pillify.js b/src/utils/pillify.js index e943cfe657..ed8a7e18cd 100644 --- a/src/utils/pillify.js +++ b/src/utils/pillify.js @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +import React from "react"; import ReactDOM from 'react-dom'; import MatrixClientPeg from '../MatrixClientPeg'; import SettingsStore from "../settings/SettingsStore"; diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js new file mode 100644 index 0000000000..d93bfd307b --- /dev/null +++ b/test/components/views/messages/TextualBody-test.js @@ -0,0 +1,195 @@ +import React from "react"; +import expect from 'expect'; +import Adapter from "enzyme-adapter-react-16"; +import { configure, mount } from "enzyme"; + +import sdk from "../../../skinned-sdk"; +import {mkEvent, mkStubRoom} from "../../../test-utils"; +import MatrixClientPeg from "../../../../src/MatrixClientPeg"; + +const TextualBody = sdk.getComponent("views.messages.TextualBody"); + +configure({ adapter: new Adapter() }); + +describe("", () => { + afterEach(() => { + MatrixClientPeg.matrixClient = null; + }); + + describe("renders m.emote correctly", () => { + MatrixClientPeg.matrixClient = { + getRoom: () => mkStubRoom("room_id"), + getAccountData: () => undefined, + }; + + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "winks", + msgtype: "m.emote", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe("* sender winks"); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe('winks'); + }); + + describe("renders m.notice correctly", () => { + MatrixClientPeg.matrixClient = { + getRoom: () => mkStubRoom("room_id"), + getAccountData: () => undefined, + }; + + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "bot_sender", + content: { + body: "this is a notice, probably from a bot", + msgtype: "m.notice", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe(ev.getContent().body); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe(`${ ev.getContent().body }`); + }); + + describe("renders plain-text m.text correctly", () => { + MatrixClientPeg.matrixClient = { + getRoom: () => mkStubRoom("room_id"), + getAccountData: () => undefined, + }; + + describe("simple message renders as expected", () => { + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "this is a plaintext message", + msgtype: "m.text", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe(ev.getContent().body); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe(`${ ev.getContent().body }`); + }); + + // If pills were rendered within a Portal/same shadow DOM then it'd be easier to test + describe("linkification get applied correctly into the DOM", () => { + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "Visit https://matrix.org/", + msgtype: "m.text", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe(ev.getContent().body); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe('' + + 'Visit ' + + 'https://matrix.org/'); + }); + }); + + describe("renders formatted m.text correctly", () => { + MatrixClientPeg.matrixClient = { + getRoom: () => mkStubRoom("room_id"), + getAccountData: () => undefined, + getUserId: () => "@me:my_server", + getHomeserverUrl: () => "https://my_server/", + on: () => undefined, + removeListener: () => undefined, + }; + + describe("italics, bold, underline and strikethrough render as expected", () => { + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "foo *baz* __bar__ del u", + msgtype: "m.text", + format: "org.matrix.custom.html", + formatted_body: "foo baz bar del u", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe("foo baz bar del u"); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe('' + + ev.getContent().formatted_body + ''); + }); + + describe("spoilers get injected properly into the DOM", () => { + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "Hey [Spoiler for movie](mxc://someserver/somefile)", + msgtype: "m.text", + format: "org.matrix.custom.html", + formatted_body: "Hey the movie was awesome", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe("Hey (movie) the movie was awesome"); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe('' + + 'Hey ' + + '' + + '(movie) ' + + 'the movie was awesome' + + ''); + }); + + // If pills were rendered within a Portal/same shadow DOM then it'd be easier to test + describe("pills get injected correctly into the DOM", () => { + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "Hey User", + msgtype: "m.text", + format: "org.matrix.custom.html", + formatted_body: "Hey Member", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe("Hey Member"); + const content = wrapper.find(".mx_EventTile_body"); + expect(content.html()).toBe('' + + 'Hey ' + + '' + + 'Member' + + ''); + }); + }); +}); + + diff --git a/test/test-utils.js b/test/test-utils.js index 5c8c7f8a10..e27fff3388 100644 --- a/test/test-utils.js +++ b/test/test-utils.js @@ -238,6 +238,7 @@ export function mkStubRoom(roomId = null) { getMember: sinon.stub().returns({ userId: '@member:domain.bla', name: 'Member', + rawDisplayName: 'Member', roomId: roomId, getAvatarUrl: () => 'mxc://avatar.url/image.png', }), diff --git a/yarn.lock b/yarn.lock index a491ba3941..c32a108934 100644 --- a/yarn.lock +++ b/yarn.lock @@ -531,6 +531,22 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" +airbnb-prop-types@^2.15.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz#5287820043af1eb469f5b0af0d6f70da6c52aaef" + integrity sha512-jUh2/hfKsRjNFC4XONQrxo/n/3GG4Tn6Hl0WlFQN5PY9OMC9loSCoAYKnZsWaP8wEfd5xcrPloK0Zg6iS1xwVA== + dependencies: + array.prototype.find "^2.1.0" + function.prototype.name "^1.1.1" + has "^1.0.3" + is-regex "^1.0.4" + object-is "^1.0.1" + object.assign "^4.1.0" + object.entries "^1.1.0" + prop-types "^15.7.2" + prop-types-exact "^1.2.0" + react-is "^16.9.0" + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" @@ -659,6 +675,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-filter@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" + integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= + array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" @@ -699,6 +720,22 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.find@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz#630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7" + integrity sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.13.0" + +array.prototype.flat@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + arraybuffer.slice@~0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" @@ -1621,6 +1658,11 @@ body-parser@^1.16.1: raw-body "2.4.0" type-is "~1.6.17" +boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1957,6 +1999,18 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +cheerio@^1.0.0-rc.3: + version "1.0.0-rc.3" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6" + integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA== + dependencies: + css-select "~1.2.0" + dom-serializer "~0.1.1" + entities "~1.1.1" + htmlparser2 "^3.9.1" + lodash "^4.15.0" + parse5 "^3.0.1" + chokidar@^1.6.1: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -2136,7 +2190,7 @@ commander@2.15.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== -commander@^2.11.0, commander@^2.20.0: +commander@^2.11.0, commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -2374,6 +2428,21 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" +css-select@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= + dependencies: + boolbase "~1.0.0" + css-what "2.1" + domutils "1.5.1" + nth-check "~1.0.1" + +css-what@2.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" + integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -2592,6 +2661,11 @@ dir-glob@^2.2.2: dependencies: path-type "^3.0.0" +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -2631,12 +2705,20 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== + dependencies: + domelementtype "^1.3.0" + entities "^1.1.1" + domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@1, domelementtype@^1.3.1: +domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== @@ -2653,6 +2735,14 @@ domhandler@^2.3.0: dependencies: domelementtype "1" +domutils@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= + dependencies: + dom-serializer "0" + domelementtype "1" + domutils@^1.5.1: version "1.7.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" @@ -2816,7 +2906,7 @@ ent@~2.2.0: resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= -entities@^1.1.1, "entities@~ 1.1.1": +entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== @@ -2826,6 +2916,69 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4" integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw== +enzyme-adapter-react-16@^1.15.1: + version "1.15.2" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501" + integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q== + dependencies: + enzyme-adapter-utils "^1.13.0" + enzyme-shallow-equal "^1.0.1" + has "^1.0.3" + object.assign "^4.1.0" + object.values "^1.1.1" + prop-types "^15.7.2" + react-is "^16.12.0" + react-test-renderer "^16.0.0-0" + semver "^5.7.0" + +enzyme-adapter-utils@^1.13.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78" + integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ== + dependencies: + airbnb-prop-types "^2.15.0" + function.prototype.name "^1.1.2" + object.assign "^4.1.0" + object.fromentries "^2.0.2" + prop-types "^15.7.2" + semver "^5.7.1" + +enzyme-shallow-equal@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e" + integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ== + dependencies: + has "^1.0.3" + object-is "^1.0.2" + +enzyme@^3.10.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28" + integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw== + dependencies: + array.prototype.flat "^1.2.3" + cheerio "^1.0.0-rc.3" + enzyme-shallow-equal "^1.0.1" + function.prototype.name "^1.1.2" + has "^1.0.3" + html-element-map "^1.2.0" + is-boolean-object "^1.0.1" + is-callable "^1.1.5" + is-number-object "^1.0.4" + is-regex "^1.0.5" + is-string "^1.0.5" + is-subset "^0.1.1" + lodash.escape "^4.0.1" + lodash.isequal "^4.5.0" + object-inspect "^1.7.0" + object-is "^1.0.2" + object.assign "^4.1.0" + object.entries "^1.1.1" + object.values "^1.1.1" + raf "^3.4.1" + rst-selector-parser "^2.2.3" + string.prototype.trim "^1.2.1" + err-code@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" @@ -2861,6 +3014,23 @@ es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.7. string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" +es-abstract@^1.13.0, es-abstract@^1.17.0-next.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1" + integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" + es-get-iterator@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd" @@ -3600,6 +3770,15 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function.prototype.name@^1.1.1, function.prototype.name@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45" + integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + functions-have-names "^1.2.0" + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" @@ -3988,12 +4167,19 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== +html-element-map@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22" + integrity sha512-0uXq8HsuG1v2TmQ8QkIhzbrqeskE4kn52Q18QJ9iAA/SnHoEKXWiUxHQtclRsCFWEUD2So34X+0+pZZu862nnw== + dependencies: + array-filter "^1.0.0" + html-tags@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos= -htmlparser2@^3.10.0: +htmlparser2@^3.10.0, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -4312,6 +4498,11 @@ is-boolean-object@^1.0.0: resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M= +is-boolean-object@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" + integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== + is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -4327,6 +4518,11 @@ is-callable@^1.0.4, is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -4504,6 +4700,11 @@ is-number-object@^1.0.3: resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k= +is-number-object@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" + integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" @@ -4567,6 +4768,13 @@ is-regex@^1.0.3, is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regex@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== + dependencies: + has "^1.0.3" + is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" @@ -4587,6 +4795,16 @@ is-string@^1.0.4: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64" integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ= +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + +is-subset@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" + integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= + is-supported-regexp-flag@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca" @@ -5072,11 +5290,21 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= +lodash.escape@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" + integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= + lodash.escaperegexp@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c= +lodash.flattendeep@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" @@ -5087,6 +5315,11 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash.isplainobject@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" @@ -5112,7 +5345,7 @@ lodash.unescape@4.0.1: resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1: +lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -5559,6 +5792,11 @@ mocha@^5.0.5: mkdirp "0.5.1" supports-color "5.4.0" +moo@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e" + integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -5613,6 +5851,17 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +nearley@^2.7.10: + version "2.19.0" + resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.0.tgz#37717781d0fd0f2bfc95e233ebd75678ca4bda46" + integrity sha512-2v52FTw7RPqieZr3Gth1luAXZR7Je6q3KaDHY5bjl/paDUdMu35fZ8ICNgiYJRr3tf3NMvIQQR1r27AvEr9CRA== + dependencies: + commander "^2.19.0" + moo "^0.4.3" + railroad-diagrams "^1.0.0" + randexp "0.4.6" + semver "^5.4.1" + needle@^2.2.1: version "2.4.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" @@ -5787,6 +6036,13 @@ npmlog@^4.0.2: gauge "~2.7.3" set-blocking "~2.0.0" +nth-check@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + null-check@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" @@ -5831,6 +6087,11 @@ object-inspect@^1.1.0, object-inspect@^1.7.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== +object-is@^1.0.1, object-is@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4" + integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ== + object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -5863,6 +6124,16 @@ object.entries@^1.1.0: function-bind "^1.1.1" has "^1.0.3" +object.entries@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" + integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + object.fromentries@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704" @@ -5873,6 +6144,16 @@ object.fromentries@^2.0.1: function-bind "^1.1.1" has "^1.0.3" +object.fromentries@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" + integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -5898,6 +6179,16 @@ object.values@^1.1.0: function-bind "^1.1.1" has "^1.0.3" +object.values@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -6108,6 +6399,13 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= +parse5@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" + integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA== + dependencies: + "@types/node" "*" + parseqs@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" @@ -6426,6 +6724,15 @@ promise@^7.0.3, promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types-exact@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869" + integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA== + dependencies: + has "^1.0.3" + object.assign "^4.1.0" + reflect.ownkeys "^0.2.0" + prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" @@ -6554,13 +6861,26 @@ raf-schd@^2.1.0: resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-2.1.2.tgz#ec622b5167f2912089f054dc03ebd5bcf33c8f62" integrity sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g== -raf@^3.1.0: +raf@^3.1.0, raf@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== dependencies: performance-now "^2.1.0" +railroad-diagrams@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= + +randexp@0.4.6: + version "0.4.6" + resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + randomatic@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" @@ -6668,7 +6988,7 @@ react-focus-lock@^2.2.1: dependencies: gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566 -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: +react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== @@ -6700,7 +7020,7 @@ react-redux@^5.0.6: react-is "^16.6.0" react-lifecycles-compat "^3.0.0" -react-test-renderer@^16.9.0: +react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f" integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w== @@ -6817,6 +7137,11 @@ redux@^3.7.2: loose-envify "^1.1.0" symbol-observable "^1.0.3" +reflect.ownkeys@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" + integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= + regenerate@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" @@ -7133,6 +7458,14 @@ rollup-pluginutils@^2.8.1: dependencies: estree-walker "^0.6.1" +rst-selector-parser@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" + integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE= + dependencies: + lodash.flattendeep "^4.4.0" + nearley "^2.7.10" + run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" @@ -7219,7 +7552,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7668,6 +8001,15 @@ string.prototype.repeat@^0.2.0: resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8= +string.prototype.trim@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782" + integrity sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + string.prototype.trimleft@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" @@ -7676,6 +8018,14 @@ string.prototype.trimleft@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string.prototype.trimright@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" @@ -7684,6 +8034,14 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" From f1de6d060acd66b5ba69f7f494fd176d161b40f5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 14:38:21 +0000 Subject: [PATCH 216/239] Add a regression test for editing events and url previews Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../keybackup/CreateKeyBackupDialog.js | 2 +- .../views/settings/KeyBackupPanel.js | 2 +- .../views/messages/TextualBody-test.js | 62 +++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js index 19720e077a..1095fb4aee 100644 --- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js +++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js @@ -24,7 +24,7 @@ import MatrixClientPeg from '../../../../MatrixClientPeg'; import { scorePassword } from '../../../../utils/PasswordScorer'; import { _t } from '../../../../languageHandler'; import { accessSecretStorage } from '../../../../CrossSigningManager'; -import SettingsStore from '../../../../../lib/settings/SettingsStore'; +import SettingsStore from '../../../../settings/SettingsStore'; const PHASE_PASSPHRASE = 0; const PHASE_PASSPHRASE_CONFIRM = 1; diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index bfa96f277f..3781f97dbe 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -21,7 +21,7 @@ import sdk from '../../../index'; import MatrixClientPeg from '../../../MatrixClientPeg'; import { _t } from '../../../languageHandler'; import Modal from '../../../Modal'; -import SettingsStore from '../../../../lib/settings/SettingsStore'; +import SettingsStore from '../../../settings/SettingsStore'; export default class KeyBackupPanel extends React.PureComponent { constructor(props) { diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js index d93bfd307b..9e721d1d09 100644 --- a/test/components/views/messages/TextualBody-test.js +++ b/test/components/views/messages/TextualBody-test.js @@ -6,6 +6,8 @@ import { configure, mount } from "enzyme"; import sdk from "../../../skinned-sdk"; import {mkEvent, mkStubRoom} from "../../../test-utils"; import MatrixClientPeg from "../../../../src/MatrixClientPeg"; +import * as languageHandler from "../../../../src/languageHandler"; +import {sleep} from "../../../../src/utils/promise"; const TextualBody = sdk.getComponent("views.messages.TextualBody"); @@ -190,6 +192,66 @@ describe("", () => { '    '); }); }); + + describe("renders url previews correctly", () => { + languageHandler.setMissingEntryGenerator(key => key.split('|', 2)[1]); + + MatrixClientPeg.matrixClient = { + getRoom: () => mkStubRoom("room_id"), + getAccountData: () => undefined, + getUrlPreview: (url) => new Promise(() => {}), + }; + + const ev = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + body: "Visit https://matrix.org/", + msgtype: "m.text", + }, + event: true, + }); + + const wrapper = mount(); + expect(wrapper.text()).toBe(ev.getContent().body); + + let widgets = wrapper.find("LinkPreviewWidget"); + // at this point we should have exactly one widget + expect(widgets.length).toBe(1); + expect(widgets.at(0).prop("link")).toBe("https://matrix.org/"); + + // simulate an event edit and check the transition from the old URL preview to the new one + const ev2 = mkEvent({ + type: "m.room.message", + room: "room_id", + user: "sender", + content: { + "m.new_content": { + body: "Visit https://vector.im/ and https://riot.im/", + msgtype: "m.text", + }, + }, + event: true, + }); + ev.makeReplaced(ev2); + + wrapper.setProps({ + mxEvent: ev, + replacingEventId: ev.getId(), + }, () => { + expect(wrapper.text()).toBe(ev2.getContent()["m.new_content"].body + "(edited)"); + + // XXX: this is to give TextualBody enough time for state to settle + wrapper.setState({}, () => { + widgets = wrapper.find("LinkPreviewWidget"); + // at this point we should have exactly two widgets (not the matrix.org one anymore) + expect(widgets.length).toBe(2); + expect(widgets.at(0).prop("link")).toBe("https://vector.im/"); + expect(widgets.at(1).prop("link")).toBe("https://riot.im/"); + }); + }); + }); }); From bdef54622b81c2855d0605f2944b88bb1519e337 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 14:52:08 +0000 Subject: [PATCH 217/239] delint and add copyright Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/messages/TextualBody-test.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js index 9e721d1d09..7aeff94404 100644 --- a/test/components/views/messages/TextualBody-test.js +++ b/test/components/views/messages/TextualBody-test.js @@ -1,3 +1,19 @@ +/* +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. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + import React from "react"; import expect from 'expect'; import Adapter from "enzyme-adapter-react-16"; @@ -7,7 +23,6 @@ import sdk from "../../../skinned-sdk"; import {mkEvent, mkStubRoom} from "../../../test-utils"; import MatrixClientPeg from "../../../../src/MatrixClientPeg"; import * as languageHandler from "../../../../src/languageHandler"; -import {sleep} from "../../../../src/utils/promise"; const TextualBody = sdk.getComponent("views.messages.TextualBody"); From bef824e84ee36769712fc3c48171032056875df0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 6 Jan 2020 12:21:59 -0700 Subject: [PATCH 218/239] Remove harmful html entities encoding and other style nits React will take care of this for us. It's harmful because simple characters get converted to something illegible. --- src/HtmlUtils.js | 5 ----- src/components/views/dialogs/DMInviteDialog.js | 12 ++++-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index ce677e6c68..7cdff26a21 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -528,8 +528,3 @@ export function checkBlockNode(node) { return false; } } - -export function htmlEntitiesEncode(str: string) { - // Source: https://stackoverflow.com/a/18750001/7037379 - return str.replace(/[\u00A0-\u9999<>&]/gim, i => `&#${i.charCodeAt(0)};`); -} diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index aec64919a0..bb3e38a304 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -24,7 +24,6 @@ import DMRoomMap from "../../../utils/DMRoomMap"; import {RoomMember} from "matrix-js-sdk/lib/matrix"; import * as humanize from "humanize"; import SdkConfig from "../../../SdkConfig"; -import {htmlEntitiesEncode} from "../../../HtmlUtils"; import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo"; // TODO: [TravisR] Make this generic for all kinds of invites @@ -77,11 +76,9 @@ class DMRoomTile extends React.PureComponent { _highlightName(str: string) { if (!this.props.highlightWord) return str; - // First encode the thing to avoid injection - str = htmlEntitiesEncode(str); - // We convert things to lowercase for index searching, but pull substrings from - // the submitted text to preserve case. + // the submitted text to preserve case. Note: we don't need to htmlEntities the + // string because React will safely encode the text for us. const lowerStr = str.toLowerCase(); const filterStr = this.props.highlightWord.toLowerCase(); @@ -92,8 +89,8 @@ class DMRoomTile extends React.PureComponent { while ((ii = lowerStr.indexOf(filterStr, i)) >= 0) { // Push any text we missed (first bit/middle of text) if (ii > i) { - // Push any text we aren't highlighting (middle of text match) - result.push({str.substring(i, ii)}); + // Push any text we aren't highlighting (middle of text match, or beginning of text) + result.push({str.substring(i, ii)}); } i = ii; // copy over ii only if we have a match (to preserve i for end-of-text matching) @@ -333,7 +330,6 @@ export default class DMInviteDialog extends React.PureComponent { } } - // 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++; From 6c410e602787ef041f85fb6aa62ca6ae5bae3b4f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 6 Jan 2020 12:23:35 -0700 Subject: [PATCH 219/239] Fix comment style --- src/components/views/dialogs/DMInviteDialog.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index bdeae6bc3e..2854c914f8 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -115,6 +115,8 @@ export default class DMInviteDialog extends React.PureComponent { const joinedRooms = client.getRooms() .filter(r => r.getMyMembership() === 'join') .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers); + + // Generates { userId: {member, rooms[]} } const memberRooms = joinedRooms.reduce((members, room) => { const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId)); for (const member of joinedMembers) { @@ -136,7 +138,9 @@ export default class DMInviteDialog extends React.PureComponent { } } return members; - }, {/* userId => {member, rooms[]} */}); + }, {}); + + // Generates { userId: {member, numRooms, score} } 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; @@ -146,7 +150,8 @@ export default class DMInviteDialog extends React.PureComponent { 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) { From 7b91d2056b2098e7a12e574a8495503d23570c15 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Jan 2020 23:50:42 +0000 Subject: [PATCH 220/239] Attempt to fix e2e tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- test/end-to-end-tests/src/usecases/room-settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js index 5b425f14b7..8e9e267d45 100644 --- a/test/end-to-end-tests/src/usecases/room-settings.js +++ b/test/end-to-end-tests/src/usecases/room-settings.js @@ -55,6 +55,7 @@ module.exports = async function changeRoomSettings(session, settings) { await session.replaceInputText(aliasField, settings.alias.substring(1, settings.alias.lastIndexOf(":"))); const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings .mx_AccessibleButton"); await addButton.click(); + await session.delay(10); // delay to give time for the validator to run and check the alias session.log.done(); } From a62c260f794f2f89815045458b05a656bc5962dc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 7 Jan 2020 12:58:24 +0000 Subject: [PATCH 221/239] Fix userinfo for users not in the room Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/right_panel/UserInfo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index b55991eda8..9c90953114 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -1000,8 +1000,8 @@ const UserInfo = ({user, groupId, roomId, onClose}) => { // Load room if we are given a room id and memoize it const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]); - // fetch latest room member if we have a room, so we don't show historical information - const member = useMemo(() => room ? room.getMember(user.userId) : user, [room, user]); + // fetch latest room member if we have a room, so we don't show historical information, falling back to user + const member = useMemo(() => room ? (room.getMember(user.userId) || user) : user, [room, user]); // only display the devices list if our client supports E2E const _enableDevices = cli.isCryptoEnabled(); From 40b23d6aa4cb6ad465c4ec1c9c2b55bd2ebe3cc9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 7 Jan 2020 18:48:55 +0000 Subject: [PATCH 222/239] Strip all variation selectors on emoji ...when inserting into or looking up in the unicode to emoji map. This broke with emojibase 4.2.0 which changed the type of a whole load of emojis to 'text' when previously they were 'emoji'. This caused them to get the 'text' variant of the unicode string which has the text variation selector (15) appended instead of the emoji variation selector (16). We were only stripping the emoji selector, so upgrading to 4.2.0 caused riot to fail to find the heart in the unicode map, which therefore prevented the app from starting. --- src/emoji.js | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/src/emoji.js b/src/emoji.js index 7b7a9c1bfe..8b3c4c9fe4 100644 --- a/src/emoji.js +++ b/src/emoji.js @@ -16,14 +16,12 @@ limitations under the License. import EMOJIBASE from 'emojibase-data/en/compact.json'; -export const VARIATION_SELECTOR = String.fromCharCode(0xFE0F); - // The unicode is stored without the variant selector const UNICODE_TO_EMOJI = new Map(); // not exported as gets for it are handled by getEmojiFromUnicode export const EMOTICON_TO_EMOJI = new Map(); export const SHORTCODE_TO_EMOJI = new Map(); -export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(unicode.replace(VARIATION_SELECTOR, "")); +export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode)); const EMOJIBASE_GROUP_ID_TO_CATEGORY = [ "people", // smileys @@ -51,13 +49,6 @@ export const DATA_BY_CATEGORY = { // Store various mappings from unicode/emoticon/shortcode to the Emoji objects EMOJIBASE.forEach(emoji => { - if (emoji.unicode.includes(VARIATION_SELECTOR)) { - // Clone data into variation-less version - emoji = Object.assign({}, emoji, { - unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""), - }); - } - const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group]; if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) { DATA_BY_CATEGORY[categoryId].push(emoji); @@ -66,7 +57,13 @@ EMOJIBASE.forEach(emoji => { emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase(); // Add mapping from unicode to Emoji object - UNICODE_TO_EMOJI.set(emoji.unicode, emoji); + // The 'unicode' field that we use in emojibase has either + // VS15 or VS16 appended to any characters that can take + // variation selectors. Which one it appends depends + // on whether emojibase considers their type to be 'text' or + // 'emoji'. We therefore strip any variation chars from strings + // both when building the map and when looking up. + UNICODE_TO_EMOJI.set(stripVariation(emoji.unicode), emoji); if (emoji.emoticon) { // Add mapping from emoticon to Emoji object @@ -80,3 +77,23 @@ EMOJIBASE.forEach(emoji => { }); } }); + +/** + * Strips variation selectors from a string + * NB. Skin tone modifers are not variation selectors: + * this function does not touch them. (Should it?) + * + * @param {string} str string to strip + * @returns {string} stripped string + */ +function stripVariation(str) { + let ret = ''; + for (let i = 0; i < str.length; ++i) { + const charCode = str.charCodeAt(i); + // append to output only if it's outside the variation selector range + if (charCode < 0xFE00 && charCode > 0xFE0F) { + ret += str.charAt(i); + } + } + return ret; +} From ffd40c2c4081ce7bd2a6fb09a39e230f6d07b991 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 6 Jan 2020 20:51:23 -0700 Subject: [PATCH 223/239] Initial editor for user list selection For https://github.com/vector-im/riot-web/issues/11199 --- res/css/views/dialogs/_DMInviteDialog.scss | 77 ++++++- res/img/icon-email-pill-avatar.svg | 37 +++ res/img/icon-pill-remove.svg | 36 +++ .../views/dialogs/DMInviteDialog.js | 214 ++++++++++++++---- 4 files changed, 323 insertions(+), 41 deletions(-) create mode 100644 res/img/icon-email-pill-avatar.svg create mode 100644 res/img/icon-pill-remove.svg diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss index 364c796f16..e581f9dc7a 100644 --- a/res/css/views/dialogs/_DMInviteDialog.scss +++ b/res/css/views/dialogs/_DMInviteDialog.scss @@ -21,15 +21,51 @@ limitations under the License. .mx_DMInviteDialog_editor { flex: 1; width: 100%; // Needed to make the Field inside grow - } + background-color: $user-tile-hover-bg-color; + border-radius: 4px; + min-height: 25px; + padding-left: 8px; + overflow-x: hidden; + overflow-y: auto; - .mx_Field { - margin: 0; + .mx_DMInviteDialog_userTile { + display: inline-block; + float: left; + position: relative; + top: 7px; + } + + // Using a textarea for this element, to circumvent autofill + // Mostly copied from AddressPickerDialog + textarea, + textarea:focus { + height: 34px; + line-height: 34px; + font-size: 14px; + padding-left: 12px; + margin: 0 !important; + border: 0 !important; + outline: 0 !important; + resize: none; + overflow: hidden; + box-sizing: border-box; + word-wrap: nowrap; + + // Roughly fill about 2/5ths of the available space. This is to try and 'fill' the + // remaining space after a bunch of pills, but is a bit hacky. Ideally we'd have + // support for "fill remaining width", but traditional tricks don't work with what + // we're pushing into this "field". Flexbox just makes things worse. The theory is + // that users won't need more than about 2/5ths of the input to find the person + // they're looking for. + width: 40%; + } } .mx_DMInviteDialog_goButton { width: 48px; margin-left: 10px; + height: 25px; + line-height: 25px; } } @@ -83,3 +119,38 @@ limitations under the License. } } +// Many of these styles are stolen from mx_UserPill, but adjusted for the invite dialog. +.mx_DMInviteDialog_userTile { + margin-right: 8px; + + .mx_DMInviteDialog_userTile_pill { + background-color: $username-variant1-color; + border-radius: 12px; + display: inline-block; + height: 24px; + line-height: 24px; + padding-left: 8px; + padding-right: 8px; + color: #ffffff; // this is fine without a var because it's for both themes + + .mx_DMInviteDialog_userTile_avatar { + border-radius: 20px; + position: relative; + left: -5px; + top: 2px; + } + + img.mx_DMInviteDialog_userTile_avatar { + vertical-align: top; + } + + .mx_DMInviteDialog_userTile_name { + vertical-align: top; + } + } + + .mx_DMInviteDialog_userTile_remove { + display: inline-block; + margin-left: 4px; + } +} diff --git a/res/img/icon-email-pill-avatar.svg b/res/img/icon-email-pill-avatar.svg new file mode 100644 index 0000000000..c107ccc480 --- /dev/null +++ b/res/img/icon-email-pill-avatar.svg @@ -0,0 +1,37 @@ + + + + at-sign + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/img/icon-pill-remove.svg b/res/img/icon-pill-remove.svg new file mode 100644 index 0000000000..5b31cca42f --- /dev/null +++ b/res/img/icon-pill-remove.svg @@ -0,0 +1,36 @@ + + + + x + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index c5e9c92131..6eb6d0c78b 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from 'react'; +import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import {_t} from "../../../languageHandler"; import sdk from "../../../index"; @@ -31,18 +31,46 @@ import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo"; const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked -class DirectoryMember { +// This is the interface that is expected by various components in this file. It is a bit +// awkward because it also matches the RoomMember class from the js-sdk with some extra support +// for 3PIDs/email addresses. +// +// Dev note: In order to allow us to compile the app correctly, this needs to be a class +// even though FlowJS supports interfaces. It just means that we "extend" rather than "implement" +// in the classes, at least until TypeScript saves us. +class Member { + /** + * The display name of this Member. For users this should be their profile's display + * name or user ID if none set. For 3PIDs this should be the 3PID address (email). + */ + get name(): string { throw new Error("Member class not implemented"); } + + /** + * The ID of this Member. For users this should be their user ID. For 3PIDs this should + * be the 3PID address (email). + */ + get userId(): string { throw new Error("Member class not implemented"); } + + /** + * Gets the MXC URL of this Member's avatar. For users this should be their profile's + * avatar MXC URL or null if none set. For 3PIDs this should always be null. + */ + getMxcAvatarUrl(): string { throw new Error("Member class not implemented"); } +} + +class DirectoryMember extends Member { _userId: string; _displayName: string; _avatarUrl: string; constructor(userDirResult: {user_id: string, display_name: string, avatar_url: string}) { + super(); this._userId = userDirResult.user_id; this._displayName = userDirResult.display_name; this._avatarUrl = userDirResult.avatar_url; } - // These next members are to implement the contract expected by DMRoomTile + // These next class members are for the Member interface get name(): string { return this._displayName || this._userId; } @@ -56,12 +84,91 @@ class DirectoryMember { } } +class ThreepidMember extends Member { + _id: string; + + constructor(id: string) { + super(); + this._id = id; + } + + // This is a getter that would be falsey on all other implementations. Until we have + // better type support in the react-sdk we can use this trick to determine the kind + // of 3PID we're dealing with, if any. + get isEmail(): boolean { + return this._id.includes('@'); + } + + // These next class members are for the Member interface + get name(): string { + return this._id; + } + + get userId(): string { + return this._id; + } + + getMxcAvatarUrl(): string { + return null; + } +} + +class DMUserTile extends React.PureComponent { + static propTypes = { + member: PropTypes.object.isRequired, // Should be a Member (see interface above) + onRemove: PropTypes.func.isRequired, // takes 1 argument, the member being removed + }; + + _onRemove = (e) => { + // Stop the browser from highlighting text + e.preventDefault(); + e.stopPropagation(); + + this.props.onRemove(this.props.member); + }; + + render() { + const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar"); + const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); + + const avatarSize = 20; + const avatar = this.props.member.isEmail + ? + : ; + + return ( + + + {avatar} + {this.props.member.name} + + + {_t('Remove')} + + + ); + } +} + class DMRoomTile extends React.PureComponent { static propTypes = { - // Has properties to match RoomMember: userId (str), name (str), getMxcAvatarUrl(): string - member: PropTypes.object.isRequired, + member: PropTypes.object.isRequired, // Should be a Member (see interface above) lastActiveTs: PropTypes.number, - onToggle: PropTypes.func.isRequired, + onToggle: PropTypes.func.isRequired, // takes 1 argument, the member being toggled highlightWord: PropTypes.string, }; @@ -70,7 +177,7 @@ class DMRoomTile extends React.PureComponent { e.preventDefault(); e.stopPropagation(); - this.props.onToggle(this.props.member.userId); + this.props.onToggle(this.props.member); }; _highlightName(str: string) { @@ -121,19 +228,22 @@ class DMRoomTile extends React.PureComponent { } const avatarSize = 36; - const avatarUrl = getHttpUriForMxc( - MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(), - avatarSize, avatarSize, "crop"); + const avatar = this.props.member.isEmail + ? + : ; return (
    - + {avatar} {this._highlightName(this.props.member.name)} {this._highlightName(this.props.member.userId)} {timestamp} @@ -149,12 +259,13 @@ export default class DMInviteDialog extends React.PureComponent { }; _debounceTimer: number = null; + _editorRef: any = null; constructor() { super(); this.state = { - targets: [], // string[] of mxids/email addresses + targets: [], // array of Member objects (see interface above) filterText: "", recents: this._buildRecents(), numRecentsShown: INITIAL_ROOMS_SHOWN, @@ -162,6 +273,8 @@ export default class DMInviteDialog extends React.PureComponent { numSuggestionsShown: INITIAL_ROOMS_SHOWN, serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions }; + + this._editorRef = createRef(); } _buildRecents(): {userId: string, user: RoomMember, lastActive: number} { @@ -245,7 +358,7 @@ export default class DMInviteDialog extends React.PureComponent { } _startDm = () => { - this.props.onFinished(this.state.targets); + this.props.onFinished(this.state.targets.map(t => t.userId)); }; _cancel = () => { @@ -292,14 +405,33 @@ export default class DMInviteDialog extends React.PureComponent { this.setState({numSuggestionsShown: this.state.numSuggestionsShown + INCREMENT_ROOMS_SHOWN}); }; - _toggleMember = (userId) => { + _toggleMember = (member: Member) => { const targets = this.state.targets.map(t => t); // cheap clone for mutation - const idx = targets.indexOf(userId); + const idx = targets.indexOf(member); if (idx >= 0) targets.splice(idx, 1); - else targets.push(userId); + else targets.push(member); this.setState({targets}); }; + _removeMember = (member: Member) => { + const targets = this.state.targets.map(t => t); // cheap clone for mutation + const idx = targets.indexOf(member); + if (idx >= 0) { + targets.splice(idx, 1); + this.setState({targets}); + } + }; + + _onClickInputArea = (e) => { + // Stop the browser from highlighting text + e.preventDefault(); + e.stopPropagation(); + + if (this._editorRef && this._editorRef.current) { + this._editorRef.current.focus(); + } + }; + _renderSection(kind: "recents"|"suggestions") { let sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions; let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown; @@ -371,24 +503,31 @@ export default class DMInviteDialog extends React.PureComponent { ); } + _renderEditor() { + const targets = this.state.targets.map(t => ( + + )); + const input = ( +