{
{
}
break;
case 'logout':
+ dis.dispatch({action: "hangup_all"});
Lifecycle.logout();
break;
case 'require_registration':
@@ -606,12 +605,7 @@ export default class MatrixChat extends React.PureComponent {
if (payload.screenAfterLogin) {
this.screenAfterLogin = payload.screenAfterLogin;
}
- this.setStateForNewView({
- view: Views.LOGIN,
- });
- this.notifyNewScreen('login');
- ThemeController.isLogin = true;
- this.themeWatcher.recheck();
+ this.viewLogin();
break;
case 'start_password_recovery':
this.setStateForNewView({
@@ -696,10 +690,10 @@ export default class MatrixChat extends React.PureComponent {
}
case Action.ViewRoomDirectory: {
if (SpaceStore.instance.activeSpace) {
- Modal.createTrackedDialog("Space room directory", "", SpaceRoomDirectory, {
- space: SpaceStore.instance.activeSpace,
- initialText: payload.initialText,
- }, "mx_SpaceRoomDirectory_dialogWrapper", false, true);
+ defaultDispatcher.dispatch({
+ action: "view_room",
+ room_id: SpaceStore.instance.activeSpace.roomId,
+ });
} else {
const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
@@ -934,7 +928,6 @@ export default class MatrixChat extends React.PureComponent {
page_type: PageTypes.RoomView,
threepidInvite: roomInfo.threepid_invite,
roomOobData: roomInfo.oob_data,
- viaServers: roomInfo.via_servers,
ready: true,
roomJustCreatedOpts: roomInfo.justCreatedOpts,
}, () => {
@@ -975,6 +968,9 @@ export default class MatrixChat extends React.PureComponent {
}
private viewWelcome() {
+ if (shouldUseLoginForWelcome(SdkConfig.get())) {
+ return this.viewLogin();
+ }
this.setStateForNewView({
view: Views.WELCOME,
});
@@ -983,6 +979,16 @@ export default class MatrixChat extends React.PureComponent {
this.themeWatcher.recheck();
}
+ private viewLogin(otherState?: any) {
+ this.setStateForNewView({
+ view: Views.LOGIN,
+ ...otherState,
+ });
+ this.notifyNewScreen('login');
+ ThemeController.isLogin = true;
+ this.themeWatcher.recheck();
+ }
+
private viewHome(justRegistered = false) {
// The home page requires the "logged in" view, so we'll set that.
this.setStateForNewView({
@@ -1139,11 +1145,17 @@ export default class MatrixChat extends React.PureComponent {
}
private forgetRoom(roomId: string) {
+ const room = MatrixClientPeg.get().getRoom(roomId);
MatrixClientPeg.get().forget(roomId).then(() => {
// Switch to home page if we're currently viewing the forgotten room
if (this.state.currentRoomId === roomId) {
dis.dispatch({ action: "view_home_page" });
}
+
+ // We have to manually update the room list because the forgotten room will not
+ // be notified to us, therefore the room list will have no other way of knowing
+ // the room is forgotten.
+ RoomListStore.instance.manualRoomUpdate(room, RoomUpdateCause.RoomRemoved);
}).catch((err) => {
const errCode = err.errcode || _td("unknown error code");
Modal.createTrackedDialog("Failed to forget room", '', ErrorDialog, {
@@ -1298,17 +1310,13 @@ export default class MatrixChat extends React.PureComponent {
* Called when the session is logged out
*/
private onLoggedOut() {
- this.notifyNewScreen('login');
- this.setStateForNewView({
- view: Views.LOGIN,
+ this.viewLogin({
ready: false,
collapseLhs: false,
currentRoomId: null,
});
this.subTitleStatus = '';
this.setPageSubtitle();
- ThemeController.isLogin = true;
- this.themeWatcher.recheck();
}
/**
@@ -1546,7 +1554,7 @@ export default class MatrixChat extends React.PureComponent {
} else if (request.pending) {
ToastStore.sharedInstance().addOrReplaceToast({
key: 'verifreq_' + request.channel.transactionId,
- title: request.isSelfVerification ? _t("Self-verification request") : _t("Verification Request"),
+ title: _t("Verification requested"),
icon: "verification",
props: {request},
component: sdk.getComponent("toasts.VerificationRequestToast"),
@@ -1648,7 +1656,7 @@ export default class MatrixChat extends React.PureComponent {
let cli = MatrixClientPeg.get();
if (!cli) {
const {hsUrl, isUrl} = this.props.serverConfig;
- cli = Matrix.createClient({
+ cli = createClient({
baseUrl: hsUrl,
idBaseUrl: isUrl,
});
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 439bdbcef5..41a3015721 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -23,7 +23,6 @@ import classNames from 'classnames';
import shouldHideEvent from '../../shouldHideEvent';
import {wantsDateSeparator} from '../../DateUtils';
import * as sdk from '../../index';
-import dis from "../../dispatcher/dispatcher";
import {MatrixClientPeg} from '../../MatrixClientPeg';
import SettingsStore from '../../settings/SettingsStore';
@@ -47,6 +46,9 @@ function shouldFormContinuation(prevEvent, mxEvent) {
// check if within the max continuation period
if (mxEvent.getTs() - prevEvent.getTs() > CONTINUATION_MAX_INTERVAL) return false;
+ // As we summarise redactions, do not continue a redacted event onto a non-redacted one and vice-versa
+ if (mxEvent.isRedacted() !== prevEvent.isRedacted()) return false;
+
// Some events should appear as continuations from previous events of different types.
if (mxEvent.getType() !== prevEvent.getType() &&
(!continuedTypes.includes(mxEvent.getType()) ||
@@ -210,13 +212,11 @@ export default class MessagePanel extends React.Component {
componentDidMount() {
this._isMounted = true;
- this.dispatcherRef = dis.register(this.onAction);
}
componentWillUnmount() {
this._isMounted = false;
SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
- dis.unregister(this.dispatcherRef);
}
componentDidUpdate(prevProps, prevState) {
@@ -229,14 +229,6 @@ export default class MessagePanel extends React.Component {
}
}
- onAction = (payload) => {
- switch (payload.action) {
- case "scroll_to_bottom":
- this.scrollToBottom();
- break;
- }
- }
-
onShowTypingNotificationsChange = () => {
this.setState({
showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
@@ -463,6 +455,20 @@ export default class MessagePanel extends React.Component {
});
};
+ _getNextEventInfo(arr, i) {
+ const nextEvent = i < arr.length - 1
+ ? arr[i + 1]
+ : null;
+
+ // The next event with tile is used to to determine the 'last successful' flag
+ // when rendering the tile. The shouldShowEvent function is pretty quick at what
+ // it does, so this should have no significant cost even when a room is used for
+ // not-chat purposes.
+ const nextTile = arr.slice(i + 1).find(e => this._shouldShowEvent(e));
+
+ return {nextEvent, nextTile};
+ }
+
_getEventTiles() {
this.eventNodes = {};
@@ -514,6 +520,7 @@ export default class MessagePanel extends React.Component {
const mxEv = this.props.events[i];
const eventId = mxEv.getId();
const last = (mxEv === lastShownEvent);
+ const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i);
if (grouper) {
if (grouper.shouldGroup(mxEv)) {
@@ -530,22 +537,12 @@ export default class MessagePanel extends React.Component {
for (const Grouper of groupers) {
if (Grouper.canStartGroup(this, mxEv)) {
- grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent);
+ grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent, nextEvent, nextTile);
}
}
if (!grouper) {
const wantTile = this._shouldShowEvent(mxEv);
if (wantTile) {
- const nextEvent = i < this.props.events.length - 1
- ? this.props.events[i + 1]
- : null;
-
- // The next event with tile is used to to determine the 'last successful' flag
- // when rendering the tile. The shouldShowEvent function is pretty quick at what
- // it does, so this should have no significant cost even when a room is used for
- // not-chat purposes.
- const nextTile = this.props.events.slice(i + 1).find(e => this._shouldShowEvent(e));
-
// make sure we unpack the array returned by _getTilesForEvent,
// otherwise react will auto-generate keys and we will end up
// replacing all of the DOM elements every time we paginate.
@@ -1038,6 +1035,103 @@ class CreationGrouper {
}
}
+class RedactionGrouper {
+ static canStartGroup = function(panel, ev) {
+ return panel._shouldShowEvent(ev) && ev.isRedacted();
+ }
+
+ constructor(panel, ev, prevEvent, lastShownEvent, nextEvent, nextEventTile) {
+ this.panel = panel;
+ this.readMarker = panel._readMarkerForEvent(
+ ev.getId(),
+ ev === lastShownEvent,
+ );
+ this.events = [ev];
+ this.prevEvent = prevEvent;
+ this.lastShownEvent = lastShownEvent;
+ this.nextEvent = nextEvent;
+ this.nextEventTile = nextEventTile;
+ }
+
+ shouldGroup(ev) {
+ // absorb hidden events so that they do not break up streams of messages & redaction events being grouped
+ if (!this.panel._shouldShowEvent(ev)) {
+ return true;
+ }
+ if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) {
+ return false;
+ }
+ return ev.isRedacted();
+ }
+
+ add(ev) {
+ this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
+ ev.getId(),
+ ev === this.lastShownEvent,
+ );
+ if (!this.panel._shouldShowEvent(ev)) {
+ return;
+ }
+ this.events.push(ev);
+ }
+
+ getTiles() {
+ if (!this.events || !this.events.length) return [];
+
+ const DateSeparator = sdk.getComponent('messages.DateSeparator');
+ const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
+
+ const panel = this.panel;
+ const ret = [];
+ const lastShownEvent = this.lastShownEvent;
+
+ if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
+ const ts = this.events[0].getTs();
+ ret.push(
+
+ { eventTiles }
+ ,
+ );
+
+ if (this.readMarker) {
+ ret.push(this.readMarker);
+ }
+
+ return ret;
+ }
+
+ getNewPrevEvent() {
+ return this.events[this.events.length - 1];
+ }
+}
+
// Wrap consecutive member events in a ListSummary, ignore if redacted
class MemberGrouper {
static canStartGroup = function(panel, ev) {
@@ -1148,4 +1242,4 @@ class MemberGrouper {
}
// all the grouper classes that we use
-const groupers = [CreationGrouper, MemberGrouper];
+const groupers = [CreationGrouper, MemberGrouper, RedactionGrouper];
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index fda09f9774..a64feed42c 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 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.
@@ -20,17 +20,21 @@ import classNames from "classnames";
import defaultDispatcher from "../../dispatcher/dispatcher";
import { _t } from "../../languageHandler";
import { ActionPayload } from "../../dispatcher/payloads";
-import { Key } from "../../Keyboard";
import AccessibleButton from "../views/elements/AccessibleButton";
import { Action } from "../../dispatcher/actions";
import RoomListStore from "../../stores/room-list/RoomListStore";
import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition";
+import { getKeyBindingsManager, RoomListAction } from "../../KeyBindingsManager";
import {replaceableComponent} from "../../utils/replaceableComponent";
+import SpaceStore, {UPDATE_SELECTED_SPACE} from "../../stores/SpaceStore";
interface IProps {
isMinimized: boolean;
- onVerticalArrow(ev: React.KeyboardEvent): void;
- onEnter(ev: React.KeyboardEvent): boolean;
+ onKeyDown(ev: React.KeyboardEvent): void;
+ /**
+ * @returns true if a room has been selected and the search field should be cleared
+ */
+ onSelectRoom(): boolean;
}
interface IState {
@@ -53,6 +57,8 @@ export default class RoomSearch extends React.PureComponent {
};
this.dispatcherRef = defaultDispatcher.register(this.onAction);
+ // clear filter when changing spaces, in future we may wish to maintain a filter per-space
+ SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.clearInput);
}
public componentDidUpdate(prevProps: Readonly, prevState: Readonly): void {
@@ -72,6 +78,7 @@ export default class RoomSearch extends React.PureComponent {
public componentWillUnmount() {
defaultDispatcher.unregister(this.dispatcherRef);
+ SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.clearInput);
}
private onAction = (payload: ActionPayload) => {
@@ -108,18 +115,26 @@ export default class RoomSearch extends React.PureComponent {
};
private onKeyDown = (ev: React.KeyboardEvent) => {
- if (ev.key === Key.ESCAPE) {
- this.clearInput();
- defaultDispatcher.fire(Action.FocusComposer);
- } else if (ev.key === Key.ARROW_UP || ev.key === Key.ARROW_DOWN) {
- this.props.onVerticalArrow(ev);
- } else if (ev.key === Key.ENTER) {
- const shouldClear = this.props.onEnter(ev);
- if (shouldClear) {
- // wrap in set immediate to delay it so that we don't clear the filter & then change room
- setImmediate(() => {
- this.clearInput();
- });
+ const action = getKeyBindingsManager().getRoomListAction(ev);
+ switch (action) {
+ case RoomListAction.ClearSearch:
+ this.clearInput();
+ defaultDispatcher.fire(Action.FocusComposer);
+ break;
+ case RoomListAction.NextRoom:
+ case RoomListAction.PrevRoom:
+ // we don't handle these actions here put pass the event on to the interested party (LeftPanel)
+ this.props.onKeyDown(ev);
+ break;
+ case RoomListAction.SelectRoom: {
+ const shouldClear = this.props.onSelectRoom();
+ if (shouldClear) {
+ // wrap in set immediate to delay it so that we don't clear the filter & then change room
+ setImmediate(() => {
+ this.clearInput();
+ });
+ }
+ break;
}
}
};
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 8b70998be0..54b6fee233 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -16,7 +16,6 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
-import Matrix from 'matrix-js-sdk';
import { _t, _td } from '../../languageHandler';
import {MatrixClientPeg} from '../../MatrixClientPeg';
import Resend from '../../Resend';
@@ -24,6 +23,7 @@ import dis from '../../dispatcher/dispatcher';
import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
import {Action} from "../../dispatcher/actions";
import {replaceableComponent} from "../../utils/replaceableComponent";
+import {EventStatus} from "matrix-js-sdk/src/models/event";
const STATUS_BAR_HIDDEN = 0;
const STATUS_BAR_EXPANDED = 1;
@@ -32,7 +32,7 @@ const STATUS_BAR_EXPANDED_LARGE = 2;
function getUnsentMessages(room) {
if (!room) { return []; }
return room.getPendingEvents().filter(function(ev) {
- return ev.status === Matrix.EventStatus.NOT_SENT;
+ return ev.status === EventStatus.NOT_SENT;
});
}
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 706cd5ded8..a180afba29 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -40,7 +40,6 @@ import Tinter from '../../Tinter';
import rateLimitedFunc from '../../ratelimitedfunc';
import * as Rooms from '../../Rooms';
import eventSearch, { searchPagination } from '../../Searching';
-import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent, Key } from '../../Keyboard';
import MainSplit from './MainSplit';
import RightPanel from './RightPanel';
import RoomViewStore from '../../stores/RoomViewStore';
@@ -79,6 +78,7 @@ import Notifier from "../../Notifier";
import { showToast as showNotificationsToast } from "../../toasts/DesktopNotificationsToast";
import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore";
+import { getKeyBindingsManager, RoomAction } from '../../KeyBindingsManager';
import { objectHasDiff } from "../../utils/objects";
import SpaceRoomView from "./SpaceRoomView";
import { IOpts } from "../../createRoom";
@@ -112,10 +112,6 @@ interface IProps {
inviterName?: string;
};
- // Servers the RoomView can use to try and assist joins
- viaServers?: string[];
-
- autoJoin?: boolean;
resizeNotifier: ResizeNotifier;
justCreatedOpts?: IOpts;
@@ -450,9 +446,7 @@ export default class RoomView extends React.Component {
// now not joined because the js-sdk peeking API will clobber our historical room,
// making it impossible to indicate a newly joined room.
if (!joining && roomId) {
- if (this.props.autoJoin) {
- this.onJoinButtonClicked();
- } else if (!room && shouldPeek) {
+ if (!room && shouldPeek) {
console.info("Attempting to peek into room %s", roomId);
this.setState({
peekLoading: true,
@@ -668,26 +662,20 @@ export default class RoomView extends React.Component {
private onReactKeyDown = ev => {
let handled = false;
- switch (ev.key) {
- case Key.ESCAPE:
- if (!ev.altKey && !ev.ctrlKey && !ev.shiftKey && !ev.metaKey) {
- this.messagePanel.forgetReadMarker();
- this.jumpToLiveTimeline();
- handled = true;
- }
+ const action = getKeyBindingsManager().getRoomAction(ev);
+ switch (action) {
+ case RoomAction.DismissReadMarker:
+ this.messagePanel.forgetReadMarker();
+ this.jumpToLiveTimeline();
+ handled = true;
break;
- case Key.PAGE_UP:
- if (!ev.altKey && !ev.ctrlKey && ev.shiftKey && !ev.metaKey) {
- this.jumpToReadMarker();
- handled = true;
- }
+ case RoomAction.JumpToOldestUnread:
+ this.jumpToReadMarker();
+ handled = true;
break;
- case Key.U: // Mac returns lowercase
- case Key.U.toUpperCase():
- if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) && ev.shiftKey) {
- dis.dispatch({ action: "upload_file" }, true);
- handled = true;
- }
+ case RoomAction.UploadFile:
+ dis.dispatch({ action: "upload_file" }, true);
+ handled = true;
break;
}
@@ -1123,7 +1111,7 @@ export default class RoomView extends React.Component {
const signUrl = this.props.threepidInvite?.signUrl;
dis.dispatch({
action: 'join_room',
- opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
+ opts: { inviteSignUrl: signUrl },
_type: "unknown", // TODO: instrumentation
});
return Promise.resolve();
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 3a9b2b8a77..976734680c 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -16,10 +16,10 @@ limitations under the License.
import React, {createRef} from "react";
import PropTypes from 'prop-types';
-import { Key } from '../../Keyboard';
import Timer from '../../utils/Timer';
import AutoHideScrollbar from "./AutoHideScrollbar";
import {replaceableComponent} from "../../utils/replaceableComponent";
+import {getKeyBindingsManager, RoomAction} from "../../KeyBindingsManager";
const DEBUG_SCROLL = false;
@@ -535,29 +535,19 @@ export default class ScrollPanel extends React.Component {
* @param {object} ev the keyboard event
*/
handleScrollKey = ev => {
- switch (ev.key) {
- case Key.PAGE_UP:
- if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
- this.scrollRelative(-1);
- }
+ const roomAction = getKeyBindingsManager().getRoomAction(ev);
+ switch (roomAction) {
+ case RoomAction.ScrollUp:
+ this.scrollRelative(-1);
break;
-
- case Key.PAGE_DOWN:
- if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
- this.scrollRelative(1);
- }
+ case RoomAction.RoomScrollDown:
+ this.scrollRelative(1);
break;
-
- case Key.HOME:
- if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
- this.scrollToTop();
- }
+ case RoomAction.JumpToFirstMessage:
+ this.scrollToTop();
break;
-
- case Key.END:
- if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
- this.scrollToBottom();
- }
+ case RoomAction.JumpToLatestMessage:
+ this.scrollToBottom();
break;
}
};
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 6daa8526bc..abeb858274 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -32,6 +32,8 @@ export default class SearchBox extends React.Component {
onKeyDown: PropTypes.func,
className: PropTypes.string,
placeholder: PropTypes.string.isRequired,
+ autoFocus: PropTypes.bool,
+ initialValue: PropTypes.string,
// If true, the search box will focus and clear itself
// on room search focus action (it would be nicer to take
@@ -49,7 +51,7 @@ export default class SearchBox extends React.Component {
this._search = createRef();
this.state = {
- searchTerm: "",
+ searchTerm: this.props.initialValue || "",
blurred: true,
};
}
@@ -158,6 +160,7 @@ export default class SearchBox extends React.Component {
onBlur={this._onBlur}
placeholder={ placeholder }
autoComplete="off"
+ autoFocus={this.props.autoFocus}
/>
{ clearButton }
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 9ee16558d3..930cfa15a9 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -14,32 +14,37 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, {useMemo, useRef, useState} from "react";
-import Room from "matrix-js-sdk/src/models/room";
-import MatrixEvent from "matrix-js-sdk/src/models/event";
+import React, {useMemo, useState} from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
+import classNames from "classnames";
+import {sortBy} from "lodash";
import {MatrixClientPeg} from "../../MatrixClientPeg";
import dis from "../../dispatcher/dispatcher";
import {_t} from "../../languageHandler";
import AccessibleButton from "../views/elements/AccessibleButton";
import BaseDialog from "../views/dialogs/BaseDialog";
-import FormButton from "../views/elements/FormButton";
+import Spinner from "../views/elements/Spinner";
import SearchBox from "./SearchBox";
import RoomAvatar from "../views/avatars/RoomAvatar";
import RoomName from "../views/elements/RoomName";
import {useAsyncMemo} from "../../hooks/useAsyncMemo";
-import {shouldShowSpaceSettings} from "../../utils/space";
import {EnhancedMap} from "../../utils/maps";
import StyledCheckbox from "../views/elements/StyledCheckbox";
import AutoHideScrollbar from "./AutoHideScrollbar";
import BaseAvatar from "../views/avatars/BaseAvatar";
import {mediaFromMxc} from "../../customisations/Media";
+import InfoTooltip from "../views/elements/InfoTooltip";
+import TextWithTooltip from "../views/elements/TextWithTooltip";
+import {useStateToggle} from "../../hooks/useStateToggle";
-interface IProps {
+interface IHierarchyProps {
space: Room;
initialText?: string;
- onFinished(): void;
+ refreshToken?: any;
+ showRoom(room: ISpaceSummaryRoom, viaServers?: string[], autoJoin?: boolean): void;
}
/* eslint-disable camelcase */
@@ -72,227 +77,131 @@ export interface ISpaceSummaryEvent {
}
/* eslint-enable camelcase */
-interface ISubspaceProps {
- space: ISpaceSummaryRoom;
- event?: MatrixEvent;
- editing?: boolean;
- onPreviewClick?(): void;
- queueAction?(action: IAction): void;
- onJoinClick?(): void;
+interface ITileProps {
+ room: ISpaceSummaryRoom;
+ suggested?: boolean;
+ selected?: boolean;
+ numChildRooms?: number;
+ hasPermissions?: boolean;
+ onViewRoomClick(autoJoin: boolean): void;
+ onToggleClick?(): void;
}
-const SubSpace: React.FC
- { leftPanel }
+ { SettingsStore.getValue("feature_spaces") ?
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 0272633e8f..532b1f4225 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1,8 +1,5 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017-2019 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2021 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.
@@ -18,8 +15,7 @@ limitations under the License.
*/
import React, { createRef } from 'react';
-// @ts-ignore - XXX: no idea why this import fails
-import * as Matrix from "matrix-js-sdk";
+import { createClient } from "matrix-js-sdk/src/matrix";
import { InvalidStoreError } from "matrix-js-sdk/src/errors";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
@@ -82,9 +78,12 @@ import {UIFeature} from "../../settings/UIFeature";
import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
import DialPadModal from "../views/voip/DialPadModal";
import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
+import { shouldUseLoginForWelcome } from "../../utils/pages";
import SpaceStore from "../../stores/SpaceStore";
-import SpaceRoomDirectory from "./SpaceRoomDirectory";
import {replaceableComponent} from "../../utils/replaceableComponent";
+import RoomListStore from "../../stores/room-list/RoomListStore";
+import {RoomUpdateCause} from "../../stores/room-list/models";
+import defaultDispatcher from "../../dispatcher/dispatcher";
/** constants for MatrixChat.state.view */
export enum Views {
@@ -203,7 +202,6 @@ interface IState {
ready: boolean;
threepidInvite?: IThreepidInvite,
roomOobData?: object;
- viaServers?: string[];
pendingInitialSync?: boolean;
justRegistered?: boolean;
roomJustCreatedOpts?: IOpts;
@@ -582,6 +580,7 @@ export default class MatrixChat extends React.PureComponent
-
-};
-
-interface IAction {
- event: MatrixEvent;
- suggested: boolean;
- removed: boolean;
-}
-
-interface IRoomTileProps {
- room: ISpaceSummaryRoom;
- event?: MatrixEvent;
- editing?: boolean;
- onPreviewClick(): void;
- queueAction?(action: IAction): void;
- onJoinClick?(): void;
-}
-
-const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinClick }: IRoomTileProps) => {
- const name = room.name || room.canonical_alias || room.aliases?.[0] || _t("Unnamed Room");
-
- const evContent = event?.getContent();
- const [suggested, _setSuggested] = useState(evContent?.suggested);
- const [removed, _setRemoved] = useState(!evContent?.via);
+ const [showChildren, toggleShowChildren] = useStateToggle(true);
const cli = MatrixClientPeg.get();
const cliRoom = cli.getRoom(room.room_id);
const myMembership = cliRoom?.getMyMembership();
- let actions;
- if (editing && queueAction) {
- if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
- const setSuggested = () => {
- _setSuggested(v => {
- queueAction({
- event,
- removed,
- suggested: !v,
- });
- return !v;
- });
- };
+ const onPreviewClick = () => onViewRoomClick(false);
+ const onJoinClick = () => onViewRoomClick(true);
- const setRemoved = () => {
- _setRemoved(v => {
- queueAction({
- event,
- removed: !v,
- suggested,
- });
- return !v;
- });
- };
+ let button;
+ if (myMembership === "join") {
+ button =
-
-
- { actions }
-
-
- { children }
-
-
+ { name }
+ { suggestedSection }
+
-
-
- { name }
-
-
- { room.topic }
-
+ { description }
- { room.num_joined_members }
-
-
- { actions }
+ { button }
+ { checkbox }
- { content }
-
+ let childToggle;
+ let childSection;
+ if (children) {
+ // the chevron is purposefully a div rather than a button as it should be ignored for a11y
+ childToggle = {
+ ev.stopPropagation();
+ toggleShowChildren();
+ }}
+ />;
+ if (showChildren) {
+ childSection =
- { content }
- ;
+ return <>
+
+ { content }
+ { childToggle }
+
+ { childSection }
+ ;
};
export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
@@ -325,99 +234,337 @@ export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoi
interface IHierarchyLevelProps {
spaceId: string;
rooms: Map;
- editing?: boolean;
- relations: EnhancedMap;
+ relations: Map>;
parents: Set;
- queueAction?(action: IAction): void;
- onPreviewClick(roomId: string): void;
- onRemoveFromSpaceClick?(roomId: string): void;
- onJoinClick?(roomId: string): void;
+ selectedMap?: Map>;
+ onViewRoomClick(roomId: string, autoJoin: boolean): void;
+ onToggleClick?(parentId: string, childId: string): void;
}
export const HierarchyLevel = ({
spaceId,
rooms,
- editing,
relations,
parents,
- onPreviewClick,
- onJoinClick,
- queueAction,
+ selectedMap,
+ onViewRoomClick,
+ onToggleClick,
}: IHierarchyLevelProps) => {
const cli = MatrixClientPeg.get();
const space = cli.getRoom(spaceId);
- // TODO respect order
- const [subspaces, childRooms] = relations.get(spaceId)?.reduce((result, roomId: string) => {
- if (!rooms.has(roomId)) return result; // TODO wat
+ const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
+
+ const sortedChildren = sortBy([...(relations.get(spaceId)?.values() || [])], ev => ev.content.order || null);
+ const [subspaces, childRooms] = sortedChildren.reduce((result, ev: ISpaceSummaryEvent) => {
+ const roomId = ev.state_key;
+ if (!rooms.has(roomId)) return result;
result[rooms.get(roomId).room_type === RoomType.Space ? 0 : 1].push(roomId);
return result;
}, [[], []]) || [[], []];
- // Don't render this subspace if it has no rooms we can show
- // TODO this is broken - as a space may have subspaces we still need to show
- // if (!childRooms.length) return null;
-
- const userId = cli.getUserId();
-
const newParents = new Set(parents).add(spaceId);
return
{
childRooms.map(roomId => (
- {
- onPreviewClick(roomId);
+ suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
+ selected={selectedMap?.get(spaceId)?.has(roomId)}
+ onViewRoomClick={(autoJoin) => {
+ onViewRoomClick(roomId, autoJoin);
}}
- onJoinClick={onJoinClick ? () => {
- onJoinClick(roomId);
- } : undefined}
+ hasPermissions={hasPermissions}
+ onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined}
/>
))
}
{
subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => (
- {
- onPreviewClick(roomId);
- }}
- onJoinClick={() => {
- onJoinClick(roomId);
+ room={rooms.get(roomId)}
+ numChildRooms={Array.from(relations.get(roomId)?.values() || [])
+ .filter(ev => rooms.get(ev.state_key)?.room_type !== RoomType.Space).length}
+ suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
+ selected={selectedMap?.get(spaceId)?.has(roomId)}
+ onViewRoomClick={(autoJoin) => {
+ onViewRoomClick(roomId, autoJoin);
}}
+ hasPermissions={hasPermissions}
+ onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined}
>
+
))
}
};
-const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinished }) => {
+// mutate argument refreshToken to force a reload
+export const useSpaceSummary = (cli: MatrixClient, space: Room, refreshToken?: any): [
+ ISpaceSummaryRoom[],
+ Map>,
+ Map>,
+ Map>,
+] | [] => {
// TODO pagination
- const cli = MatrixClientPeg.get();
- const [query, setQuery] = useState(initialText);
- const [isEditing, setIsEditing] = useState(false);
+ return useAsyncMemo(async () => {
+ try {
+ const data = await cli.getSpaceSummary(space.roomId);
+ const parentChildRelations = new EnhancedMap>();
+ const childParentRelations = new EnhancedMap>();
+ const viaMap = new EnhancedMap>();
+ data.events.map((ev: ISpaceSummaryEvent) => {
+ if (ev.type === EventType.SpaceChild) {
+ parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
+ childParentRelations.getOrCreate(ev.state_key, new Set()).add(ev.room_id);
+ }
+ if (Array.isArray(ev.content["via"])) {
+ const set = viaMap.getOrCreate(ev.state_key, new Set());
+ ev.content["via"].forEach(via => set.add(via));
+ }
+ });
+
+ return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, viaMap, childParentRelations];
+ } catch (e) {
+ console.error(e); // TODO
+ }
+
+ return [];
+ }, [space, refreshToken], []);
+};
+
+export const SpaceHierarchy: React.FC = ({
+ space,
+ initialText = "",
+ showRoom,
+ refreshToken,
+ children,
+}) => {
+ const cli = MatrixClientPeg.get();
+ const userId = cli.getUserId();
+ const [query, setQuery] = useState(initialText);
+
+ const [selected, setSelected] = useState(new Map>()); // Map>
+
+ const [rooms, parentChildMap, viaMap, childParentMap] = useSpaceSummary(cli, space, refreshToken);
+
+ const roomsMap = useMemo(() => {
+ if (!rooms) return null;
+ const lcQuery = query.toLowerCase().trim();
+
+ const roomsMap = new Map(rooms.map(r => [r.room_id, r]));
+ if (!lcQuery) return roomsMap;
+
+ const directMatches = rooms.filter(r => {
+ return r.name?.toLowerCase().includes(lcQuery) || r.topic?.toLowerCase().includes(lcQuery);
+ });
+
+ // Walk back up the tree to find all parents of the direct matches to show their place in the hierarchy
+ const visited = new Set();
+ const queue = [...directMatches.map(r => r.room_id)];
+ while (queue.length) {
+ const roomId = queue.pop();
+ visited.add(roomId);
+ childParentMap.get(roomId)?.forEach(parentId => {
+ if (!visited.has(parentId)) {
+ queue.push(parentId);
+ }
+ });
+ }
+
+ // Remove any mappings for rooms which were not visited in the walk
+ Array.from(roomsMap.keys()).forEach(roomId => {
+ if (!visited.has(roomId)) {
+ roomsMap.delete(roomId);
+ }
+ });
+ return roomsMap;
+ }, [rooms, childParentMap, query]);
+
+ const [error, setError] = useState("");
+ const [removing, setRemoving] = useState(false);
+ const [saving, setSaving] = useState(false);
+
+ let content;
+ if (roomsMap) {
+ const numRooms = Array.from(roomsMap.values()).filter(r => r.room_type !== RoomType.Space).length;
+ const numSpaces = roomsMap.size - numRooms - 1; // -1 at the end to exclude the space we are looking at
+
+ let countsStr;
+ if (numSpaces > 1) {
+ countsStr = _t("%(count)s rooms and %(numSpaces)s spaces", { count: numRooms, numSpaces });
+ } else if (numSpaces > 0) {
+ countsStr = _t("%(count)s rooms and 1 space", { count: numRooms, numSpaces });
+ } else {
+ countsStr = _t("%(count)s rooms", { count: numRooms, numSpaces });
+ }
+
+ let editSection;
+ if (space.getMyMembership() === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+ const selectedRelations = Array.from(selected.keys()).flatMap(parentId => {
+ return [...selected.get(parentId).values()].map(childId => [parentId, childId]) as [string, string][];
+ });
+
+ let buttons;
+ if (selectedRelations.length) {
+ const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
+ return parentChildMap.get(parentId)?.get(childId)?.content.suggested;
+ });
+
+ const disabled = removing || saving;
+
+ buttons = <>
+ {
+ setRemoving(true);
+ try {
+ for (const [parentId, childId] of selectedRelations) {
+ await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
+ parentChildMap.get(parentId).get(childId).content = {};
+ parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
+ }
+ } catch (e) {
+ setError(_t("Failed to remove some rooms. Try again later"));
+ }
+ setRemoving(false);
+ }}
+ kind="danger_outline"
+ disabled={disabled}
+ >
+ { removing ? _t("Removing...") : _t("Remove") }
+
+ {
+ setSaving(true);
+ try {
+ for (const [parentId, childId] of selectedRelations) {
+ const suggested = !selectionAllSuggested;
+ const existingContent = parentChildMap.get(parentId)?.get(childId)?.content;
+ if (!existingContent || existingContent.suggested === suggested) continue;
+
+ const content = {
+ ...existingContent,
+ suggested: !selectionAllSuggested,
+ };
+
+ await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId);
+
+ parentChildMap.get(parentId).get(childId).content = content;
+ parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
+ }
+ } catch (e) {
+ setError("Failed to update some suggestions. Try again later");
+ }
+ setSaving(false);
+ }}
+ kind="primary_outline"
+ disabled={disabled}
+ >
+ { saving
+ ? _t("Saving...")
+ : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested"))
+ }
+
+ ;
+ }
+
+ editSection =
+ { buttons }
+ ;
+ }
+
+ let results;
+ if (roomsMap.size) {
+ const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
+
+ results = <>
+ {
+ setError("");
+ if (!selected.has(parentId)) {
+ setSelected(new Map(selected.set(parentId, new Set([childId]))));
+ return;
+ }
+
+ const parentSet = selected.get(parentId);
+ if (!parentSet.has(childId)) {
+ setSelected(new Map(selected.set(parentId, new Set([...parentSet, childId]))));
+ return;
+ }
+
+ parentSet.delete(childId);
+ setSelected(new Map(selected.set(parentId, new Set(parentSet))));
+ } : undefined}
+ onViewRoomClick={(roomId, autoJoin) => {
+ showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin);
+ }}
+ />
+ { children &&
} + ; + } else { + results =
+ { results }
+ { children }
+
+ ;
+ } else if (!rooms) {
+ content = = ({ space, onFinished, initialText }) => {
const onCreateRoomClick = () => {
dis.dispatch({
action: 'view_create_room',
@@ -426,134 +573,40 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis
onFinished();
};
- // stored within a ref as we don't need to re-render when it changes
- const pendingActions = useRef(new Map());
-
- let adminButton;
- if (shouldShowSpaceSettings(cli, space)) { // TODO this is an imperfect test
- const onManageButtonClicked = () => {
- setIsEditing(true);
- };
-
- const onSaveButtonClicked = () => {
- // TODO setBusy
- pendingActions.current.forEach(({event, suggested, removed}) => {
- const content = {
- ...event.getContent(),
- suggested,
- };
-
- if (removed) {
- delete content["via"];
- }
-
- cli.sendStateEvent(event.getRoomId(), event.getType(), content, event.getStateKey());
- });
- setIsEditing(false);
- };
-
- if (isEditing) {
- adminButton =
- ;
- } else {
- adminButton = ();
- const viaMap = new EnhancedMap>();
- data.events.map((ev: ISpaceSummaryEvent) => {
- if (ev.type === EventType.SpaceChild) {
- parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
- }
- if (Array.isArray(ev.content["via"])) {
- const set = viaMap.getOrCreate(ev.state_key, new Set());
- ev.content["via"].forEach(via => set.add(via));
- }
- });
-
- return [data.rooms, parentChildRelations, viaMap];
- } catch (e) {
- console.error(e); // TODO
- }
-
- return [];
- }, [space], []);
-
- const roomsMap = useMemo(() => {
- if (!rooms) return null;
- const lcQuery = query.toLowerCase();
-
- const filteredRooms = rooms.filter(r => {
- return r.room_type === RoomType.Space // always include spaces to allow filtering of sub-space rooms
- || r.name?.toLowerCase().includes(lcQuery)
- || r.topic?.toLowerCase().includes(lcQuery);
- });
-
- return new Map(filteredRooms.map(r => [r.room_id, r]));
- // const root = rooms.get(space.roomId);
- }, [rooms, query]);
-
const title =
- ;
- const explanation =
- _t("If you can't find the room you're looking for, ask for an invite or Create a new room.", null,
- {a: sub => {
- return {sub} ;
- }},
- );
- let content;
- if (roomsMap) {
- content =
- {
- pendingActions.current.set(action.event.room_id, action);
- }}
- onPreviewClick={roomId => {
- showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), false);
- onFinished();
- }}
- onJoinClick={(roomId) => {
- showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), true);
- onFinished();
- }}
- />
- ;
- }
-
- // TODO loading state/error state
return (
);
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 0b0f2a2ac9..31358a3731 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -15,8 +15,9 @@ limitations under the License.
*/
import React, {RefObject, useContext, useRef, useState} from "react";
-import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
+import {EventType} from "matrix-js-sdk/src/@types/event";
import {Room} from "matrix-js-sdk/src/models/room";
+import {EventSubscription} from "fbemitter";
import MatrixClientContext from "../../contexts/MatrixClientContext";
import RoomAvatar from "../views/avatars/RoomAvatar";
@@ -25,13 +26,11 @@ import AccessibleButton from "../views/elements/AccessibleButton";
import RoomName from "../views/elements/RoomName";
import RoomTopic from "../views/elements/RoomTopic";
import InlineSpinner from "../views/elements/InlineSpinner";
-import FormButton from "../views/elements/FormButton";
import {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite";
import {useRoomMembers} from "../../hooks/useRoomMembers";
import createRoom, {IOpts, Preset} from "../../createRoom";
import Field from "../views/elements/Field";
import {useEventEmitter} from "../../hooks/useEventEmitter";
-import StyledRadioGroup from "../views/elements/StyledRadioGroup";
import withValidation from "../views/elements/Validation";
import * as Email from "../../email";
import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -42,18 +41,16 @@ import ErrorBoundary from "../views/elements/ErrorBoundary";
import {ActionPayload} from "../../dispatcher/payloads";
import RightPanel from "./RightPanel";
import RightPanelStore from "../../stores/RightPanelStore";
-import {EventSubscription} from "fbemitter";
import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
import {useStateArray} from "../../hooks/useStateArray";
import SpacePublicShare from "../views/spaces/SpacePublicShare";
import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
-import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom} from "./SpaceRoomDirectory";
-import {useAsyncMemo} from "../../hooks/useAsyncMemo";
-import {EnhancedMap} from "../../utils/maps";
-import AutoHideScrollbar from "./AutoHideScrollbar";
+import {showRoom, SpaceHierarchy} from "./SpaceRoomDirectory";
import MemberAvatar from "../views/avatars/MemberAvatar";
import {useStateToggle} from "../../hooks/useStateToggle";
+import SpaceStore from "../../stores/SpaceStore";
+import FacePile from "../views/elements/FacePile";
interface IProps {
space: Room;
@@ -66,6 +63,7 @@ interface IProps {
interface IState {
phase: Phase;
showRightPanel: boolean;
+ myMembership: string;
}
enum Phase {
@@ -94,10 +92,47 @@ const useMyRoomMembership = (room: Room) => {
return membership;
};
+const SpaceInfo = ({ space }) => {
+ const joinRule = space.getJoinRule();
+
+ let visibilitySection;
+ if (joinRule === "public") {
+ visibilitySection =
+ { _t("Public space") }
+ ;
+ } else {
+ visibilitySection =
+ { _t("Private space") }
+ ;
+ }
+
+ return {
+ setBusy(true);
+ onRejectButtonClicked();
+ }}
+ >
+ { _t("Reject") }
+
+ {
+ setBusy(true);
+ onJoinButtonClicked();
+ }}
+ >
+ { _t("Accept") }
+
;
} else {
- joinButtons = {
+ setBusy(true);
+ onJoinButtonClicked();
+ }}
+ >
+ { _t("Join") }
+
+ )
}
- let visibilitySection;
- if (space.getJoinRule() === "public") {
- visibilitySection =
- { _t("Public space") }
- ;
- } else {
- visibilitySection =
- { _t("Private space") }
- ;
+ if (busy) {
+ joinButtons = (null);
-
+const SpaceSetupPrivateScope = ({ space, onFinished }) => {
return
-
- ,
- },
- ]}
- />
-
-
;
};
@@ -547,17 +537,26 @@ export default class SpaceRoomView extends React.PureComponent {
this.state = {
phase,
showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+ myMembership: this.props.space.getMyMembership(),
};
this.dispatcherRef = defaultDispatcher.register(this.onAction);
this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
+ this.context.on("Room.myMembership", this.onMyMembership);
}
componentWillUnmount() {
defaultDispatcher.unregister(this.dispatcherRef);
this.rightPanelStoreToken.remove();
+ this.context.off("Room.myMembership", this.onMyMembership);
}
+ private onMyMembership = (room: Room, myMembership: string) => {
+ if (room.roomId === this.props.space.roomId) {
+ this.setState({ myMembership });
+ }
+ };
+
private onRightPanelStoreUpdate = () => {
this.setState({
showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
@@ -594,10 +593,45 @@ export default class SpaceRoomView extends React.PureComponent {
}
};
+ private goToFirstRoom = async () => {
+ // TODO actually go to the first room
+
+ const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId);
+ if (childRooms.length) {
+ const room = childRooms[0];
+ defaultDispatcher.dispatch({
+ action: "view_room",
+ room_id: room.roomId,
+ });
+ return;
+ }
+
+ let suggestedRooms = SpaceStore.instance.suggestedRooms;
+ if (SpaceStore.instance.activeSpace !== this.props.space) {
+ // the space store has the suggested rooms loaded for a different space, fetch the right ones
+ suggestedRooms = (await SpaceStore.instance.fetchSuggestedRooms(this.props.space, 1)).rooms;
+ }
+
+ if (suggestedRooms.length) {
+ const room = suggestedRooms[0];
+ defaultDispatcher.dispatch({
+ action: "view_room",
+ room_id: room.room_id,
+ oobData: {
+ avatarUrl: room.avatar_url,
+ name: room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room"),
+ },
+ });
+ return;
+ }
+
+ this.setState({ phase: Phase.Landing });
+ };
+
private renderBody() {
switch (this.state.phase) {
case Phase.Landing:
- if (this.props.space.getMyMembership() === "join") {
+ if (this.state.myMembership === "join") {
return {
case Phase.PublicCreateRooms:
return this.setState({ phase: Phase.PublicShare })}
/>;
case Phase.PublicShare:
- return this.setState({ phase: Phase.Landing })}
- />;
+ return {
this.setState({ phase: invite ? Phase.PrivateInvite : Phase.PrivateCreateRooms });
}}
@@ -634,7 +671,8 @@ export default class SpaceRoomView extends React.PureComponent {
return this.setState({ phase: Phase.Landing })}
/>;
}
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index f32b8ed0a9..12f5d6e890 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -22,8 +22,8 @@ import {LayoutPropType} from "../../settings/Layout";
import React, {createRef} from 'react';
import ReactDOM from "react-dom";
import PropTypes from 'prop-types';
-import {EventTimeline} from "matrix-js-sdk";
-import * as Matrix from "matrix-js-sdk";
+import {EventTimeline} from "matrix-js-sdk/src/models/event-timeline";
+import {TimelineWindow} from "matrix-js-sdk/src/timeline-window";
import { _t } from '../../languageHandler';
import {MatrixClientPeg} from "../../MatrixClientPeg";
import UserActivity from "../../UserActivity";
@@ -463,6 +463,9 @@ class TimelinePanel extends React.Component {
}
});
}
+ if (payload.action === "scroll_to_bottom") {
+ this.jumpToLiveTimeline();
+ }
};
onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => {
@@ -1007,7 +1010,7 @@ class TimelinePanel extends React.Component {
* returns a promise which will resolve when the load completes.
*/
_loadTimeline(eventId, pixelOffset, offsetBase) {
- this._timelineWindow = new Matrix.TimelineWindow(
+ this._timelineWindow = new TimelineWindow(
MatrixClientPeg.get(), this.props.timelineSet,
{windowLimit: this.props.timelineCap});
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index 4a1fd4313d..e19e312f58 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -43,7 +43,11 @@ export default class UploadBar extends React.Component {
constructor(props) {
super(props);
- this.state = {uploadsHere: []};
+
+ // Set initial state to any available upload in this room - we might be mounting
+ // earlier than the first progress event, so should show something relevant.
+ const uploadsHere = this.getUploadsInRoom();
+ this.state = {currentUpload: uploadsHere[0], uploadsHere};
}
componentDidMount() {
@@ -56,6 +60,11 @@ export default class UploadBar extends React.Component {
dis.unregister(this.dispatcherRef);
}
+ private getUploadsInRoom(): IUpload[] {
+ const uploads = ContentMessages.sharedInstance().getCurrentUploads();
+ return uploads.filter(u => u.roomId === this.props.room.roomId);
+ }
+
private onAction = (payload: ActionPayload) => {
switch (payload.action) {
case Action.UploadStarted:
@@ -64,8 +73,7 @@ export default class UploadBar extends React.Component {
case Action.UploadCanceled:
case Action.UploadFailed: {
if (!this.mounted) return;
- const uploads = ContentMessages.sharedInstance().getCurrentUploads();
- const uploadsHere = uploads.filter(u => u.roomId === this.props.room.roomId);
+ const uploadsHere = this.getUploadsInRoom();
this.setState({currentUpload: uploadsHere[0], uploadsHere});
break;
}
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index dc05193ece..6b472783bb 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -17,13 +17,14 @@ limitations under the License.
import React from "react";
import PropTypes from "prop-types";
-import Matrix from "matrix-js-sdk";
import {MatrixClientPeg} from "../../MatrixClientPeg";
import * as sdk from "../../index";
import Modal from '../../Modal';
import { _t } from '../../languageHandler';
import HomePage from "./HomePage";
import {replaceableComponent} from "../../utils/replaceableComponent";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
@replaceableComponent("structures.UserView")
export default class UserView extends React.Component {
@@ -68,8 +69,8 @@ export default class UserView extends React.Component {
this.setState({loading: false});
return;
}
- const fakeEvent = new Matrix.MatrixEvent({type: "m.room.member", content: profileInfo});
- const member = new Matrix.RoomMember(null, this.props.userId);
+ const fakeEvent = new MatrixEvent({type: "m.room.member", content: profileInfo});
+ const member = new RoomMember(null, this.props.userId);
member.setMembershipEvent(fakeEvent);
this.setState({member, loading: false});
}
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index be9be4db81..6fe99dd464 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -176,8 +176,8 @@ export default class ViewSource extends React.Component {
return (
{
}
const {hsUrl, isUrl} = serverConfig;
- const cli = Matrix.createClient({
+ const cli = createClient({
baseUrl: hsUrl,
idBaseUrl: isUrl,
});
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index e246b9cbd0..803df19d00 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -155,15 +155,14 @@ export default class SetupEncryptionBody extends React.Component {
let verifyButton;
if (store.hasDevicesToVerifyAgainst) {
verifyButton =
- { _t("Verify with another session") }
+ { _t("Use another login") }
;
}
return (
);
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index 67ed0f8f53..5454b97287 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -18,7 +18,7 @@ import React, {PureComponent} from 'react';
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import PropTypes from "prop-types";
-import {MatrixEvent} from "matrix-js-sdk";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
import {MatrixClientPeg} from "../../../MatrixClientPeg";
import SdkConfig from '../../../SdkConfig';
import Markdown from '../../../Markdown';
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
index 452ac56dff..c6ef2c6ae2 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
@@ -82,6 +82,33 @@ export default class RoomUpgradeWarningDialog extends React.Component {
const title = this.state.isPrivate ? _t("Upgrade private room") : _t("Upgrade public room");
+ let bugReports = (
+
-
;
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
index 07e29adcff..618b0b4347 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import {Room} from "matrix-js-sdk";
+import {Room} from "matrix-js-sdk/src/models/room";
import * as sdk from '../../../index';
import {dialogTermsInteractionCallback, TermsNotSignedError} from "../../../Terms";
import classNames from 'classnames';
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.js
index 72e6c3f3a0..e8625ec6cb 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.js
@@ -20,8 +20,8 @@ import PropTypes from 'prop-types';
import * as sdk from '../../../index';
import { _t, pickBestLanguage } from '../../../languageHandler';
-import Matrix from 'matrix-js-sdk';
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
class TermsCheckbox extends React.PureComponent {
static propTypes = {
@@ -85,22 +85,22 @@ export default class TermsDialog extends React.PureComponent {
_nameForServiceType(serviceType, host) {
switch (serviceType) {
- case Matrix.SERVICE_TYPES.IS:
+ case SERVICE_TYPES.IS:
return
+ { children }
+
;
+ }
}
- return } + ; + } else { + results =
+
;
+ }
+
+ content = <>
+ { _t("No results found") }
+{ _t("You may want to try a different search or check for typos.") }
+
+ { countsStr }
+ { editSection }
+
+ { error &&
+ { error }
+
}
+ {_t("Your server does not support showing space hierarchies.")}
; + } + + // TODO loading state/error state + return <> +{ _t("Explore rooms") }
- { explanation }
+ { _t("If you can't find the room you're looking for, ask for an invite or create a new room.",
+ null,
+ {a: sub => {
+ return {sub} ;
+ }},
+ ) }
- {
+ showRoom(room, viaServers, autoJoin);
+ onFinished();
+ }}
+ initialText={initialText}
+ >
+
+ { _t("Create room") }
+
+
- { adminButton }
-
- { content }
+
+ { visibilitySection }
+ { joinRule === "public" &&
+ {(count) => count > 0 ? (
+ {
+ defaultDispatcher.dispatch({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.RoomMemberList,
+ refireParams: { space },
+ });
+ }}
+ >
+ { _t("%(count)s members", { count }) }
+
+ ) : null}
+ }
+
+};
+
const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
const cli = useContext(MatrixClientContext);
const myMembership = useMyRoomMembership(space);
+ const [busy, setBusy] = useState(false);
+
let inviterSection;
let joinButtons;
if (myMembership === "invite") {
@@ -121,22 +156,41 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
}
joinButtons = <>
-
@@ -145,26 +199,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
-
{(topic, ref) =>
+ { space.getJoinRule() === "public" && {
- showRoomInviteDialog(space.roomId);
- }}>
- { _t("Invite people") }
+ {
+ showRoomInviteDialog(space.roomId);
+ }}
+ >
+ { _t("Invite") }
);
}
const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
- const [_, forceUpdate] = useStateToggle(false); // TODO
+ const [refreshToken, forceUpdate] = useStateToggle(false);
let addRoomButtons;
if (canAddRooms) {
@@ -226,50 +266,13 @@ const SpaceLanding = ({ space }) => {
;
}
- const [loading, roomsMap, relations, numRooms] = useAsyncMemo(async () => {
- try {
- const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
-
- const parentChildRelations = new EnhancedMap();
- data.events.map((ev: ISpaceSummaryEvent) => {
- if (ev.type === EventType.SpaceChild) {
- parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
- }
- });
-
- const roomsMap = new Map(data.rooms.map(r => [r.room_id, r]));
- const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length;
- return [false, roomsMap, parentChildRelations, numRooms];
- } catch (e) {
- console.error(e); // TODO
- }
-
- return [false];
- }, [space, _], [true]);
-
- let previewRooms;
- if (roomsMap) {
- previewRooms =
- {
- showRoom(roomsMap.get(roomId), [], false); // TODO
- }}
- />
- ;
- } else if (loading) {
- previewRooms = ({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.RoomMemberList,
+ refireParams: { space },
+ });
+ };
return
- {(count) => count > 0 ? (
- {
- defaultDispatcher.dispatch({
- action: Action.SetRightPanelPhase,
- phase: RightPanelPhases.RoomMemberList,
- refireParams: { space },
- });
- }}
- >
- { _t("%(count)s members", { count }) }
-
- ) : null}
-
};
- if (shouldShowSpaceSettings(cli, space)) {
- if (space.getJoinRule() === "public") {
- return _t("Your public space
;
};
@@ -337,6 +321,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
placeholder={placeholders[i]}
value={roomNames[i]}
onChange={ev => setRoomName(i, ev.target.value)}
+ autoFocus={i === 2}
/>;
});
@@ -369,7 +354,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
let buttonLabel = _t("Skip for now");
if (roomNames.some(name => name.trim())) {
onClick = onNextClick;
- buttonLabel = busy ? _t("Creating rooms...") : _t("Next")
+ buttonLabel = busy ? _t("Creating rooms...") : _t("Continue")
}
return
- { visibilitySection }
-
- {(count) => count > 0 ? (
- {
- defaultDispatcher.dispatch({
- action: Action.SetRightPanelPhase,
- phase: RightPanelPhases.RoomMemberList,
- refireParams: { space },
- });
- }}
- >
- { _t("%(count)s members", { count }) }
-
- ) : null}
-
-
+
@@ -172,6 +207,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
}
{ joinButtons }
@@ -186,17 +222,21 @@ const SpaceLanding = ({ space }) => {
let inviteButton;
if (myMembership === "join" && space.canInvite(userId)) {
inviteButton = (
-
-
- { myMembership === "join" ? _t("Rooms") : _t("Default Rooms")}
- { numRooms } -{_t("Your server does not support showing space hierarchies.")}
; - } + const onMembersClick = () => { + defaultDispatcher.dispatch{ name }
-
+
- { inviteButton }
{ addRoomButtons }
{ settingsButton }
- { previewRooms }
+
@@ -380,61 +365,55 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
{ fields }
;
};
const SpaceSetupPublicShare = ({ space, onFinished }) => {
return
-
-
;
};
-const SpaceSetupPrivateScope = ({ onFinished }) => {
- const [option, setOption] = useState{ _t("Share your public space") }
-{ _t("At the moment only you can see it.") }
+ { _t("Share %(name)s", { name: space.name }) }
+
+ { _t("It's just you at the moment, it will be even better with others.") }
+
-
-
+ { _t("Go to my first room") }
+
{ _t("Who are you working with?") }
-{ _t("Ensure the right people have access to the space.") }
-
- { _t("Just Me") }
-{ _t("A private space just for you") }
- ,
- }, {
- value: "meAndMyTeammates",
- className: "mx_SpaceRoomView_privateScope_meAndMyTeammatesButton",
- label: { _t("Me and my teammates") }
-{ _t("A private space for you and your teammates") }
-
- onFinished(option !== "justMe")} />
+ { onFinished(false) }}
+ >
+
+ { onFinished(true) }}
+ >
+
;
};
@@ -464,6 +443,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
onChange={ev => setEmailAddress(i, ev.target.value)}
ref={fieldRefs[i]}
onValidate={validateEmailRules}
+ autoFocus={i === 0}
/>;
});
@@ -501,9 +481,18 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
setBusy(false);
};
+ let onClick = onFinished;
+ let buttonLabel = _t("Skip for now");
+ if (emailAddresses.some(name => name.trim())) {
+ onClick = onNextClick;
+ buttonLabel = busy ? _t("Inviting...") : _t("Continue")
+ }
+
return
+ { _t("Make sure the right people have access to %(name)s", { name: space.name }) }
+
+ { _t("Just me") }
+{ _t("A private space to organise your rooms") }
+ { _t("Me and my teammates") }
+{ _t("A private space for you and your teammates") }
+ { _t("Invite your teammates") }
-{ _t("Ensure the right people have access to the space.") }
+
+ { _t("Make sure the right people have access. You can invite more later.") }
+
{ error && { error }
}
{ fields }
@@ -518,8 +507,9 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
- {_t("Skip for now")}
-
+ { buttonLabel }
+
-
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 32bdddb82a..9d004de2ec 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import Matrix from 'matrix-js-sdk';
+import {createClient} from 'matrix-js-sdk/src/matrix';
import React, {ReactNode} from 'react';
import {MatrixClient} from "matrix-js-sdk/src/client";
@@ -181,7 +181,7 @@ export default class Registration extends React.ComponentRoom ID: {roomId}
- Event ID: {eventId}
+ Room ID: {roomId}
+ Event ID: {eventId}
{isEditing ? this.editSourceContent() : this.viewSourceContent()}
{_t( - "Verify this login to access your encrypted messages and " + - "prove to others that this login is really you.", + "Verify your identity to access encrypted messages and prove your identity to others.", )}
@@ -205,8 +204,8 @@ export default class SetupEncryptionBody extends React.Component {
return (
{
if (onClick) {
return (
= ({ matrixClient: cli, space,
const existingRoomsSet = new Set(existingRooms);
const rooms = cli.getVisibleRooms().filter(room => {
return !existingRoomsSet.has(room) // not already in space
+ && !room.isSpaceRoom() // not a space itself
&& room.name.toLowerCase().includes(lcQuery) // contains query
&& !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM
});
@@ -109,7 +109,7 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
const title =
;
@@ -127,29 +127,9 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
className="mx_textinput_icon mx_textinput_search"
placeholder={ _t("Filter your rooms and spaces") }
onSearch={setQuery}
+ autoComplete={true}
/>
- { spaces.length > 0 ? (
-
= ({ matrixClient: cli, space,
) : undefined }
+ { spaces.length > 0 ? (
+ = ({ matrixClient: cli, space,
- {
setBusy(true);
@@ -199,7 +200,9 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
}
setBusy(false);
}}
- />
+ >
+ { busy ? _t("Adding...") : _t("Add") }
+
;
};
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 8cfd28986b..8059b9172a 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import { GroupMemberType } from '../../../groups';
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index dfcc5d6dfb..9f5513e0a3 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -19,7 +19,6 @@ import PropTypes from 'prop-types';
import * as sdk from '../../../index';
import SyntaxHighlight from '../elements/SyntaxHighlight';
import { _t } from '../../../languageHandler';
-import { Room, MatrixEvent } from "matrix-js-sdk";
import Field from "../elements/Field";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import {useEventEmitter} from "../../../hooks/useEventEmitter";
@@ -39,6 +38,8 @@ import SettingsStore, {LEVEL_ORDER} from "../../../settings/SettingsStore";
import Modal from "../../../Modal";
import ErrorDialog from "./ErrorDialog";
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
class GenericEditor extends React.PureComponent {
// static propTypes = {onBack: PropTypes.func.isRequired};
diff --git a/src/components/views/dialogs/FeedbackDialog.js b/src/components/views/dialogs/FeedbackDialog.js
index cbe26af6cc..d80a935573 100644
--- a/src/components/views/dialogs/FeedbackDialog.js
+++ b/src/components/views/dialogs/FeedbackDialog.js
@@ -100,6 +100,20 @@ export default (props) => {
);
}
+ let bugReports = null;
+ if (SdkConfig.get().bug_report_endpoint_url) {
+ bugReports = (
+ {
},
})
}
-
{ countlyFeedbackSection }
}
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 9aef421d5a..a274f96a17 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -29,7 +29,9 @@ import dis from "../../../dispatcher/dispatcher";
import IdentityAuthClient from "../../../IdentityAuthClient";
import Modal from "../../../Modal";
import {humanizeTime} from "../../../utils/humanize";
-import createRoom, {canEncryptToAllUsers, findDMForUser, privateShouldBeEncrypted} from "../../../createRoom";
+import createRoom, {
+ canEncryptToAllUsers, ensureDMExists, findDMForUser, privateShouldBeEncrypted,
+} from "../../../createRoom";
import {inviteMultipleToRoom, showCommunityInviteDialog} from "../../../RoomInvite";
import {Key} from "../../../Keyboard";
import {Action} from "../../../dispatcher/actions";
@@ -43,6 +45,7 @@ import {Room} from "matrix-js-sdk/src/models/room";
import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import {replaceableComponent} from "../../../utils/replaceableComponent";
import {mediaFromMxc} from "../../../customisations/Media";
+import {getAddressType} from "../../../UserAddress";
// we have a number of types defined from the Matrix spec which can't reasonably be altered here.
/* eslint-disable camelcase */
@@ -331,6 +334,7 @@ interface IInviteDialogState {
threepidResultsMixin: { user: Member, userId: string}[];
canUseIdentityServer: boolean;
tryingIdentityServer: boolean;
+ consultFirst: boolean;
// These two flags are used for the 'Go' button to communicate what is going on.
busy: boolean,
@@ -379,6 +383,7 @@ export default class InviteDialog extends React.PureComponent {
+ this.setState({consultFirst: ev.target.checked});
+ }
+
static buildRecents(excludedTargetIds: Set): {userId: string, user: RoomMember, lastActive: number}[] {
const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
@@ -673,19 +682,20 @@ export default class InviteDialog extends React.PureComponent {
+ _inviteUsers = async () => {
const startTime = CountlyAnalytics.getTimestamp();
this.setState({busy: true});
this._convertFilter();
const targets = this._convertFilter();
const targetIds = targets.map(t => t.userId);
- const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+ const cli = MatrixClientPeg.get();
+ const room = cli.getRoom(this.props.roomId);
if (!room) {
console.error("Failed to find the room to invite users to");
this.setState({
@@ -695,12 +705,34 @@ export default class InviteDialog extends React.PureComponent {
+ try {
+ const result = await inviteMultipleToRoom(this.props.roomId, targetIds)
CountlyAnalytics.instance.trackSendInvite(startTime, this.props.roomId, targetIds.length);
if (!this._shouldAbortAfterInviteError(result)) { // handles setting error message too
this.props.onFinished();
}
- }).catch(err => {
+
+ if (cli.isRoomEncrypted(this.props.roomId) &&
+ SettingsStore.getValue("feature_room_history_key_sharing")) {
+ const visibilityEvent = room.currentState.getStateEvents(
+ "m.room.history_visibility", "",
+ );
+ const visibility = visibilityEvent && visibilityEvent.getContent() &&
+ visibilityEvent.getContent().history_visibility;
+ if (visibility == "world_readable" || visibility == "shared") {
+ const invitedUsers = [];
+ for (const [addr, state] of Object.entries(result.states)) {
+ if (state === "invited" && getAddressType(addr) === "mx-user-id") {
+ invitedUsers.push(addr);
+ }
+ }
+ console.log("Sharing history with", invitedUsers);
+ cli.sendSharedHistoryKeys(
+ this.props.roomId, invitedUsers,
+ );
+ }
+ }
+ } catch (err) {
console.error(err);
this.setState({
busy: false,
@@ -708,7 +740,7 @@ export default class InviteDialog extends React.PureComponent {
@@ -721,16 +753,34 @@ export default class InviteDialog extends React.PureComponent {
- let filterText = this.state.filterText;
- const targets = this.state.targets.map(t => t); // cheap clone for mutation
- const idx = targets.indexOf(member);
- if (idx >= 0) {
- targets.splice(idx, 1);
- } else {
- targets.push(member);
- filterText = ""; // clear the filter when the user accepts a suggestion
- }
- this.setState({targets, filterText});
+ if (!this.state.busy) {
+ let filterText = this.state.filterText;
+ const targets = this.state.targets.map(t => t); // cheap clone for mutation
+ const idx = targets.indexOf(member);
+ if (idx >= 0) {
+ targets.splice(idx, 1);
+ } else {
+ targets.push(member);
+ filterText = ""; // clear the filter when the user accepts a suggestion
+ }
+ this.setState({targets, filterText});
- if (this._editorRef && this._editorRef.current) {
- this._editorRef.current.focus();
+ if (this._editorRef && this._editorRef.current) {
+ this._editorRef.current.focus();
+ }
}
};
@@ -1189,10 +1241,13 @@ export default class InviteDialog extends React.PureComponent
+ ![]({require("../../../../res/img/element-icons/info.svg")})
+ {" " + _t("Invited people will be able to read old messages.")}
+ ;
+ }
+ }
} else if (this.props.kind === KIND_CALL_TRANSFER) {
title = _t("Transfer");
buttonText = _t("Transfer");
goButtonFn = this._transferCall;
+ consultSection =
+ {keySharingWarning}
{this._renderIdentityServerWarning()}
{_t( - "Without completing security on this session, it won’t have " + - "access to encrypted messages.", + "Without verifying, you won’t have access to all your messages " + + "and may appear as untrusted to others.", )}
-
{ _t("Add existing spaces/rooms") }
+{ _t("Add existing rooms") }
{ spaceOptionSection }
- {
- if (checked) {
- selectedToAdd.add(space);
- } else {
- selectedToAdd.delete(space);
- }
- setSelectedToAdd(new Set(selectedToAdd));
- }}
- />;
- }) }
-
- ) : null }
-
{ rooms.length > 0 ? (
{ _t("Spaces") }
- { spaces.map(space => { - return{ _t("Rooms") }
@@ -171,6 +151,27 @@ const AddExistingToSpaceDialog: React.FC
+ {
+ if (checked) {
+ selectedToAdd.add(space);
+ } else {
+ selectedToAdd.delete(space);
+ }
+ setSelectedToAdd(new Set(selectedToAdd));
+ }}
+ />;
+ }) }
+
+ ) : null }
+
{ spaces.length + rooms.length < 1 ?
{ _t("No results") }
: undefined }
@@ -184,8 +185,8 @@ const AddExistingToSpaceDialog: React.FC{ _t("Spaces") }
+ { spaces.map(space => { + return{
+ _t("PRO TIP: If you start a bug, please submit
{
- _t("PRO TIP: If you start a bug, please submit
+ {" " + _t("Invited people will be able to read old messages.")}
+ ;
+ }
+ }
} else if (this.props.kind === KIND_CALL_TRANSFER) {
title = _t("Transfer");
buttonText = _t("Transfer");
goButtonFn = this._transferCall;
+ consultSection =
+
+
;
} else {
console.error("Unknown kind of InviteDialog: " + this.props.kind);
}
@@ -1319,12 +1401,14 @@ export default class InviteDialog extends React.PureComponent{this.state.errorText}
{this._renderSection('recents')}
{this._renderSection('suggestions')}
+ {consultSection}
+ {_t( + "This usually only affects how the room is processed on the server. If you're " + + "having problems with your %(brand)s, please report a bug.", {brand}, + )} +
+ ); + if (SdkConfig.get().bug_report_endpoint_url) { + bugReports = ( ++ {_t( + "This usually only affects how the room is processed on the server. If you're " + + "having problems with your %(brand)s, please report a bug.", + { + brand, + }, + { + "a": (sub) => { + return {sub}; + }, + }, + )} +
+ ); + } + return (- {_t( - "This usually only affects how the room is processed on the server. If you're " + - "having problems with your %(brand)s, please report a bug.", - { - brand, - }, - { - "a": (sub) => { - return {sub}; - }, - }, - )} -
+ {bugReports}
{_t(
"You'll upgrade this room from
+ {_t("You most likely do not want to reset your event index store")}
+
+
+
+ {_t("If you do, please note that none of your messages will be deleted, " +
+ "but the search experience might be degraded for a few moments" +
+ "whilst the index is recreated",
+ )}
+
{ _t("Make this space private") }
-
{_t("Identity Server")}
({host})
;
- case Matrix.SERVICE_TYPES.IM:
+ case SERVICE_TYPES.IM:
return ({host})
{_t("Integration Manager")}
({host})
;
}
}
_summaryForServiceType(serviceType) {
switch (serviceType) {
- case Matrix.SERVICE_TYPES.IS:
+ case SERVICE_TYPES.IS:
return ({host})
{_t("Find others by phone or email")}
{_t("Be found by phone or email")}
;
- case Matrix.SERVICE_TYPES.IM:
+ case SERVICE_TYPES.IM:
return {_t("Be found by phone or email")}
{_t("Use bots, bridges, widgets and sticker packs")}
;
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 308dc6d622..205597a1c4 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -50,7 +50,7 @@ export default class VerificationRequestDialog extends React.Component {
const member = this.props.member ||
otherUserId && MatrixClientPeg.get().getUser(otherUserId);
const title = request && request.isSelfVerification ?
- _t("Verify other session") : _t("Verification Request");
+ _t("Verify other login") : _t("Verification Request");
return
+
+};
+
+export default FacePile;
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index e61d312305..a8e16813e6 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -17,7 +17,8 @@ import React from 'react';
import * as sdk from '../../../index';
import dis from '../../../dispatcher/dispatcher';
import classNames from 'classnames';
-import { Room, RoomMember } from 'matrix-js-sdk';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
import PropTypes from 'prop-types';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import FlairStore from "../../../stores/FlairStore";
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 2e0cc50435..870803995d 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -21,7 +21,7 @@ import {_t} from '../../../languageHandler';
import PropTypes from 'prop-types';
import dis from '../../../dispatcher/dispatcher';
import {wantsDateSeparator} from '../../../DateUtils';
-import {MatrixEvent} from 'matrix-js-sdk';
+import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
import SettingsStore from "../../../settings/SettingsStore";
import {LayoutPropType} from "../../../settings/Layout";
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index 4e41db0ae7..a9eb04d4ec 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -73,7 +73,7 @@ const SSOButton: React.FC
+ { shownMembers.map(member => {
+ return
+ ;
+ }) }
+
+ { onlyKnownUsers &&
+ { _t("%(count)s people you know have already joined", { count: members.length }) }
+ }
+
{ keyRequestInfoContent }
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index ccf097c4fd..b7078766fb 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -33,6 +33,7 @@ import WidgetStore from "../../../stores/WidgetStore";
import {UPDATE_EVENT} from "../../../stores/AsyncStore";
import ActiveWidgetStore from "../../../stores/ActiveWidgetStore";
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import VoiceRecordComposerTile from "./VoiceRecordComposerTile";
function ComposerAvatar(props) {
const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -187,6 +188,7 @@ export default class MessageComposer extends React.Component {
hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room),
joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room),
isComposerEmpty: true,
+ haveRecording: false,
};
}
@@ -325,6 +327,10 @@ export default class MessageComposer extends React.Component {
});
}
+ onVoiceUpdate = (haveRecording: boolean) => {
+ this.setState({haveRecording});
+ };
+
render() {
const controls = [
this.state.me ? {
const cli = useContext(MatrixClientContext);
@@ -100,17 +102,48 @@ const NewRoomIntro = () => {
});
}
- let buttons;
- if (room.canInvite(cli.getUserId())) {
- const onInviteClick = () => {
- dis.dispatch({ action: "view_invite", roomId });
- };
+ let parentSpace;
+ if (
+ SpaceStore.instance.activeSpace?.canInvite(cli.getUserId()) &&
+ SpaceStore.instance.getSpaceFilteredRoomIds(SpaceStore.instance.activeSpace).has(room.roomId)
+ ) {
+ parentSpace = SpaceStore.instance.activeSpace;
+ }
+ let buttons;
+ if (parentSpace) {
buttons =
;
}
const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url;
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 4378154d8f..963e94ebbb 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -20,6 +20,7 @@ import React, { ReactComponentElement } from "react";
import { Dispatcher } from "flux";
import { Room } from "matrix-js-sdk/src/models/room";
import * as fbEmitter from "fbemitter";
+import { EventType } from "matrix-js-sdk/src/@types/event";
import { _t, _td } from "../../../languageHandler";
import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
@@ -48,9 +49,8 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con
import AccessibleButton from "../elements/AccessibleButton";
import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
import CallHandler from "../../../CallHandler";
-import SpaceStore, { SUGGESTED_ROOMS } from "../../../stores/SpaceStore";
-import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
-import { EventType } from "matrix-js-sdk/src/@types/event";
+import SpaceStore, {SUGGESTED_ROOMS} from "../../../stores/SpaceStore";
+import {showAddExistingRooms, showCreateNewRoom, showSpaceInvite} from "../../../utils/space";
import {replaceableComponent} from "../../../utils/replaceableComponent";
import RoomAvatar from "../avatars/RoomAvatar";
import { ISpaceSummaryRoom } from "../../structures/SpaceRoomDirectory";
@@ -62,6 +62,7 @@ interface IProps {
onResize: () => void;
resizeNotifier: ResizeNotifier;
isMinimized: boolean;
+ activeSpace: Room;
}
interface IState {
@@ -194,8 +195,8 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
: _t("You do not have permissions to add rooms to this space")}
/>
-
+ {
+ showSpaceInvite(parentSpace);
+ }}
+ >
+ {_t("Invite to %(spaceName)s", { spaceName: parentSpace.name })}
+
+ { room.canInvite(cli.getUserId()) && {
+ dis.dispatch({ action: "view_invite", roomId });
+ }}
+ >
+ {_t("Invite to just this room")}
+ }
+
;
+ } else if (room.canInvite(cli.getUserId())) {
+ buttons =
+ {
+ dis.dispatch({ action: "view_invite", roomId });
+ }}
+ >
{_t("Invite to this room")}
-
+
+
+ {_t("Invite people")}
+ }
+
+ {_t("Explore rooms")}
;
} else if (Object.values(this.state.sublists).some(list => list.length > 0)) {
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index eb821809d9..74052e8ba1 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -51,6 +51,7 @@ import { objectExcluding, objectHasDiff } from "../../../utils/objects";
import ExtraTile from "./ExtraTile";
import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
import IconizedContextMenu from "../context_menus/IconizedContextMenu";
+import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager";
import {replaceableComponent} from "../../../utils/replaceableComponent";
const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS
@@ -470,18 +471,19 @@ export default class RoomSublist extends React.Component{ _t("Quick actions") }
+ { this.props.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) &&
+
;
+ }
+
+ public render() {
+ const classes = classNames({
+ 'mx_MessageComposer_button': !this.state.recorder,
+ 'mx_MessageComposer_voiceMessage': !this.state.recorder,
+ 'mx_VoiceRecordComposerTile_stop': !!this.state.recorder,
+ });
+
+ let tooltip = _t("Record a voice message");
+ if (!!this.state.recorder) {
+ // TODO: @@ TravisR: Change to match behaviour
+ tooltip = _t("Stop & send recording");
+ }
+
+ return (<>
+ {this.renderWaveformArea()}
+
{
@@ -208,6 +223,31 @@ export default class EventIndexPanel extends React.Component {
}
);
+ } else {
+ eventIndexingSettings = (
+
+
+ );
}
return eventIndexingSettings;
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index 0493597537..b8d91aae2a 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -203,6 +203,7 @@ export class EmailAddress extends React.Component {
className="mx_ExistingEmailAddress_confirmBtn"
kind="primary_sm"
onClick={this.onContinueClick}
+ disabled={this.state.continueDisabled}
>
{_t("Complete")}
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 314acf5d65..b1ad9f3d23 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -32,7 +32,7 @@ import * as sdk from "../../../../..";
import Modal from "../../../../../Modal";
import dis from "../../../../../dispatcher/dispatcher";
import {Service, startTermsFlow} from "../../../../../Terms";
-import {SERVICE_TYPES} from "matrix-js-sdk";
+import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
import IdentityAuthClient from "../../../../../IdentityAuthClient";
import {abbreviateUrl} from "../../../../../utils/UrlUtils";
import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
@@ -206,10 +206,10 @@ export default class GeneralUserSettingsTab extends React.Component {
_onPasswordChangeError = (err) => {
// TODO: Figure out a design that doesn't involve replacing the current dialog
- let errMsg = err.error || "";
+ let errMsg = err.error || err.message || "";
if (err.httpStatus === 403) {
errMsg = _t("Failed to change password. Is your password correct?");
- } else if (err.httpStatus) {
+ } else if (!errMsg) {
errMsg += ` (HTTP status ${err.httpStatus})`;
}
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 238f875e22..0cd3dd6698 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -74,6 +74,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
this.state = {
autoLaunch: false,
autoLaunchSupported: false,
+ warnBeforeExit: true,
+ warnBeforeExitSupported: false,
alwaysShowMenuBar: true,
alwaysShowMenuBarSupported: false,
minimizeToTray: true,
@@ -96,6 +98,12 @@ export default class PreferencesUserSettingsTab extends React.Component {
autoLaunch = await platform.getAutoLaunchEnabled();
}
+ const warnBeforeExitSupported = await platform.supportsWarnBeforeExit();
+ let warnBeforeExit = false;
+ if (warnBeforeExitSupported) {
+ warnBeforeExit = await platform.shouldWarnBeforeExit();
+ }
+
const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar();
let alwaysShowMenuBar = true;
if (alwaysShowMenuBarSupported) {
@@ -111,6 +119,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
this.setState({
autoLaunch,
autoLaunchSupported,
+ warnBeforeExit,
+ warnBeforeExitSupported,
alwaysShowMenuBarSupported,
alwaysShowMenuBar,
minimizeToTraySupported,
@@ -122,6 +132,10 @@ export default class PreferencesUserSettingsTab extends React.Component {
PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
};
+ _onWarnBeforeExitChange = (checked) => {
+ PlatformPeg.get().setWarnBeforeExit(checked).then(() => this.setState({warnBeforeExit: checked}));
+ }
+
_onAlwaysShowMenuBarChange = (checked) => {
PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({alwaysShowMenuBar: checked}));
};
@@ -161,6 +175,14 @@ export default class PreferencesUserSettingsTab extends React.Component {
label={_t('Start automatically after system login')} />;
}
+ let warnBeforeExitOption = null;
+ if (this.state.warnBeforeExitSupported) {
+ warnBeforeExitOption =
+ {this.state.enabling
+ ?
+
+ )}
+
+ {_t("Advanced")}
+
+ {EventIndexPeg.error.message}
+
+
+
{ _t("Create a space") }
{ _t("Spaces are new ways to group rooms and people. " + - "To join an existing space you’ll need an invite") }
+ "To join an existing space you'll need an invite.") }{ - _t("Give it a photo, name and description to help you identify it.") + _t("Add some details to help people recognise it.") } { - _t("You can change these at any point.") + _t("You can change these anytime.") }
{ _t("Share invite link") }
{ copiedText }{ _t("Invite people") }
+ { _t("Invite with email or username") }
@@ -327,7 +322,7 @@ export class SpaceItem extends React.PureComponent {
const avatarSize = isNested ? 24 : 32;
const toggleCollapseButton = childSpaces && childSpaces.length ?
-
- {onHoldText}
+ {holdTransferContent}
{callControls}
;
}
diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index f262179f3d..b651e40a3b 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -17,6 +17,7 @@
import {MatrixClientPeg} from "../MatrixClientPeg";
import {IMediaEventContent, IPreparedMedia, prepEventContentAsMedia} from "./models/IMediaEventContent";
import {ResizeMethod} from "../Avatar";
+import {MatrixClient} from "matrix-js-sdk/src/client";
// Populate this class with the details of your customisations when copying it.
@@ -30,8 +31,14 @@ import {ResizeMethod} from "../Avatar";
* "thumbnail media", derived from event contents or external sources.
*/
export class Media {
+ private client: MatrixClient;
+
// Per above, this constructor signature can be whatever is helpful for you.
- constructor(private prepared: IPreparedMedia) {
+ constructor(private prepared: IPreparedMedia, client?: MatrixClient) {
+ this.client = client ?? MatrixClientPeg.get();
+ if (!this.client) {
+ throw new Error("No possible MatrixClient for media resolution. Please provide one or log in.");
+ }
}
/**
@@ -67,7 +74,7 @@ export class Media {
* The HTTP URL for the source media.
*/
public get srcHttp(): string {
- return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc);
+ return this.client.mxcUrlToHttp(this.srcMxc);
}
/**
@@ -76,7 +83,7 @@ export class Media {
*/
public get thumbnailHttp(): string | undefined | null {
if (!this.hasThumbnail) return null;
- return MatrixClientPeg.get().mxcUrlToHttp(this.thumbnailMxc);
+ return this.client.mxcUrlToHttp(this.thumbnailMxc);
}
/**
@@ -89,7 +96,7 @@ export class Media {
*/
public getThumbnailHttp(width: number, height: number, mode: ResizeMethod = "scale"): string | null | undefined {
if (!this.hasThumbnail) return null;
- return MatrixClientPeg.get().mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
+ return this.client.mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
}
/**
@@ -100,7 +107,7 @@ export class Media {
* @returns {string} The HTTP URL which points to the thumbnail.
*/
public getThumbnailOfSourceHttp(width: number, height: number, mode: ResizeMethod = "scale"): string {
- return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc, width, height, mode);
+ return this.client.mxcUrlToHttp(this.srcMxc, width, height, mode);
}
/**
@@ -128,17 +135,19 @@ export class Media {
/**
* Creates a media object from event content.
* @param {IMediaEventContent} content The event content.
+ * @param {MatrixClient} client? Optional client to use.
* @returns {Media} The media object.
*/
-export function mediaFromContent(content: IMediaEventContent): Media {
- return new Media(prepEventContentAsMedia(content));
+export function mediaFromContent(content: IMediaEventContent, client?: MatrixClient): Media {
+ return new Media(prepEventContentAsMedia(content), client);
}
/**
* Creates a media object from an MXC URI.
* @param {string} mxc The MXC URI.
+ * @param {MatrixClient} client? Optional client to use.
* @returns {Media} The media object.
*/
-export function mediaFromMxc(mxc: string): Media {
- return mediaFromContent({url: mxc});
+export function mediaFromMxc(mxc: string, client?: MatrixClient): Media {
+ return mediaFromContent({url: mxc}, client);
}
diff --git a/src/editor/autocomplete.ts b/src/editor/autocomplete.ts
index d8cea961d4..2f56494ea0 100644
--- a/src/editor/autocomplete.ts
+++ b/src/editor/autocomplete.ts
@@ -68,24 +68,24 @@ export default class AutocompleteWrapperModel {
this.updateCallback({close: true});
}
- public async onTab(e: KeyboardEvent) {
+ /**
+ * If there is no current autocompletion, start one and move to the first selection.
+ */
+ public async startSelection() {
const acComponent = this.getAutocompleterComponent();
-
if (acComponent.countCompletions() === 0) {
// Force completions to show for the text currently entered
await acComponent.forceComplete();
// Select the first item by moving "down"
await acComponent.moveSelection(+1);
- } else {
- await acComponent.moveSelection(e.shiftKey ? -1 : +1);
}
}
- public onUpArrow(e: KeyboardEvent) {
+ public selectPreviousSelection() {
this.getAutocompleterComponent().moveSelection(-1);
}
- public onDownArrow(e: KeyboardEvent) {
+ public selectNextSelection() {
this.getAutocompleterComponent().moveSelection(+1);
}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index db01caed97..0efb3df22a 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -50,7 +50,7 @@
"unknown error code": "neznámý kód chyby",
"OK": "OK",
"Failed to forget room %(errCode)s": "Nepodařilo se zapomenout místnost %(errCode)s",
- "Dismiss": "Zahodit",
+ "Dismiss": "Zavřít",
"powered by Matrix": "používá protokol Matrix",
"Custom Server Options": "Vlastní nastavení serveru",
"Add a widget": "Přidat widget",
@@ -228,7 +228,7 @@
"Who can access this room?": "Kdo má přístup do této místnosti?",
"Who can read history?": "Kdo může číst historii?",
"You are not in this room.": "Nejste v této místnosti.",
- "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.",
+ "You do not have permission to do that in this room.": "V této místnosti k tomu nemáte oprávnění.",
"You cannot place a call with yourself.": "Nemůžete volat sami sobě.",
"You cannot place VoIP calls in this browser.": "V tomto prohlížeči nelze vytáčet VoIP hovory.",
"You do not have permission to post to this room": "Nemáte oprávnění zveřejňovat příspěvky v této místnosti",
@@ -749,7 +749,7 @@
"A call is currently being placed!": "Právě probíhá jiný hovor!",
"A call is already in progress!": "Jeden hovor už probíhá!",
"Permission Required": "Vyžaduje oprávnění",
- "You do not have permission to start a conference call in this room": "Nemáte oprávnění v této místnosti začít konferenční hovor",
+ "You do not have permission to start a conference call in this room": "V této místnosti nemáte oprávnění zahájit konferenční hovor",
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
"Missing roomId.": "Chybějící ID místnosti.",
"Opens the Developer Tools dialog": "Otevře dialog nástrojů pro vývojáře",
@@ -818,7 +818,7 @@
"Share Room Message": "Sdílet zprávu z místnosti",
"Link to selected message": "Odkaz na vybranou zprávu",
"COPY": "Kopírovat",
- "Share Message": "Sdílet",
+ "Share Message": "Sdílet zprávu",
"Collapse Reply Thread": "Sbalit vlákno odpovědi",
"Unable to join community": "Není možné vstoupit do skupiny",
"Unable to leave community": "Není možné opustit skupinu",
@@ -1941,7 +1941,7 @@
"Indexed rooms:": "Indexované místnosti:",
"Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)",
"Sign In or Create Account": "Přihlásit nebo vytvořit nový účet",
- "Use your account or create a new one to continue.": "Pro pokračování se přihlaste existujícím účtem, nebo si vytvořte nový.",
+ "Use your account or create a new one to continue.": "Pro pokračování se přihlaste stávajícím účtem, nebo si vytvořte nový.",
"Create Account": "Vytvořit účet",
"Order rooms by name": "Seřadit místnosti podle názvu",
"Show rooms with unread notifications first": "Zobrazovat místnosti s nepřečtenými oznámeními navrchu",
@@ -2982,7 +2982,7 @@
"Abort": "Přerušit",
"Are you sure you wish to abort creation of the host? The process cannot be continued.": "Opravdu chcete přerušit vytváření hostitele? Proces nemůže být navázán.",
"Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele",
- "Upgrade to %(hostSignupBrand)s": "Aktualizovat na %(hostSignupBrand)s",
+ "Upgrade to %(hostSignupBrand)s": "Povýšit na %(hostSignupBrand)s",
"Edit Values": "Upravit hodnoty",
"Values at explicit levels in this room:": "Hodnoty na explicitních úrovních v této místnosti:",
"Values at explicit levels:": "Hodnoty na explicitních úrovních:",
@@ -3003,5 +3003,120 @@
"Setting ID": "ID nastavení",
"Failed to save settings": "Nastavení se nepodařilo uložit",
"Settings Explorer": "Průzkumník nastavení",
- "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)"
+ "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)",
+ "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces jsou nový způsob, jak seskupovat místnosti a lidi. Chcete-li se připojit k existujícímu space, budete potřebovat pozvánku",
+ "We'll create rooms for each of them. You can add existing rooms after setup.": "Pro každý z nich vytvoříme místnost. Po nastavení můžete přidat stávající místnosti.",
+ "What projects are you working on?": "Na jakých projektech pracujete?",
+ "We'll create rooms for each topic.": "Pro každé téma vytvoříme místnosti.",
+ "What are some things you want to discuss?": "O kterých věcech chcete diskutovat?",
+ "Inviting...": "Pozvání...",
+ "Invite by username": "Pozvat podle uživatelského jména",
+ "Invite your teammates": "Pozvěte své spolupracovníky",
+ "Failed to invite the following users to your space: %(csvUsers)s": "Nepodařilo se pozvat následující uživatele do vašeho space: %(csvUsers)s",
+ "A private space for you and your teammates": "Soukromý space pro Vás a vaše spolupracovníky",
+ "Me and my teammates": "Já a moji spolupracovníci",
+ "A private space just for you": "Soukromý space právě pro vás",
+ "Just Me": "Pouze já",
+ "Ensure the right people have access to the space.": "Zajistěte, aby do prostoru měli přístup správní lidé.",
+ "Who are you working with?": "S kým pracujete?",
+ "At the moment only you can see it.": "V tuto chvíli to vidíte jen Vy.",
+ "Creating rooms...": "Vytváření místností...",
+ "Skip for now": "Prozatím přeskočit",
+ "Failed to create initial space rooms": "Vytvoření počátečních místností ve space se nezdařilo",
+ "Random": "Náhodný",
+ "Your private space %(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Bitte frage die Administration deines Heimservers (%(homeserverDomain)s) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
+ "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.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, kannst du nicht mehr von anderen Benutzern gefunden werden und andere nicht mehr per E-Mail oder Telefonnummer einladen.",
+ "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (%(homeserverDomain)s) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
"Disconnect from the identity server 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 kannst du versuchen, den öffentlichen Server unter turn.matrix.org zu verwenden. Allerdings wird dieser nicht so zuverlässig sein und du teilst deine IP-Adresse mit diesem Server. Du kannst dies auch in den Einstellungen konfigurieren.",
"This action requires accessing the default identity server /help to list available commands. Did you mean to send this as a message?": "Du kannst /help benutzen, um verfügbare Befehle aufzulisten. Willst du dies als Nachricht senden?",
+ "You can use /help to list available commands. Did you mean to send this as a message?": "Du kannst /help benutzen, um alle verfügbaren Befehle aufzulisten. Willst du es stattdessen als Nachricht senden?",
"Direct message": "Direktnachricht",
"Suggestions": "Vorschläge",
"Recently Direct Messaged": "Kürzlich direkt verschickt",
"Go": "Los",
"Command Help": "Befehl Hilfe",
- "To help us prevent this in future, please send us logs.": "Um uns zu helfen, dies in Zukunft zu vermeiden, sende uns bitte Logs.",
+ "To help us prevent this in future, please send us logs.": "Um uns zu helfen, dies in Zukunft zu vermeiden, sende uns bitte die Protokolldateien.",
"Notification settings": "Benachrichtigungseinstellungen",
"Help": "Hilf uns",
"Filter": "Filtern",
@@ -1454,8 +1454,8 @@
"Go Back": "Zurückgehen",
"Notification Autocomplete": "Benachrichtigung Autovervollständigen",
"If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
- "This user has not verified all of their sessions.": "Diese:r Benutzer:in hat nicht alle seine/ihre Sitzungen verifiziert.",
- "You have verified this user. This user has verified all of their sessions.": "Du hast diese/n Nutzer:in verifiziert. Er/Sie hat alle seine/ihre Sitzungen verifiziert.",
+ "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert.",
+ "You have verified this user. This user has verified all of their sessions.": "Du hast diesen Nutzer verifiziert. Der Nutzer hat alle seine Sitzungen verifiziert.",
"Your key share request has been sent - please check your other sessions for key share requests.": "Deine Schlüsselanfrage wurde gesendet - sieh in deinen anderen Sitzungen nach der Schlüsselanfrage.",
"Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Schlüsselanfragen werden automatisch an deine anderen Sitzungen gesendet. Wenn du sie abgelehnt oder ignoriert hast, klicke hier, um die Schlüssel erneut anzufordern.",
"If your other sessions do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Sitzungen nicht über den Schlüssel für diese Nachricht verfügen, kannst du die Nachricht nicht entschlüsseln.",
@@ -1490,15 +1490,15 @@
"Use bots, bridges, widgets and sticker packs": "Benutze Bots, Bridges, Widgets und Sticker-Packs",
"Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Wenn du dein Passwort änderst, werden alle Ende-zu-Ende-Verschlüsselungsschlüssel für alle deine Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richte ein Schlüssel-Backup ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzst.",
"You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Du wurdest von allen Sitzungen abgemeldet und erhälst keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.",
- "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer:innen als vertrauenswürdig markiert.",
+ "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
"Sign out and remove encryption keys?": "Abmelden und Verschlüsselungsschlüssel entfernen?",
"Sign in to your Matrix account on @bot:* would ignore all users that have the name 'bot' on any server.": "Füge hier Benutzer!nnen und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde @bot: * alle Benutzer:innen ignorieren, die auf einem Server den Namen 'bot' haben.",
- "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.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer:innen und Server ausgeblendet.",
+ "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, @bot:* would ignore all users that have the name 'bot' on any server.": "Füge hier die Benutzer und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde @bot: * alle Benutzer ignorieren, die auf einem Server den Namen 'bot' haben.",
+ "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.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer und Server ausgeblendet.",
"Personal ban list": "Persönliche Sperrliste",
- "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.": "Deine persönliche Sperrliste enthält alle Benutzer:innen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
+ "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.": "Deine persönliche Sperrliste enthält alle Benutzer/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
"Server or user ID to ignore": "Zu ignorierende Server- oder Benutzer-ID",
"eg: @bot:* or example.org": "z.B. @bot:* oder example.org",
"Subscribed lists": "Abonnierte Listen",
"Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!",
- "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer:innen zu ignorieren.",
+ "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer zu ignorieren.",
"Subscribe": "Abonnieren",
"Always show the window menu bar": "Fenstermenüleiste immer anzeigen",
"Show tray icon and minimize window to it on close": "Taskleistensymbol anzeigen und Fenster beim Schließen dorthin minimieren",
@@ -1724,11 +1724,11 @@
"Upgrade this room to the recommended room version": "Aktualisiere diesen Raum auf die empfohlene Raumversion",
"this room": "Dieser Raum",
"View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.",
- "Send a bug report with logs": "Sende einen Fehlerbericht mit Logs",
+ "Send a bug report with logs": "Einen Fehlerbericht mit Logs senden",
"Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen",
"Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen.",
"You signed in to a new session without verifying it:": "Du hast dich in einer neuen Sitzung angemeldet ohne sie zu verifizieren:",
- "Other users may not trust it": "Andere Benutzer:innen vertrauen ihr vielleicht nicht",
+ "Other users may not trust it": "Andere Benutzer vertrauen ihr vielleicht nicht",
"Upgrade": "Hochstufen",
"Verify the new login accessing your account: %(name)s": "Verifiziere die neue Anmeldung an deinem Konto: %(name)s",
"From %(deviceName)s (%(deviceId)s)": "Von %(deviceName)s (%(deviceId)s)",
@@ -1759,7 +1759,7 @@
" to store messages from ": " um Nachrichten von ",
"%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n": "HTML para la página de tu comunidad. Usa la descripción larga para su presentación, o distribuir enlaces de interés. Puedes incluso usar etiquetas 'img'\n", - "Add rooms to the community summary": "Agregar salas al resumen de la comunidad", - "Which rooms would you like to add to this summary?": "¿Cuáles salas desea agregar a este resumen?", - "Add to summary": "Agregar a resumen", + "Add rooms to the community summary": "Añadir salas al resumen de la comunidad", + "Which rooms would you like to add to this summary?": "¿Cuáles salas quieres añadir a este resumen?", + "Add to summary": "Añadir al resumen", "Failed to add the following rooms to the summary of %(groupId)s:": "Falló la agregación de las salas siguientes al resumen de %(groupId)s:", - "Add a Room": "Agregar una Sala", + "Add a Room": "Añadir una sala", "Failed to remove the room from the summary of %(groupId)s": "Falló la eliminación de la sala del resumen de %(groupId)s", - "The room '%(roomName)s' could not be removed from the summary.": "La sala '%(roomName)s' no se pudo eliminar del resumen.", - "Add users to the community summary": "Agregar usuario al resumen de la comunidad", - "Who would you like to add to this summary?": "¿A quién le gustaría agregar a este resumen?", + "The room '%(roomName)s' could not be removed from the summary.": "La sala «%(roomName)s no se pudo eliminar del resumen.", + "Add users to the community summary": "Añadir usuario al resumen de la comunidad", + "Who would you like to add to this summary?": "¿A quién te gustaría añadir a este resumen?", "Failed to add the following users to the summary of %(groupId)s:": "Falló la adición de los usuarios siguientes al resumen de %(groupId)s:", - "Add a User": "Agregar un usuario", + "Add a User": "Añadir un usuario", "Failed to remove a user from the summary of %(groupId)s": "Falló la eliminación de un usuario del resumen de %(groupId)s", - "The user '%(displayName)s' could not be removed from the summary.": "No se pudo eliminar al usuario '%(displayName)s' del resumen.", + "The user '%(displayName)s' could not be removed from the summary.": "No se ha podido eliminar al usuario «%(displayName)s» del resumen.", "Failed to upload image": "No se pudo cargar la imagen", "Failed to update community": "Falló la actualización de la comunidad", - "Unable to accept invite": "No se pudo aceptar la invitación", + "Unable to accept invite": "No se ha podido aceptar la invitación", "Unable to join community": "No se pudo unir a comunidad", "Leave Community": "Salir de la Comunidad", "Leave %(groupName)s?": "¿Salir de %(groupName)s?", @@ -810,7 +810,7 @@ "You can't send any messages until you review and agree to/help to list available commands. Did you mean to send this as a message?": "Puedes usar /ayuda para listar los comandos disponibles. ¿Querías enviarlo como un mensaje?",
- "Hint: Begin your message with // to start it with a slash.": "Sugerencia: Comienza tu mensaje con // para que inicie con una barra inclinada.",
+ "You can use /help to list available commands. Did you mean to send this as a message?": "Puedes usar /help para ver los comandos disponibles. ¿Querías enviarlo como mensaje?",
+ "Hint: Begin your message with // to start it with a slash.": "Sugerencia: empieza tu mensaje con // para que inicie con una barra inclinada.",
"Send as message": "Enviar como mensaje",
"Failed to connect to integration manager": "Error al conectarse con el administrador de integración",
"Failed to revoke invite": "Error al revocar la invitación",
@@ -1760,7 +1760,7 @@
"There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al actualizar la dirección alternativa de la sala. Posiblemente el servidor no lo permita o se produjo un error temporal.",
"Local address": "Dirección local",
"Published Addresses": "Direcciones publicadas",
- "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Las direcciones publicadas pueden ser usadas por cualquier usuario en cualquier servidor para unirse a tu salas. Para publicar una dirección, primero hay que establecerla como dirección local.",
+ "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Las direcciones publicadas pueden ser usadas por cualquier usuario en cualquier servidor para unirse. Para publicar una dirección, primero hay que añadirla como dirección local.",
"Other published addresses:": "Otras direcciones publicadas:",
"No other published addresses yet, add one below": "Todavía no hay direcciones publicadas, puedes añadir una más abajo",
"New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)",
@@ -1806,7 +1806,7 @@
"Almost there! Is %(displayName)s showing the same shield?": "¡Ya casi está! ¿Está %(displayName)s mostrando el mismo escudo?",
"Verify all users in a room to ensure it's secure.": "Verifica a todos los usuarios de una sala para asegurar que es segura.",
"In encrypted rooms, verify all users to ensure it’s secure.": "En las salas cifrar, verificar a todos los usuarios para asegurarse de son seguras.",
- "You've successfully verified %(deviceName)s (%(deviceId)s)!": "¡Has verificado con éxito los %(deviceName)s (%(deviceId)s)!",
+ "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Has verificado con éxito %(deviceName)s (%(deviceId)s)",
"You've successfully verified %(displayName)s!": "¡Has verificado con éxito a %(displayName)s!",
"Verified": "Verificado",
"Got it": "Aceptar",
@@ -1825,7 +1825,7 @@
"React": "Reaccionar",
"Message Actions": "Acciones de mensaje",
"Show image": "Mostrar imagen",
- "You have ignored this user, so their message is hidden. Show anyways.": "Ha ignorado a este usuario, así que su mensaje se ha ocultado. Mostrar de todos modos.",
+ "You have ignored this user, so their message is hidden. Show anyways.": "Ha ignorado a esta cuenta, así que su mensaje está oculto. Ver de todos modos.",
"You verified %(name)s": "Has verificado a %(name)s",
"You cancelled verifying %(name)s": "Has cancelado la verificación de %(name)s",
"%(name)s cancelled verifying": "%(name)s canceló la verificación",
@@ -1847,7 +1847,7 @@
"Message deleted by %(name)s": "Mensaje eliminado por %(name)s",
"Edited at %(date)s. Click to view edits.": "Editado el día %(date)s. Haz clic para ver las ediciones.",
"edited": "editado",
- "Can't load this message": "No puedo cargar este mensaje",
+ "Can't load this message": "No se ha podido cargar este mensaje",
"Submit logs": "Enviar registros",
"Frequently Used": "Frecuente",
"Smileys & People": "Caritas y personas",
@@ -1866,7 +1866,7 @@
"Your user ID": "Tu ID de usuario",
"Your theme": "Su tema",
"%(brand)s URL": "URL de %(brand)s",
- "Room ID": "Identidad (ID) de la sala",
+ "Room ID": "ID de la sala",
"Widget ID": "ID del widget",
"Using this widget may share data 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.": "De rogha air sin, is féidir leat iarracht a dhéanamh an freastalaí poiblí ag turn.matrix.org a úsáid, ach ní bheidh sé seo chomh iontaofa, agus roinnfidh sé do sheoladh ip leis an freastalaí sin. Is féidir leat é seo a bhainistiú sa socruithe freisin.",
+ "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Iarr ar an riarthóir do fhreastalaí baile (%(homeserverDomain)s) freastalaí TURN a chumrú go bhfeidhmeoidh glaonna go hiontaofa.",
+ "Call failed due to misconfigured server": "Theip an glaoch de bharr freastalaí mícumraithe",
+ "Answered Elsewhere": "Tógtha in áit eile",
+ "The call could not be established": "Níor féidir an glaoch a bhunú",
+ "The remote side failed to pick up": "Níor thóg an taobh eile an glaoch",
+ "The other party declined the call.": "Dhiúltaigh an duine eile an glaoch.",
+ "Call Declined": "Glao Diúltaithe",
+ "Unable to load! Check your network connectivity and try again.": "Ní féidir a lódáil! Seiceáil do nascacht líonra agus bain triail eile as.",
+ "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "As chás go bhfuil eolas inaitheanta ar an leathanach seo, mar shampla ID seomra, úsáideora nó grúpa, baintear na sonraí sin sula seoltar chuig an bhfreastalaí iad.",
+ "The information being sent to us to help make %(brand)s better includes:": "Cuimsíonn an eolas a chuirtear chugainn chun cabhrú le %(brand)s a dhéanamh níos fearr:",
+ "Your device resolution": "Taifeach do gléas",
+ "Your user agent": "Do ghníomhaire úsáideora",
+ "The call was answered on another device.": "Do ghníomhaire úsáideora.",
+ "Every page you use in the app": "Gach leathanach a úsáideann tú san aip",
+ "Whether you're using %(brand)s as an installed Progressive Web App": "Má úsáideann tú %(brand)s mar feidhmchlár gréasáin forásach (PWA) suiteáilte",
+ "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Má úsáideann tú an gné “grabhróige aráin” (abhatáranna os cionn an liosta seomra)",
+ "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Má úsáideann tú %(brand)s ar gléas arb é an teagmháil an phríomh-mheicníocht ionchuir",
+ "Your homeserver's URL": "An URL do fhreastalaí baile",
+ "Whether or not you're using the Richtext mode of the Rich Text Editor": "Má tá nó níl tú ag úsáid an modh téacs saibhir an eagarthóra téacs saibhir",
+ "Which officially provided instance you are using, if any": "Cén ásc a chuirtear ar fáil go hoifigiúil atá á úsáid agat, más ann dó",
+ "Your language of choice": "Do theanga roghnaithe",
+ "Whether or not you're logged in (we don't record your username)": "Má logáil nó níor logáil tú isteach (ní thaifeadaimid d'ainm úsáideora)",
+ "Failed to verify email address: make sure you clicked the link in the email": "Níor cinntíodh an seoladh ríomhphoist: déan cinnte gur chliceáil tú an nasc sa ríomhphost",
+ "Reject & Ignore user": "Diúltaigh ⁊ Neamaird do úsáideoir",
+ "Ignore": "Neamhaird",
+ "Ignored users": "Úsáideoirí neamhairde",
+ "Ignored/Blocked": "Neamhairde/Tachta",
+ "Message Pinning": "Ceangal teachtaireachta",
+ "Avoid sequences": "Seachain seicheamh",
+ "Unrecognised address": "Seoladh nár aithníodh",
+ "(no answer)": "(gan freagra)",
+ "Displays action": "Taispeáin gníomh",
+ "Verified key": "Eochair deimhnithe",
+ "Unignored user": "Úsáideoir leis aird",
+ "Ignored user": "Úsáideoir neamhairde",
+ "Unignore": "Stop ag tabhairt neamhaird air",
+ "Leave room": "Fág an seomra",
+ "Missing roomId.": "Comhartha aitheantais seomra ar iarraidh.",
+ "Operation failed": "Chlis an oibríocht",
+ "Unnamed Room": "Seomra gan ainm",
+ "%(weekDayName)s %(time)s": "%(weekDayName)s ar a %(time)s",
+ "Upload Failed": "Chlis an uaslódáil",
+ "Permission Required": "Is Teastáil Cead",
+ "Call Failed": "Chlis an glaoch",
+ "e.g. /help to list available commands. Did you mean to send this as a message?": "Typ /help om alle opdrachten te zien. Was het uw bedoeling dit als bericht te sturen?",
"Help": "Hulp",
"Set up encryption": "Versleuteling instellen",
@@ -1588,11 +1588,11 @@
"%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
"The message you are trying to send is too large.": "Uw bericht is te lang om te versturen.",
"a few seconds ago": "enige tellen geleden",
- "about a minute ago": "een minuut of zo geleden",
+ "about a minute ago": "ongeveer een minuut geleden",
"%(num)s minutes ago": "%(num)s minuten geleden",
- "about an hour ago": "een uur of zo geleden",
+ "about an hour ago": "ongeveer een uur geleden",
"%(num)s hours ago": "%(num)s uur geleden",
- "about a day ago": "een dag of zo geleden",
+ "about a day ago": "ongeveer een dag geleden",
"%(num)s days ago": "%(num)s dagen geleden",
"a few seconds from now": "over een paar tellen",
"about a minute from now": "over een minuut of zo",
@@ -1602,7 +1602,7 @@
"about a day from now": "over een dag of zo",
"%(num)s days from now": "over %(num)s dagen",
"%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
- "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)",
+ "Try out new ways to ignore people (experimental)": "Nieuwe manieren om personen te negeren uitproberen (nog in ontwikkeling)",
"Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
"Match system theme": "Aanpassen aan systeemthema",
"Never send encrypted messages to unverified sessions from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies versturen",
@@ -1629,7 +1629,7 @@
"Channel: %(channelName)s": "Kanaal: %(channelName)s",
"Show less": "Minder tonen",
"Show more": "Meer tonen",
- "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest. Dit zal verbeterd worden.",
+ "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle versleutelingssleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw gesprekssleutels eerst opslaat, en na afloop weer inleest. Dit zal in de toekomst verbeterd worden.",
"in memory": "in het geheugen",
"not found": "niet gevonden",
"Your homeserver does not support session management.": "Uw homeserver ondersteunt geen sessiebeheer.",
@@ -1698,7 +1698,7 @@
"Session ID:": "Sessie-ID:",
"Session key:": "Sessiesleutel:",
"Message search": "Berichten zoeken",
- "A session's public name is visible to people you communicate with": "De publieke naam van een sessie is zichtbaar voor de mensen waarmee u communiceert",
+ "A session's public name is visible to people you communicate with": "De openbare naam van een sessie is zichtbaar voor de personen waarmee u communiceert",
"This room is bridging messages to the following platforms. Learn more.": "Dit gesprek wordt overbrugd naar de volgende platformen. Lees meer",
"This room isn’t bridging messages to any platforms. Learn more.": "Dit gesprek wordt niet overbrugd naar andere platformen. Lees meer.",
"Bridges": "Bruggen",
@@ -1846,7 +1846,7 @@
"Reactions": "Reacties",
"HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
HTML voor de pagina van uw gemeenschap
\n\nGebruik de lange beschrijving om nieuwe deelnemers voor te stellen aan de gemeenschap, of verspreid enkele belangrijke links\n
\n\nU kunt zelfs afbeeldingen toevoegen met Matrix URL's \n
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",
"Your %(brand)s is misconfigured": "您的 %(brand)s 配置有错误",
- "Use Single Sign On to continue": "使用单点登陆继续",
- "Confirm adding this email address by using Single Sign On to prove your identity.": "通过使用单点登陆来证明您的身份，并确认添加此邮件地址。",
- "Single Sign On": "单点登陆",
+ "Use Single Sign On to continue": "使用单点登录继续",
+ "Confirm adding this email address by using Single Sign On to prove your identity.": "通过使用单点登录来证明您的身份，并确认添加此邮件地址。",
+ "Single Sign On": "单点登录",
"Confirm adding email": "确认使用邮件",
- "Click the button below to confirm adding this email address.": "点击下面的按钮，添加此邮箱地址。",
+ "Click the button below to confirm adding this email address.": "点击下面的按钮以确认添加此邮箱地址。",
"Confirm adding this phone number by using Single Sign On to prove your identity.": "通过单点登录以证明您的身份，并确认添加此电话号码。",
"Confirm adding phone number": "确认添加电话号码",
- "Click the button below to confirm adding this phone number.": "点击下面的按钮，确认添加此电话号码。",
+ "Click the button below to confirm adding this phone number.": "点击下面的按钮以确认添加此电话号码。",
"Whether you're using %(brand)s on a device where touch is the primary input mechanism": "是否在触屏设备上使用 %(brand)s",
"Whether you're using %(brand)s as an installed Progressive Web App": "您是否已经安装 %(brand)s 作为一种渐进式的 Web 应用",
"Your user agent": "您的代理用户",
@@ -1282,14 +1282,14 @@
"Verify this session": "验证此会话",
"Encryption upgrade available": "提供加密升级",
"Set up encryption": "设置加密",
- "Review where you’re logged in": "查看您的登陆位置",
- "New login. Was this you?": "现在登陆。请问是您本人吗？",
- "Name or Matrix ID": "姓名或Matrix账号",
+ "Review where you’re logged in": "查看您的登录位置",
+ "New login. Was this you?": "现在登录。请问是您本人吗？",
+ "Name or Matrix ID": "姓名或 Matrix ID",
"Identity server has no terms of service": "身份服务器无服务条款",
- "This action requires accessing the default identity server