-
;
- }
-
return - {yourMatrixAccountText} - {editLink} -
- {_t( - "No identity server is configured: " + - "add one in server settings to reset your password.", - )} - - {_t('Sign in instead')} - -
{errorText}
{serverDeadSection}
-
;
} else if (SettingsStore.getValue(UIFeature.Registration)) {
footer = (
-
- { _t('Create account') }
-
+
+ {_t("New? Create account", {}, {
+ a: sub => { sub },
+ })}
+
);
}
@@ -686,8 +596,11 @@ export default class LoginComponent extends React.Component- {yourMatrixAccountText} - {editLink} -
+
-
;
- }
-
- const serverDetailsProps: ComponentProps
-
;
- }
-
private renderRegisterComponent() {
- if (PHASES_ENABLED && this.state.phase !== Phase.Registration) {
- return null;
- }
-
const InteractiveAuth = sdk.getComponent('structures.InteractiveAuth');
const Spinner = sdk.getComponent('elements.Spinner');
const RegistrationForm = sdk.getComponent('auth.RegistrationForm');
@@ -610,18 +459,47 @@ export default class Registration extends React.Component+ { _t("Continue with %(ssoButtons)s", { ssoButtons: "" }).trim() } +
; + } + + // i18n: ssoButtons & usernamePassword are placeholders to help translators understand context + ssoSection =+ { _t("%(ssoButtons)s Or %(usernamePassword)s", { ssoButtons: "", usernamePassword: ""}).trim() } +
+
- flow.type === "m.login.password")}
/>
);
diff --git a/src/components/views/auth/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
deleted file mode 100644
index 138f8c4689..0000000000
--- a/src/components/views/auth/CustomServerDialog.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
-
-export default class CustomServerDialog extends React.Component {
- render() {
- const brand = SdkConfig.get().brand;
- return (
- {this.props.submitText}
- : null;
-
- return (
- {
static defaultProps = {
- onEditServerDetailsClick: null,
onUsernameChanged: function() {},
onUsernameBlur: function() {},
onPhoneCountryChanged: function() {},
@@ -296,7 +293,7 @@ export default class PasswordLogin extends React.PureComponent {
}, {
key: "number",
test: ({ value }) => !value || PHONE_NUMBER_REGEX.test(value),
- invalid: () => _t("Doesn't look like a valid phone number"),
+ invalid: () => _t("That phone number doesn't look quite right, please check and try again"),
},
],
});
@@ -357,6 +354,7 @@ export default class PasswordLogin extends React.PureComponent {
key="username_input"
type="text"
label={_t("Username")}
+ placeholder={_t("Username").toLocaleLowerCase()}
value={this.props.username}
onChange={this.onUsernameChanged}
onFocus={this.onUsernameFocus}
@@ -410,20 +408,14 @@ export default class PasswordLogin extends React.PureComponent {
let forgotPasswordJsx;
if (this.props.onForgotPasswordClick) {
- forgotPasswordJsx =
- {_t('Not sure of your password? Set a new one', {}, {
- a: sub => (
-
- {sub}
-
- ),
- })}
- ;
+ forgotPasswordJsx =
+ {_t("Forgot password?")}
+ ;
}
const pwFieldClass = classNames({
@@ -465,8 +457,6 @@ export default class PasswordLogin extends React.PureComponent {
return (
{this.props.submitText}
- : null;
-
- return (
-
- );
- }
-}
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
deleted file mode 100644
index 71e7ac7f0e..0000000000
--- a/src/components/views/auth/ServerTypeSelector.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import classnames from 'classnames';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import {makeType} from "../../../utils/TypeUtils";
-
-const MODULAR_URL = 'https://element.io/matrix-services' +
- '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication';
-
-export const FREE = 'Free';
-export const PREMIUM = 'Premium';
-export const ADVANCED = 'Advanced';
-
-export const TYPES = {
- FREE: {
- id: FREE,
- label: () => _t('Free'),
- logo: () => })
,
- description: () => _t('Join millions for free on the largest public server'),
- serverConfig: makeType(ValidatedServerConfig, {
- hsUrl: "https://matrix-client.matrix.org",
- hsName: "matrix.org",
- hsNameIsDifferent: false,
- isUrl: "https://vector.im",
- }),
- },
- PREMIUM: {
- id: PREMIUM,
- label: () => _t('Premium'),
- logo: () => })
,
- description: () => _t('Premium hosting for organisations Learn more', {}, {
- a: sub =>
- {sub}
- ,
- }),
- identityServerUrl: "https://vector.im",
- },
- ADVANCED: {
- id: ADVANCED,
- label: () => _t('Advanced'),
- logo: () =>
- {this.props.serverConfig.hsName}
- ;
- },
- });
- }
-
- let editLink = null;
- if (this.props.onEditServerDetailsClick) {
- editLink =
- {_t('Change')}
- ;
- }
-
- return {
+ static propTypes = {
+ // js-sdk User object. Not required because it might not exist.
+ user: PropTypes.object,
+ };
+
+ constructor(props) {
+ super(props);
+ }
+
+ onHoldClick = () => {
+ this.props.call.setRemoteOnHold(true);
+ this.props.onFinished();
+ }
+
+ onUnholdClick = () => {
+ CallHandler.sharedInstance().setActiveCallRoomId(this.props.call.roomId);
+
+ this.props.onFinished();
+ }
+
+ render() {
+ const holdUnholdCaption = this.props.call.isRemoteOnHold() ? _t("Resume") : _t("Hold");
+ const handler = this.props.call.isRemoteOnHold() ? this.onUnholdClick : this.onHoldClick;
+
+ return
+
+ ;
+ }
+}
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index bc4514f8a6..6b871e4f24 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -149,7 +149,7 @@ export default class MessageContextMenu extends React.Component {
onRedactClick = () => {
const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, {
- onFinished: async (proceed) => {
+ onFinished: async (proceed, reason) => {
if (!proceed) return;
const cli = MatrixClientPeg.get();
@@ -157,6 +157,8 @@ export default class MessageContextMenu extends React.Component {
await cli.redactEvent(
this.props.mxEvent.getRoomId(),
this.props.mxEvent.getId(),
+ undefined,
+ reason ? { reason } : {},
);
} catch (e) {
const code = e.errcode || e.statusCode;
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index 7656e70341..8026942038 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -57,7 +57,7 @@ const WidgetContextMenu: React.FC = ({
let unpinButton;
if (showUnpin) {
const onUnpinClick = () => {
- WidgetStore.instance.unpinWidget(app.id);
+ WidgetStore.instance.unpinWidget(room.roomId, app.id);
onFinished();
};
@@ -143,7 +143,7 @@ const WidgetContextMenu: React.FC = ({
let moveLeftButton;
if (showUnpin && widgetIndex > 0) {
const onClick = () => {
- WidgetStore.instance.movePinnedWidget(app.id, -1);
+ WidgetStore.instance.movePinnedWidget(roomId, app.id, -1);
onFinished();
};
@@ -153,7 +153,7 @@ const WidgetContextMenu: React.FC = ({
let moveRightButton;
if (showUnpin && widgetIndex < pinnedWidgets.length - 1) {
const onClick = () => {
- WidgetStore.instance.movePinnedWidget(app.id, 1);
+ WidgetStore.instance.movePinnedWidget(roomId, app.id, 1);
onFinished();
};
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.js b/src/components/views/dialogs/ConfirmRedactDialog.js
index 3106df1d5b..2216f9a93a 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmRedactDialog.js
@@ -23,15 +23,17 @@ import { _t } from '../../../languageHandler';
*/
export default class ConfirmRedactDialog extends React.Component {
render() {
- const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
+ const TextInputDialog = sdk.getComponent('views.dialogs.TextInputDialog');
return (
-
-
+
);
}
}
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index 8125bc3edd..97ae968ff3 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -31,6 +31,7 @@ export default class InfoDialog extends React.Component {
onFinished: PropTypes.func,
hasCloseButton: PropTypes.bool,
onKeyDown: PropTypes.func,
+ fixedWidth: PropTypes.bool,
};
static defaultProps = {
@@ -54,6 +55,7 @@ export default class InfoDialog extends React.Component {
contentId='mx_Dialog_content'
hasCancel={this.props.hasCloseButton}
onKeyDown={this.props.onKeyDown}
+ fixedWidth={this.props.fixedWidth}
>
= ({ roomWidth }) => {
+ const canvasRef = useRef(null);
+ const effectsRef = useRef>(new Map());
+
+ const lazyLoadEffectModule = async (name: string): Promise => {
+ if (!name) return null;
+ let effect: ICanvasEffect | null = effectsRef.current[name] || null;
+ if (effect === null) {
+ const options = CHAT_EFFECTS.find((e) => e.command === name)?.options
+ try {
+ const { default: Effect } = await import(`../../../effects/${name}`);
+ effect = new Effect(options);
+ effectsRef.current[name] = effect;
+ } catch (err) {
+ console.warn('Unable to load effect module at \'../../../effects/${name}\'.', err);
+ }
+ }
+ return effect;
+ };
+
+ useEffect(() => {
+ const resize = () => {
+ if (canvasRef.current) {
+ canvasRef.current.height = window.innerHeight;
+ }
+ };
+ const onAction = (payload: { action: string }) => {
+ const actionPrefix = 'effects.';
+ if (payload.action.indexOf(actionPrefix) === 0) {
+ const effect = payload.action.substr(actionPrefix.length);
+ lazyLoadEffectModule(effect).then((module) => module?.start(canvasRef.current));
+ }
+ }
+ const dispatcherRef = dis.register(onAction);
+ const canvas = canvasRef.current;
+ canvas.height = window.innerHeight;
+ window.addEventListener('resize', resize, true);
+
+ return () => {
+ dis.unregister(dispatcherRef);
+ window.removeEventListener('resize', resize);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ const currentEffects = effectsRef.current; // this is not a react node ref, warning can be safely ignored
+ for (const effect in currentEffects) {
+ const effectModule: ICanvasEffect = currentEffects[effect];
+ if (effectModule && effectModule.isRunning) {
+ effectModule.stop();
+ }
+ }
+ };
+ }, []);
+
+ return (
+
+ )
+}
+
+export default EffectsOverlay;
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index fb34f51b60..f5754da9ae 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -61,6 +61,10 @@ interface IProps {
tooltipClassName?: string;
// If specified, an additional class name to apply to the field container
className?: string;
+ // On what events should validation occur; by default on all
+ validateOnFocus?: boolean;
+ validateOnBlur?: boolean;
+ validateOnChange?: boolean;
// All other props pass through to the .
}
@@ -100,6 +104,9 @@ export default class Field extends React.PureComponent {
public static readonly defaultProps = {
element: "input",
type: "text",
+ validateOnFocus: true,
+ validateOnBlur: true,
+ validateOnChange: true,
};
/*
@@ -137,9 +144,11 @@ export default class Field extends React.PureComponent {
this.setState({
focused: true,
});
- this.validate({
- focused: true,
- });
+ if (this.props.validateOnFocus) {
+ this.validate({
+ focused: true,
+ });
+ }
// Parent component may have supplied its own `onFocus` as well
if (this.props.onFocus) {
this.props.onFocus(ev);
@@ -147,7 +156,9 @@ export default class Field extends React.PureComponent {
};
private onChange = (ev) => {
- this.validateOnChange();
+ if (this.props.validateOnChange) {
+ this.validateOnChange();
+ }
// Parent component may have supplied its own `onChange` as well
if (this.props.onChange) {
this.props.onChange(ev);
@@ -158,16 +169,18 @@ export default class Field extends React.PureComponent {
this.setState({
focused: false,
});
- this.validate({
- focused: false,
- });
+ if (this.props.validateOnBlur) {
+ this.validate({
+ focused: false,
+ });
+ }
// Parent component may have supplied its own `onBlur` as well
if (this.props.onBlur) {
this.props.onBlur(ev);
}
};
- private async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
+ public async validate({ focused, allowEmpty = true }: {focused?: boolean, allowEmpty?: boolean}) {
if (!this.props.onValidate) {
return;
}
@@ -196,12 +209,15 @@ export default class Field extends React.PureComponent {
feedbackVisible: false,
});
}
+
+ return valid;
}
public render() {
/* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
const { element, prefixComponent, postfixComponent, className, onValidate, children,
- tooltipContent, forceValidity, tooltipClassName, list, ...inputProps} = this.props;
+ tooltipContent, forceValidity, tooltipClassName, list, validateOnBlur, validateOnChange, validateOnFocus,
+ ...inputProps} = this.props;
// Set some defaults for the element
const ref = input => this.input = input;
diff --git a/src/components/views/elements/SSOButton.js b/src/components/views/elements/SSOButton.js
deleted file mode 100644
index 1126ae3cd7..0000000000
--- a/src/components/views/elements/SSOButton.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import PlatformPeg from "../../../PlatformPeg";
-import AccessibleButton from "./AccessibleButton";
-import {_t} from "../../../languageHandler";
-
-const SSOButton = ({matrixClient, loginType, fragmentAfterLogin, ...props}) => {
- const onClick = () => {
- PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin);
- };
-
- return (
-
- {_t("Sign in with single sign-on")}
-
- );
-};
-
-SSOButton.propTypes = {
- matrixClient: PropTypes.object.isRequired, // does not use context as may use a temporary client
- loginType: PropTypes.oneOf(["sso", "cas"]), // defaults to "sso" in base-apis
- fragmentAfterLogin: PropTypes.string,
-};
-
-export default SSOButton;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
new file mode 100644
index 0000000000..57dd31f9d6
--- /dev/null
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -0,0 +1,110 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+
+import PlatformPeg from "../../../PlatformPeg";
+import AccessibleButton from "./AccessibleButton";
+import {_t} from "../../../languageHandler";
+import {IIdentityProvider, ISSOFlow} from "../../../Login";
+import classNames from "classnames";
+
+interface ISSOButtonProps extends Omit {
+ idp: IIdentityProvider;
+ mini?: boolean;
+}
+
+const SSOButton: React.FC = ({
+ matrixClient,
+ loginType,
+ fragmentAfterLogin,
+ idp,
+ primary,
+ mini,
+ ...props
+}) => {
+ const kind = primary ? "primary" : "primary_outline";
+ const label = idp ? _t("Continue with %(provider)s", { provider: idp.name }) : _t("Sign in with single sign-on");
+
+ const onClick = () => {
+ PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin, idp?.id);
+ };
+
+ let icon;
+ if (idp && idp.icon && idp.icon.startsWith("https://")) {
+ icon = 
;
+ }
+
+ const classes = classNames("mx_SSOButton", {
+ mx_SSOButton_mini: mini,
+ });
+
+ if (mini) {
+ // TODO fallback icon
+ return (
+
+ { icon }
+
+ );
+ }
+
+ return (
+
+ { icon }
+ { label }
+
+ );
+};
+
+interface IProps {
+ matrixClient: MatrixClient;
+ flow: ISSOFlow;
+ loginType?: "sso" | "cas";
+ fragmentAfterLogin?: string;
+ primary?: boolean;
+}
+
+const SSOButtons: React.FC = ({matrixClient, flow, loginType, fragmentAfterLogin, primary}) => {
+ const providers = flow["org.matrix.msc2858.identity_providers"] || [];
+ if (providers.length < 2) {
+ return
+ {_t("Edit")}
+ ;
+ }
+
+ let serverName = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
+ if (serverConfig.hsNameIsDifferent) {
+ serverName =
+ {serverConfig.hsName}
+ ;
+ }
+
+ let desc;
+ if (serverConfig.hsName === "matrix.org") {
+ desc =
+ {_t("Join millions for free on the largest public server")}
+ ;
+ }
+
+ return {
const senderName = this.props.mxEvent.sender?.name || this.props.mxEvent.getSender();
let joinCopy = _t('Join the conference at the top of this room');
- if (!WidgetStore.instance.isPinned(this.props.mxEvent.getStateKey())) {
+ if (!WidgetStore.instance.isPinned(this.props.mxEvent.getRoomId(), this.props.mxEvent.getStateKey())) {
joinCopy = _t('Join the conference from the room information card on the right');
}
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 621e85e1d4..ebc07e76b8 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -43,6 +43,7 @@ import RoomContext from "../../../contexts/RoomContext";
import {UIFeature} from "../../../settings/UIFeature";
import {ChevronFace, ContextMenuTooltipButton, useContextMenu} from "../../structures/ContextMenu";
import WidgetContextMenu from "../context_menus/WidgetContextMenu";
+import {useRoomMemberCount} from "../../../hooks/useRoomMembers";
interface IProps {
room: Room;
@@ -83,9 +84,10 @@ export const useWidgets = (room: Room) => {
interface IAppRowProps {
app: IApp;
+ room: Room;
}
-const AppRow: React.FC = ({ app }) => {
+const AppRow: React.FC = ({ app, room }) => {
const name = WidgetUtils.getWidgetName(app);
const dataTitle = WidgetUtils.getWidgetDataTitle(app);
const subtitle = dataTitle && " - " + dataTitle;
@@ -100,10 +102,10 @@ const AppRow: React.FC = ({ app }) => {
});
};
- const isPinned = WidgetStore.instance.isPinned(app.id);
+ const isPinned = WidgetStore.instance.isPinned(room.roomId, app.id);
const togglePin = isPinned
- ? () => { WidgetStore.instance.unpinWidget(app.id); }
- : () => { WidgetStore.instance.pinWidget(app.id); };
+ ? () => { WidgetStore.instance.unpinWidget(room.roomId, app.id); }
+ : () => { WidgetStore.instance.pinWidget(room.roomId, app.id); };
const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
let contextMenu;
@@ -118,7 +120,7 @@ const AppRow: React.FC = ({ app }) => {
/>;
}
- const cannotPin = !isPinned && !WidgetStore.instance.canPin(app.id);
+ const cannotPin = !isPinned && !WidgetStore.instance.canPin(room.roomId, app.id);
let pinTitle: string;
if (cannotPin) {
@@ -183,7 +185,7 @@ const AppsSection: React.FC = ({ room }) => {
};
return
- { apps.map(app =>
{ apps.length > 0 ? _t("Edit widgets, bridges & bots") : _t("Add widgets, bridges & bots") }
@@ -209,14 +211,6 @@ const onRoomSettingsClick = () => {
defaultDispatcher.dispatch({ action: "open_room_settings" });
};
-const useMemberCount = (room: Room) => {
- const [count, setCount] = useState(room.getJoinedMembers().length);
- useEventEmitter(room.currentState, "RoomState.members", () => {
- setCount(room.getJoinedMembers().length);
- });
- return count;
-};
-
const RoomSummaryCard: React.FC = ({ room, onClose }) => {
const cli = useContext(MatrixClientContext);
@@ -250,7 +244,7 @@ const RoomSummaryCard: React.FC = ({ room, onClose }) => {
;
- const memberCount = useMemberCount(room);
+ const memberCount = useRoomMemberCount(room);
return { _t('Create your account') }
+{ _t('Create account') }
{ errorText } { serverDeadSection } - { this.renderServerComponent() } - { this.state.phase !== Phase.ServerDetails &&- {yourMatrixAccountText} - {editLink} -
} +{introText}
-
-
- );
- }
-}
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 6628ca7120..60e57afc98 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -18,7 +18,6 @@ limitations under the License.
import React, {createRef} from 'react';
import PropTypes from 'prop-types';
-import url from 'url';
import classnames from 'classnames';
import * as sdk from '../../../index';
@@ -500,17 +499,11 @@ export class MsisdnAuthEntry extends React.Component {
});
try {
- const requiresIdServerParam =
- await this.props.matrixClient.doesServerRequireIdServerParam();
let result;
if (this._submitUrl) {
result = await this.props.matrixClient.submitMsisdnTokenOtherUrl(
this._submitUrl, this._sid, this.props.clientSecret, this.state.token,
);
- } else if (requiresIdServerParam) {
- result = await this.props.matrixClient.submitMsisdnToken(
- this._sid, this.props.clientSecret, this.state.token,
- );
} else {
throw new Error("The registration with MSISDN flow is misconfigured");
}
@@ -519,12 +512,6 @@ export class MsisdnAuthEntry extends React.Component {
sid: this._sid,
client_secret: this.props.clientSecret,
};
- if (requiresIdServerParam) {
- const idServerParsedUrl = url.parse(
- this.props.matrixClient.getIdentityServerUrl(),
- );
- creds.id_server = idServerParsedUrl.host;
- }
this.props.submitAuthDict({
type: MsisdnAuthEntry.LOGIN_TYPE,
// TODO: Remove `threepid_creds` once servers support proper UIA
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
deleted file mode 100644
index 28fd16379d..0000000000
--- a/src/components/views/auth/ModularServerConfig.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import SdkConfig from "../../../SdkConfig";
-import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
-import * as ServerType from '../../views/auth/ServerTypeSelector';
-import ServerConfig from "./ServerConfig";
-
-const MODULAR_URL = 'https://element.io/matrix-services' +
- '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication';
-
-// TODO: TravisR - Can this extend ServerConfig for most things?
-
-/*
- * Configure the Modular server name.
- *
- * This is a variant of ServerConfig with only the HS field and different body
- * text that is specific to the Modular case.
- */
-export default class ModularServerConfig extends ServerConfig {
- static propTypes = ServerConfig.propTypes;
-
- async validateAndApplyServer(hsUrl, isUrl) {
- // Always try and use the defaults first
- const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
- if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
- this.setState({busy: false, errorText: ""});
- this.props.onServerConfigChange(defaultConfig);
- return defaultConfig;
- }
-
- this.setState({
- hsUrl,
- isUrl,
- busy: true,
- errorText: "",
- });
-
- try {
- const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
- this.setState({busy: false, errorText: ""});
- this.props.onServerConfigChange(result);
- return result;
- } catch (e) {
- console.error(e);
- let message = _t("Unable to validate homeserver/identity server");
- if (e.translatedMessage) {
- message = e.translatedMessage;
- }
- this.setState({
- busy: false,
- errorText: message,
- });
-
- return null;
- }
- }
-
- async validateServer() {
- // TODO: Do we want to support .well-known lookups here?
- // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
- // find their homeserver without demanding they use "https://matrix.org"
- return this.validateAndApplyServer(this.state.hsUrl, ServerType.TYPES.PREMIUM.identityServerUrl);
- }
-
- render() {
- const Field = sdk.getComponent('elements.Field');
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
- const submitButton = this.props.submitText
- ?
- { _t("Custom Server Options") }
-
-
-
- {_t( - "You can use the custom server options to sign into other " + - "Matrix servers by specifying a different homeserver URL. This " + - "allows you to use %(brand)s with an existing Matrix account on a " + - "different homeserver.", - { brand }, - )}
-
-
-
-
-
- );
- }
-}
diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx
index fced2e08d0..84e583c3a5 100644
--- a/src/components/views/auth/PasswordLogin.tsx
+++ b/src/components/views/auth/PasswordLogin.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2015, 2016, 2017, 2019 New Vector Ltd.
+Copyright 2015, 2016, 2017, 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import withValidation from "../elements/Validation";
import * as Email from "../../../email";
import Field from "../elements/Field";
import CountryDropdown from "./CountryDropdown";
-import SignInToText from "./SignInToText";
// For validating phone numbers without country codes
const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -47,7 +46,6 @@ interface IProps {
onUsernameBlur?(username: string): void;
onPhoneCountryChanged?(phoneCountry: string): void;
onPhoneNumberChanged?(phoneNumber: string): void;
- onEditServerDetailsClick?(): void;
onForgotPasswordClick?(): void;
}
@@ -70,7 +68,6 @@ enum LoginField {
*/
export default class PasswordLogin extends React.PureComponent{_t("Your server")}
- {_t( - "Enter the location of your Element Matrix Services homeserver. It may use your own " + - "domain name or be a subdomain of element.io.", - {}, { - a: sub => - {sub} - , - }, - )} - -
-
;
} else {
emailHelperText =
- {_t(
- "Set an email for account recovery. " +
- "Use email to optionally be discoverable by existing contacts.",
- )}
+ {
+ _t("Add an email to be able to reset your password.")
+ } {
+ _t("Use email to optionally be discoverable by existing contacts.")
+ }
;
}
}
- const haveIs = Boolean(this.props.serverConfig.isUrl);
- let noIsText = null;
- if (this.props.serverRequiresIdServer && !haveIs) {
- noIsText =
- {_t(
- "No identity server is configured so you cannot add an email address in order to " +
- "reset your password in the future.",
- )}
-
;
- }
return (
@@ -579,7 +547,6 @@ export default class RegistrationForm extends React.PureComponent
{ emailHelperText }
- { noIsText }
{ registerButton }
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
deleted file mode 100644
index e04bf9e25a..0000000000
--- a/src/components/views/auth/ServerConfig.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
-import SdkConfig from "../../../SdkConfig";
-import { createClient } from 'matrix-js-sdk/src/matrix';
-import classNames from 'classnames';
-import CountlyAnalytics from "../../../CountlyAnalytics";
-
-/*
- * A pure UI component which displays the HS and IS to use.
- */
-
-export default class ServerConfig extends React.PureComponent {
- static propTypes = {
- onServerConfigChange: PropTypes.func.isRequired,
-
- // The current configuration that the user is expecting to change.
- serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-
- delayTimeMs: PropTypes.number, // time to wait before invoking onChanged
-
- // Called after the component calls onServerConfigChange
- onAfterSubmit: PropTypes.func,
-
- // Optional text for the submit button. If falsey, no button will be shown.
- submitText: PropTypes.string,
-
- // Optional class for the submit button. Only applies if the submit button
- // is to be rendered.
- submitClass: PropTypes.string,
-
- // Whether the flow this component is embedded in requires an identity
- // server when the homeserver says it will need one. Default false.
- showIdentityServerIfRequiredByHomeserver: PropTypes.bool,
- };
-
- static defaultProps = {
- onServerConfigChange: function() {},
- delayTimeMs: 0,
- };
-
- constructor(props) {
- super(props);
-
- this.state = {
- busy: false,
- errorText: "",
- hsUrl: props.serverConfig.hsUrl,
- isUrl: props.serverConfig.isUrl,
- showIdentityServer: false,
- };
-
- CountlyAnalytics.instance.track("onboarding_custom_server");
- }
-
- // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
- UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
- if (newProps.serverConfig.hsUrl === this.state.hsUrl &&
- newProps.serverConfig.isUrl === this.state.isUrl) return;
-
- this.validateAndApplyServer(newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
- }
-
- async validateServer() {
- // TODO: Do we want to support .well-known lookups here?
- // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
- // find their homeserver without demanding they use "https://matrix.org"
- const result = this.validateAndApplyServer(this.state.hsUrl, this.state.isUrl);
- if (!result) {
- return result;
- }
-
- // If the UI flow this component is embedded in requires an identity
- // server when the homeserver says it will need one, check first and
- // reveal this field if not already shown.
- // XXX: This a backward compatibility path for homeservers that require
- // an identity server to be passed during certain flows.
- // See also https://github.com/matrix-org/synapse/pull/5868.
- if (
- this.props.showIdentityServerIfRequiredByHomeserver &&
- !this.state.showIdentityServer &&
- await this.isIdentityServerRequiredByHomeserver()
- ) {
- this.setState({
- showIdentityServer: true,
- });
- return null;
- }
-
- return result;
- }
-
- async validateAndApplyServer(hsUrl, isUrl) {
- // Always try and use the defaults first
- const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
- if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
- this.setState({
- hsUrl: defaultConfig.hsUrl,
- isUrl: defaultConfig.isUrl,
- busy: false,
- errorText: "",
- });
- this.props.onServerConfigChange(defaultConfig);
- return defaultConfig;
- }
-
- this.setState({
- hsUrl,
- isUrl,
- busy: true,
- errorText: "",
- });
-
- try {
- const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
- this.setState({busy: false, errorText: ""});
- this.props.onServerConfigChange(result);
- return result;
- } catch (e) {
- console.error(e);
-
- const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
- if (!stateForError.isFatalError) {
- this.setState({
- busy: false,
- });
- // carry on anyway
- const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
- this.props.onServerConfigChange(result);
- return result;
- } else {
- let message = _t("Unable to validate homeserver/identity server");
- if (e.translatedMessage) {
- message = e.translatedMessage;
- }
- this.setState({
- busy: false,
- errorText: message,
- });
-
- return null;
- }
- }
- }
-
- async isIdentityServerRequiredByHomeserver() {
- // XXX: We shouldn't have to create a whole new MatrixClient just to
- // check if the homeserver requires an identity server... Should it be
- // extracted to a static utils function...?
- return createClient({
- baseUrl: this.state.hsUrl,
- }).doesServerRequireIdServerParam();
- }
-
- onHomeserverBlur = (ev) => {
- this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, () => {
- this.validateServer();
- });
- };
-
- onHomeserverChange = (ev) => {
- const hsUrl = ev.target.value;
- this.setState({ hsUrl });
- };
-
- onIdentityServerBlur = (ev) => {
- this._isTimeoutId = this._waitThenInvoke(this._isTimeoutId, () => {
- this.validateServer();
- });
- };
-
- onIdentityServerChange = (ev) => {
- const isUrl = ev.target.value;
- this.setState({ isUrl });
- };
-
- onSubmit = async (ev) => {
- ev.preventDefault();
- ev.stopPropagation();
- const result = await this.validateServer();
- if (!result) return; // Do not continue.
-
- if (this.props.onAfterSubmit) {
- this.props.onAfterSubmit();
- }
- };
-
- _waitThenInvoke(existingTimeoutId, fn) {
- if (existingTimeoutId) {
- clearTimeout(existingTimeoutId);
- }
- return setTimeout(fn.bind(this), this.props.delayTimeMs);
- }
-
- showHelpPopup = () => {
- const CustomServerDialog = sdk.getComponent('auth.CustomServerDialog');
- Modal.createTrackedDialog('Custom Server Dialog', '', CustomServerDialog);
- };
-
- _renderHomeserverSection() {
- const Field = sdk.getComponent('elements.Field');
- return
- {_t("Enter your custom homeserver URL What does this mean?", {}, {
- a: sub =>
- {sub}
- ,
- })}
-
;
- }
-
- _renderIdentityServerSection() {
- const Field = sdk.getComponent('elements.Field');
- const classes = classNames({
- "mx_ServerConfig_identityServer": true,
- "mx_ServerConfig_identityServer_shown": this.state.showIdentityServer,
- });
- return
- {_t("Enter your custom identity server URL What does this mean?", {}, {
- a: sub =>
- {sub}
- ,
- })}
-
;
- }
-
- render() {
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
- const errorText = this.state.errorText
- ? {this.state.errorText}
- : null;
-
- const submitButton = this.props.submitText
- ? ,
- description: () => _t('Join millions for free on the largest public server'),
- serverConfig: makeType(ValidatedServerConfig, {
- hsUrl: "https://matrix-client.matrix.org",
- hsName: "matrix.org",
- hsNameIsDifferent: false,
- isUrl: "https://vector.im",
- }),
- },
- PREMIUM: {
- id: PREMIUM,
- label: () => _t('Premium'),
- logo: () => ,
- description: () => _t('Premium hosting for organisations Learn more', {}, {
- a: sub =>
- {sub}
- ,
- }),
- identityServerUrl: "https://vector.im",
- },
- ADVANCED: {
- id: ADVANCED,
- label: () => _t('Advanced'),
- logo: () =>
- })
- {_t('Other')}
-
,
- description: () => _t('Find other public servers or use a custom server'),
- },
-};
-
-export function getTypeFromServerConfig(config) {
- const {hsUrl} = config;
- if (!hsUrl) {
- return null;
- } else if (hsUrl === TYPES.FREE.serverConfig.hsUrl) {
- return FREE;
- } else if (new URL(hsUrl).hostname.endsWith('.modular.im')) {
- // This is an unlikely case to reach, as Modular defaults to hiding the
- // server type selector.
- return PREMIUM;
- } else {
- return ADVANCED;
- }
-}
-
-export default class ServerTypeSelector extends React.PureComponent {
- static propTypes = {
- // The default selected type.
- selected: PropTypes.string,
- // Handler called when the selected type changes.
- onChange: PropTypes.func.isRequired,
- };
-
- constructor(props) {
- super(props);
-
- const {
- selected,
- } = props;
-
- this.state = {
- selected,
- };
- }
-
- updateSelectedType(type) {
- if (this.state.selected === type) {
- return;
- }
- this.setState({
- selected: type,
- });
- if (this.props.onChange) {
- this.props.onChange(type);
- }
- }
-
- onClick = (e) => {
- e.stopPropagation();
- const type = e.currentTarget.dataset.id;
- this.updateSelectedType(type);
- };
-
- render() {
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
- const serverTypes = [];
- for (const type of Object.values(TYPES)) {
- const { id, label, logo, description } = type;
- const classes = classnames(
- "mx_ServerTypeSelector_type",
- `mx_ServerTypeSelector_type_${id}`,
- {
- "mx_ServerTypeSelector_type_selected": id === this.state.selected,
- },
- );
-
- serverTypes.push(
- {_t('Other')}
-
-
-
-
);
- }
-
- return
- {label()}
-
-
- {logo()}
-
-
- {description()}
-
-
- {serverTypes}
-
;
- }
-}
diff --git a/src/components/views/auth/SignInToText.js b/src/components/views/auth/SignInToText.js
deleted file mode 100644
index 7564096b7d..0000000000
--- a/src/components/views/auth/SignInToText.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import {_t} from "../../../languageHandler";
-import * as sdk from "../../../index";
-import PropTypes from "prop-types";
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-
-export default class SignInToText extends React.PureComponent {
- static propTypes = {
- serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
- onEditServerDetailsClick: PropTypes.func,
- };
-
- render() {
- let signInToText = _t('Sign in to your Matrix account on %(serverName)s', {
- serverName: this.props.serverConfig.hsName,
- });
- if (this.props.serverConfig.hsNameIsDifferent) {
- const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
- signInToText = _t('Sign in to your Matrix account on - {signInToText} - {editLink} -
; - } -} diff --git a/src/components/views/context_menus/CallContextMenu.tsx b/src/components/views/context_menus/CallContextMenu.tsx new file mode 100644 index 0000000000..336b72cebf --- /dev/null +++ b/src/components/views/context_menus/CallContextMenu.tsx @@ -0,0 +1,59 @@ +/* +Copyright 2020 New Vector Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { _t } from '../../../languageHandler'; +import { ContextMenu, IProps as IContextMenuProps, MenuItem } from '../../structures/ContextMenu'; +import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; +import CallHandler from '../../../CallHandler'; + +interface IProps extends IContextMenuProps { + call: MatrixCall; +} + +export default class CallContextMenu extends React.Component
{ this.props.description }
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.tsx
similarity index 94%
rename from src/components/views/dialogs/InviteDialog.js
rename to src/components/views/dialogs/InviteDialog.tsx
index c039c191c5..8ccbbe473c 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -15,13 +15,12 @@ limitations under the License.
*/
import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
import {_t} from "../../../languageHandler";
import * as sdk from "../../../index";
import {MatrixClientPeg} from "../../../MatrixClientPeg";
import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
import DMRoomMap from "../../../utils/DMRoomMap";
-import {RoomMember} from "matrix-js-sdk/src/matrix";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
import SdkConfig from "../../../SdkConfig";
import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
import * as Email from "../../../email";
@@ -132,12 +131,12 @@ class ThreepidMember extends Member {
}
}
-class DMUserTile extends React.PureComponent {
- static propTypes = {
- member: PropTypes.object.isRequired, // Should be a Member (see interface above)
- onRemove: PropTypes.func, // takes 1 argument, the member being removed
- };
+interface IDMUserTileProps {
+ member: RoomMember;
+ onRemove: (RoomMember) => any;
+}
+class DMUserTile extends React.PureComponent {
_onRemove = (e) => {
// Stop the browser from highlighting text
e.preventDefault();
@@ -173,7 +172,9 @@ class DMUserTile extends React.PureComponent {
className='mx_InviteDialog_userTile_remove'
onClick={this._onRemove}
>
- ![{_t('Remove')}]({require("../../../../res/img/icon-pill-remove.svg")})
+
);
}
@@ -190,15 +191,15 @@ class DMUserTile extends React.PureComponent {
}
}
-class DMRoomTile extends React.PureComponent {
- static propTypes = {
- member: PropTypes.object.isRequired, // Should be a Member (see interface above)
- lastActiveTs: PropTypes.number,
- onToggle: PropTypes.func.isRequired, // takes 1 argument, the member being toggled
- highlightWord: PropTypes.string,
- isSelected: PropTypes.bool,
- };
+interface IDMRoomTileProps {
+ member: RoomMember;
+ lastActiveTs: number;
+ onToggle: (RoomMember) => any;
+ highlightWord: string;
+ isSelected: boolean;
+}
+class DMRoomTile extends React.PureComponent {
_onClick = (e) => {
// Stop the browser from highlighting text
e.preventDefault();
@@ -298,28 +299,45 @@ class DMRoomTile extends React.PureComponent {
}
}
-export default class InviteDialog extends React.PureComponent {
- static propTypes = {
- // Takes an array of user IDs/emails to invite.
- onFinished: PropTypes.func.isRequired,
+interface IInviteDialogProps {
+ // Takes an array of user IDs/emails to invite.
+ onFinished: (toInvite?: string[]) => any;
- // The kind of invite being performed. Assumed to be KIND_DM if
- // not provided.
- kind: PropTypes.string,
+ // The kind of invite being performed. Assumed to be KIND_DM if
+ // not provided.
+ kind: string,
- // The room ID this dialog is for. Only required for KIND_INVITE.
- roomId: PropTypes.string,
+ // The room ID this dialog is for. Only required for KIND_INVITE.
+ roomId: string,
- // Initial value to populate the filter with
- initialText: PropTypes.string,
- };
+ // Initial value to populate the filter with
+ initialText: string,
+}
+interface IInviteDialogState {
+ targets: RoomMember[]; // array of Member objects (see interface above)
+ filterText: string;
+ recents: { user: Member, userId: string }[];
+ numRecentsShown: number;
+ suggestions: { user: Member, userId: string }[];
+ numSuggestionsShown: number;
+ serverResultsMixin: { user: Member, userId: string }[];
+ threepidResultsMixin: { user: Member, userId: string}[];
+ canUseIdentityServer: boolean;
+ tryingIdentityServer: boolean;
+
+ // These two flags are used for the 'Go' button to communicate what is going on.
+ busy: boolean,
+ errorText: string,
+}
+
+export default class InviteDialog extends React.PureComponent {
static defaultProps = {
kind: KIND_DM,
initialText: "",
};
- _debounceTimer: number = null;
+ _debounceTimer: NodeJS.Timeout = null; // actually number because we're in the browser
_editorRef: any = null;
constructor(props) {
@@ -348,8 +366,8 @@ export default class InviteDialog extends React.PureComponent {
numRecentsShown: INITIAL_ROOMS_SHOWN,
suggestions: this._buildSuggestions(alreadyInvited),
numSuggestionsShown: INITIAL_ROOMS_SHOWN,
- serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions
- threepidResultsMixin: [], // { user: ThreepidMember, userId: string}[], like recents and suggestions
+ serverResultsMixin: [],
+ threepidResultsMixin: [],
canUseIdentityServer: !!MatrixClientPeg.get().getIdentityServerUrl(),
tryingIdentityServer: false,
@@ -367,7 +385,7 @@ export default class InviteDialog extends React.PureComponent {
}
}
- static buildRecents(excludedTargetIds: Set): {userId: string, user: RoomMember, lastActive: number} {
+ static buildRecents(excludedTargetIds: Set): {userId: string, user: RoomMember, lastActive: number}[] {
const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
// Also pull in all the rooms tagged as DefaultTagID.DM so we don't miss anything. Sometimes the
@@ -430,7 +448,7 @@ export default class InviteDialog extends React.PureComponent {
return recents;
}
- _buildSuggestions(excludedTargetIds: Set): {userId: string, user: RoomMember} {
+ _buildSuggestions(excludedTargetIds: Set): {userId: string, user: RoomMember}[] {
const maxConsideredMembers = 200;
const joinedRooms = MatrixClientPeg.get().getRooms()
.filter(r => r.getMyMembership() === 'join' && r.getJoinedMemberCount() <= maxConsideredMembers);
@@ -470,7 +488,7 @@ export default class InviteDialog extends React.PureComponent {
}, {});
// Generates { userId: {member, numRooms, score} }
- const memberScores = Object.values(memberRooms).reduce((scores, entry) => {
+ const memberScores = Object.values(memberRooms).reduce((scores, entry: {member: RoomMember, rooms: Room[]}) => {
const numMembersTotal = entry.rooms.reduce((c, r) => c + r.getJoinedMemberCount(), 0);
const maxRange = maxConsideredMembers * entry.rooms.length;
scores[entry.member.userId] = {
@@ -603,7 +621,7 @@ export default class InviteDialog extends React.PureComponent {
return;
}
- const createRoomOptions = {inlineErrors: true};
+ const createRoomOptions = {inlineErrors: true} as any; // XXX: Type out `createRoomOptions`
if (privateShouldBeEncrypted()) {
// Check whether all users have uploaded device keys before.
@@ -620,7 +638,7 @@ export default class InviteDialog extends React.PureComponent {
// Check if it's a traditional DM and create the room if required.
// TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
- let createRoomPromise = Promise.resolve();
+ let createRoomPromise = Promise.resolve(null) as Promise;
const isSelf = targetIds.length === 1 && targetIds[0] === MatrixClientPeg.get().getUserId();
if (targetIds.length === 1 && !isSelf) {
createRoomOptions.dmUserId = targetIds[0];
@@ -990,7 +1008,8 @@ export default class InviteDialog extends React.PureComponent {
const hasMixins = this.state.serverResultsMixin || this.state.threepidResultsMixin;
if (this.state.filterText && hasMixins && kind === 'suggestions') {
// We don't want to duplicate members though, so just exclude anyone we've already seen.
- const notAlreadyExists = (u: Member): boolean => {
+ // The type of u is a pain to define but members of both mixins have the 'userId' property
+ const notAlreadyExists = (u: any): boolean => {
return !sourceMembers.some(m => m.userId === u.userId)
&& !priorityAdditionalMembers.some(m => m.userId === u.userId)
&& !otherAdditionalMembers.some(m => m.userId === u.userId);
@@ -1169,7 +1188,8 @@ export default class InviteDialog extends React.PureComponent {
if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
const communityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
- const inviteText = _t("This won't invite them to %(communityName)s. " +
+ const inviteText = _t(
+ "This won't invite them to %(communityName)s. " +
"To invite someone to %(communityName)s, click here",
{communityName}, {
userId: () => {
@@ -1209,7 +1229,9 @@ export default class InviteDialog extends React.PureComponent {
userId: () =>
{userId},
a: (sub) =>
- {sub},
+
+ {sub}
+ ,
},
);
} else {
@@ -1220,7 +1242,9 @@ export default class InviteDialog extends React.PureComponent {
userId: () =>
{userId},
a: (sub) =>
- {sub},
+
+ {sub}
+ ,
},
);
}
diff --git a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
new file mode 100644
index 0000000000..b7cc81c113
--- /dev/null
+++ b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
@@ -0,0 +1,96 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as React from "react";
+
+import { _t } from '../../../languageHandler';
+import { IDialogProps } from "./IDialogProps";
+import {useRef, useState} from "react";
+import Field from "../elements/Field";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import withValidation from "../elements/Validation";
+import * as Email from "../../../email";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps extends IDialogProps {
+ onFinished(continued: boolean, email?: string): void;
+}
+
+const validation = withValidation({
+ rules: [
+ {
+ key: "email",
+ test: ({ value }) => !value || Email.looksValid(value),
+ invalid: () => _t("Doesn't look like a valid email address"),
+ },
+ ],
+});
+
+const RegistrationEmailPromptDialog: React.FC = ({onFinished}) => {
+ const [email, setEmail] = useState("");
+ const fieldRef = useRef();
+
+ const onSubmit = async () => {
+ if (email) {
+ const valid = await fieldRef.current.validate({ allowEmpty: false });
+
+ if (!valid) {
+ fieldRef.current.focus();
+ fieldRef.current.validate({ allowEmpty: false, focused: true });
+ return;
+ }
+ }
+
+ onFinished(true, email);
+ };
+
+ return onFinished(false)}
+ fixedWidth={false}
+ >
+ ;
+};
+
+export default RegistrationEmailPromptDialog;
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index a43b284c42..9d9313f08f 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -53,9 +53,9 @@ export default class RoomSettingsDialog extends React.Component {
}
_onAction = (payload) => {
- // When room changes below us, close the room settings
+ // When view changes below us, close the room settings
// whilst the modal is open this can only be triggered when someone hits Leave Room
- if (payload.action === 'view_next_room') {
+ if (payload.action === 'view_home_page') {
this.props.onFinished();
}
};
diff --git a/src/components/views/dialogs/ServerPickerDialog.tsx b/src/components/views/dialogs/ServerPickerDialog.tsx
new file mode 100644
index 0000000000..65d53f0870
--- /dev/null
+++ b/src/components/views/dialogs/ServerPickerDialog.tsx
@@ -0,0 +1,235 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {createRef} from "react";
+import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
+
+import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import BaseDialog from './BaseDialog';
+import { _t } from '../../../languageHandler';
+import AccessibleButton from "../elements/AccessibleButton";
+import SdkConfig from "../../../SdkConfig";
+import Field from "../elements/Field";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import TextWithTooltip from "../elements/TextWithTooltip";
+import withValidation, {IFieldState} from "../elements/Validation";
+
+interface IProps {
+ title?: string;
+ serverConfig: ValidatedServerConfig;
+ onFinished(config?: ValidatedServerConfig): void;
+}
+
+interface IState {
+ defaultChosen: boolean;
+ otherHomeserver: string;
+}
+
+export default class ServerPickerDialog extends React.PureComponent {
+ private readonly defaultServer: ValidatedServerConfig;
+ private readonly fieldRef = createRef();
+ private validatedConf: ValidatedServerConfig;
+
+ constructor(props) {
+ super(props);
+
+ const config = SdkConfig.get();
+ this.defaultServer = config["validated_server_config"] as ValidatedServerConfig;
+ const { serverConfig } = this.props;
+
+ let otherHomeserver = "";
+ if (!serverConfig.isDefault) {
+ if (serverConfig.isNameResolvable && serverConfig.hsName) {
+ otherHomeserver = serverConfig.hsName;
+ } else {
+ otherHomeserver = serverConfig.hsUrl;
+ }
+ }
+
+ this.state = {
+ defaultChosen: serverConfig.isDefault,
+ otherHomeserver,
+ };
+ }
+
+ private onDefaultChosen = () => {
+ this.setState({ defaultChosen: true });
+ };
+
+ private onOtherChosen = () => {
+ this.setState({ defaultChosen: false });
+ };
+
+ private onHomeserverChange = (ev) => {
+ this.setState({ otherHomeserver: ev.target.value });
+ };
+
+ // TODO: Do we want to support .well-known lookups here?
+ // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
+ // find their homeserver without demanding they use "https://matrix.org"
+ private validate = withValidation({
+ deriveData: async ({ value }) => {
+ let hsUrl = value.trim(); // trim to account for random whitespace
+
+ // if the URL has no protocol, try validate it as a serverName via well-known
+ if (!hsUrl.includes("://")) {
+ try {
+ const discoveryResult = await AutoDiscovery.findClientConfig(hsUrl);
+ this.validatedConf = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(hsUrl, discoveryResult);
+ return {}; // we have a validated config, we don't need to try the other paths
+ } catch (e) {
+ console.error(`Attempted ${hsUrl} as a server_name but it failed`, e);
+ }
+ }
+
+ // if we got to this stage then either the well-known failed or the URL had a protocol specified,
+ // so validate statically only. If the URL has no protocol, default to https.
+ if (!hsUrl.includes("://")) {
+ hsUrl = "https://" + hsUrl;
+ }
+
+ try {
+ this.validatedConf = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl);
+ return {};
+ } catch (e) {
+ console.error(e);
+
+ const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
+ if (stateForError.isFatalError) {
+ let error = _t("Unable to validate homeserver");
+ if (e.translatedMessage) {
+ error = e.translatedMessage;
+ }
+ return { error };
+ }
+
+ // try to carry on anyway
+ try {
+ this.validatedConf = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, null, true);
+ return {};
+ } catch (e) {
+ console.error(e);
+ return { error: _t("Invalid URL") };
+ }
+ }
+ },
+ rules: [
+ {
+ key: "required",
+ test: ({ value, allowEmpty }) => allowEmpty || !!value,
+ invalid: () => _t("Specify a homeserver"),
+ }, {
+ key: "valid",
+ test: async function({ value }, { error }) {
+ if (!value) return true;
+ return !error;
+ },
+ invalid: function({ error }) {
+ return error;
+ },
+ },
+ ],
+ });
+
+ private onHomeserverValidate = (fieldState: IFieldState) => this.validate(fieldState);
+
+ private onSubmit = async (ev) => {
+ ev.preventDefault();
+
+ const valid = await this.fieldRef.current.validate({ allowEmpty: false });
+
+ if (!valid) {
+ this.fieldRef.current.focus();
+ this.fieldRef.current.validate({ allowEmpty: false, focused: true });
+ return;
+ }
+
+ this.props.onFinished(this.validatedConf);
+ };
+
+ public render() {
+ let text;
+ if (this.defaultServer.hsName === "matrix.org") {
+ text = _t("Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.");
+ }
+
+ let defaultServerName = this.defaultServer.hsName;
+ if (this.defaultServer.hsNameIsDifferent) {
+ defaultServerName = (
+
+ {this.defaultServer.hsName}
+
+ );
+ }
+
+ return
+
+ ;
+ }
+}
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 1569977d58..5264031cc6 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -146,7 +146,7 @@ export default class ShareDialog extends React.PureComponent {
const events = this.props.target.getLiveTimeline().getEvents();
matrixToUrl = this.state.permalinkCreator.forEvent(events[events.length - 1].getId());
} else {
- matrixToUrl = this.state.permalinkCreator.forRoom();
+ matrixToUrl = this.state.permalinkCreator.forShareableRoom();
}
} else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
matrixToUrl = makeUserPermalink(this.props.target.userId);
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b862a1e912..7e0ae965bb 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -375,17 +375,20 @@ export default class AppTile extends React.Component {
);
- // all widgets can theoretically be allowed to remain on screen, so we wrap
- // them all in a PersistedElement from the get-go. If we wait, the iframe will
- // be re-mounted later, which means the widget has to start over, which is bad.
+ if (!this.props.userWidget) {
+ // All room widgets can theoretically be allowed to remain on screen, so we
+ // wrap them all in a PersistedElement from the get-go. If we wait, the iframe
+ // will be re-mounted later, which means the widget has to start over, which is
+ // bad.
- // Also wrap the PersistedElement in a div to fix the height, otherwise
- // AppTile's border is in the wrong place
- appTileBody =
+
);
}
@@ -190,15 +191,15 @@ class DMUserTile extends React.PureComponent {
}
}
-class DMRoomTile extends React.PureComponent {
- static propTypes = {
- member: PropTypes.object.isRequired, // Should be a Member (see interface above)
- lastActiveTs: PropTypes.number,
- onToggle: PropTypes.func.isRequired, // takes 1 argument, the member being toggled
- highlightWord: PropTypes.string,
- isSelected: PropTypes.bool,
- };
+interface IDMRoomTileProps {
+ member: RoomMember;
+ lastActiveTs: number;
+ onToggle: (RoomMember) => any;
+ highlightWord: string;
+ isSelected: boolean;
+}
+class DMRoomTile extends React.PureComponent
+
+ {_t("Just a heads up, if you don't add an email and forget your password, you could " + + "permanently lose access to your account.", {}, { + b: sub => {sub}, + })}
+ +
-
- {appTileBody}
-
-
;
+ // Also wrap the PersistedElement in a div to fix the height, otherwise
+ // AppTile's border is in the wrong place
+ appTileBody =
+
+ {appTileBody}
+
+
;
+ }
}
}
diff --git a/src/components/views/elements/EffectsOverlay.tsx b/src/components/views/elements/EffectsOverlay.tsx
new file mode 100644
index 0000000000..38be8da9a8
--- /dev/null
+++ b/src/components/views/elements/EffectsOverlay.tsx
@@ -0,0 +1,94 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import React, { FunctionComponent, useEffect, useRef } from 'react';
+import dis from '../../../dispatcher/dispatcher';
+import ICanvasEffect from '../../../effects/ICanvasEffect';
+import {CHAT_EFFECTS} from '../../../effects'
+
+interface IProps {
+ roomWidth: number;
+}
+
+const EffectsOverlay: FunctionComponent
+
;
+ }
+
+ return
+ { providers.map(idp => (
+
;
+};
+
+export default SSOButtons;
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
new file mode 100644
index 0000000000..4551a49deb
--- /dev/null
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -0,0 +1,93 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import AccessibleButton from "./AccessibleButton";
+import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import {_t} from "../../../languageHandler";
+import TextWithTooltip from "./TextWithTooltip";
+import SdkConfig from "../../../SdkConfig";
+import Modal from "../../../Modal";
+import ServerPickerDialog from "../dialogs/ServerPickerDialog";
+import InfoDialog from "../dialogs/InfoDialog";
+
+interface IProps {
+ title?: string;
+ dialogTitle?: string;
+ serverConfig: ValidatedServerConfig;
+ onServerConfigChange?(config: ValidatedServerConfig): void;
+}
+
+const showPickerDialog = (
+ title: string,
+ serverConfig: ValidatedServerConfig,
+ onFinished: (config: ValidatedServerConfig) => void,
+) => {
+ Modal.createTrackedDialog("Server Picker", "", ServerPickerDialog, { title, serverConfig, onFinished });
+};
+
+const onHelpClick = () => {
+ Modal.createTrackedDialog('Custom Server Dialog', '', InfoDialog, {
+ title: _t("Server Options"),
+ description: _t("You can use the custom server options to sign into other Matrix servers by specifying " +
+ "a different homeserver URL. This allows you to use Element with an existing Matrix account on " +
+ "a different homeserver."),
+ button: _t("Dismiss"),
+ hasCloseButton: false,
+ fixedWidth: false,
+ }, "mx_ServerPicker_helpDialog");
+};
+
+const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }: IProps) => {
+ let editBtn;
+ if (!SdkConfig.get()["disable_custom_urls"] && onServerConfigChange) {
+ const onClick = () => {
+ showPickerDialog(dialogTitle, serverConfig, (config?: ValidatedServerConfig) => {
+ if (config) {
+ onServerConfigChange(config);
+ }
+ });
+ };
+ editBtn =
+
+}
+
+export default ServerPicker;
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 82aa32d3b7..b87efd472a 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -35,7 +35,7 @@ export default class MJitsiWidgetEvent extends React.PureComponent{title || _t("Homeserver")}
+
-
+
+
);
}
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index be4ecaffb3..9be3d6be18 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -60,8 +60,9 @@ const NewRoomIntro = () => {
{ caption && { caption }
} ; } else { + const inRoom = room && room.getMyMembership() === "join"; const topic = room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic; - const canAddTopic = room.currentState.maySendStateEvent(EventType.RoomTopic, cli.getUserId()); + const canAddTopic = inRoom && room.currentState.maySendStateEvent(EventType.RoomTopic, cli.getUserId()); const onTopicClick = () => { dis.dispatch({ @@ -99,9 +100,25 @@ const NewRoomIntro = () => { }); } - const onInviteClick = () => { - dis.dispatch({ action: "view_invite", roomId }); - }; + let canInvite = inRoom; + const powerLevels = room.currentState.getStateEvents(EventType.RoomPowerLevels, "")?.getContent(); + const me = room.getMember(cli.getUserId()); + if (powerLevels && me && powerLevels.invite > me.powerLevel) { + canInvite = false; + } + + let buttons; + if (canInvite) { + const onInviteClick = () => { + dis.dispatch({ action: "view_invite", roomId }); + }; + + buttons =
+
+ {_t("Invite to this room")}
+
+
+ }
const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url;
body = {topicText}
-
-
- {_t("Invite to this room")}
-
-
+ { buttons }
-
-
+ {sub}
+ ,
+ });
+ } else if (this.state.isLocalOnHold) {
+ onHoldText = _t("%(peerName)s held the call", {
+ peerName: this.props.call.getOpponentMember().name,
+ });
+ }
+
+ if (this.props.call.type === CallType.Video) {
+ let onHoldContent = null;
+ let onHoldBackground = null;
+ const backgroundStyle: CSSProperties = {};
+ const containerClasses = classNames({
+ mx_CallView_video: true,
+ mx_CallView_video_hold: isOnHold,
+ });
+ if (isOnHold) {
+ onHoldContent =
+
+ ;
+ }
+
header =
- {
return {
+ private dispatcherRef: string;
+
+ constructor(props: IProps) {
+ super(props);
+ this.state = {
+ call: this.getCall(),
+ };
+ }
+
+ public componentDidMount() {
+ this.dispatcherRef = dis.register(this.onAction);
+ }
+
+ public componentWillUnmount() {
+ dis.unregister(this.dispatcherRef);
+ }
+
+ private onAction = (payload) => {
+ switch (payload.action) {
+ case 'call_state': {
+ const newCall = this.getCall();
+ if (newCall !== this.state.call) {
+ this.setState({call: newCall});
+ }
+ break;
+ }
+ }
+ };
+
+ private getCall(): MatrixCall {
+ const call = CallHandler.sharedInstance().getCallForRoom(this.props.roomId);
+
+ if (call && [CallState.Ended, CallState.Ringing].includes(call.state)) return null;
+ return call;
+ }
+
+ public render() {
+ if (!this.state.call) return null;
+
+ return {
componentDidMount() {
this.vid.current.addEventListener('resize', this.onResize);
- if (this.props.type === VideoFeedType.Local) {
- this.props.call.setLocalVideoElement(this.vid.current);
- } else {
- this.props.call.setRemoteVideoElement(this.vid.current);
+ this.setVideoElement();
+ }
+
+ componentDidUpdate(prevProps) {
+ if (this.props.call !== prevProps.call) {
+ this.setVideoElement();
}
}
@@ -53,6 +55,14 @@ export default class VideoFeed extends React.Component {
this.vid.current.removeEventListener('resize', this.onResize);
}
+ private setVideoElement() {
+ if (this.props.type === VideoFeedType.Local) {
+ this.props.call.setLocalVideoElement(this.vid.current);
+ } else {
+ this.props.call.setRemoteVideoElement(this.vid.current);
+ }
+ }
+
onResize = (e) => {
if (this.props.onResize) {
this.props.onResize(e);
diff --git a/src/customisations/RoomList.ts b/src/customisations/RoomList.ts
new file mode 100644
index 0000000000..758b212aa2
--- /dev/null
+++ b/src/customisations/RoomList.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+// Populate this file with the details of your customisations when copying it.
+
+/**
+ * Determines if a room is visible in the room list or not. By default,
+ * all rooms are visible. Where special handling is performed by Element,
+ * those rooms will not be able to override their visibility in the room
+ * list - Element will make the decision without calling this function.
+ *
+ * This function should be as fast as possible to avoid slowing down the
+ * client.
+ * @param {Room} room The room to check the visibility of.
+ * @returns {boolean} True if the room should be visible, false otherwise.
+ */
+function isRoomVisible(room: Room): boolean {
+ return true;
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IRoomListCustomisations {
+ isRoomVisible?: typeof isRoomVisible;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up the interface above.
+export const RoomListCustomisations: IRoomListCustomisations = {};
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 5ed0c0529f..8a7ccfcb7b 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -190,7 +190,9 @@ abstract class PlainBasePart extends BasePart {
return true;
}
// only split if the previous character is a space
- return this._text[offset - 1] !== " ";
+ // or if it is a + and this is a :
+ return this._text[offset - 1] !== " " &&
+ (this._text[offset - 1] !== "+" || chr !== ":");
}
return true;
}
diff --git a/src/effects/ICanvasEffect.ts b/src/effects/ICanvasEffect.ts
new file mode 100644
index 0000000000..9bf3e9293d
--- /dev/null
+++ b/src/effects/ICanvasEffect.ts
@@ -0,0 +1,47 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+/**
+ * Defines the constructor of a canvas based room effect
+ */
+export interface ICanvasEffectConstructable {
+ /**
+ * @param {{[key:string]:any}} options? Optional animation options
+ * @returns ICanvasEffect Returns a new instance of the canvas effect
+ */
+ new(options?: { [key: string]: any }): ICanvasEffect;
+}
+
+/**
+ * Defines the interface of a canvas based room effect
+ */
+export default interface ICanvasEffect {
+ /**
+ * @param {HTMLCanvasElement} canvas The canvas instance as the render target of the animation
+ * @param {number} timeout? A timeout that defines the runtime of the animation (defaults to false)
+ */
+ start: (canvas: HTMLCanvasElement, timeout?: number) => Promise;
+
+ /**
+ * Stops the current animation
+ */
+ stop: () => Promise;
+
+ /**
+ * Returns a value that defines if the animation is currently running
+ */
+ isRunning: boolean;
+}
diff --git a/src/effects/confetti/index.ts b/src/effects/confetti/index.ts
new file mode 100644
index 0000000000..8c4b2d2616
--- /dev/null
+++ b/src/effects/confetti/index.ts
@@ -0,0 +1,191 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import ICanvasEffect from '../ICanvasEffect';
+
+export type ConfettiOptions = {
+ /**
+ * max confetti count
+ */
+ maxCount: number,
+ /**
+ * particle animation speed
+ */
+ speed: number,
+ /**
+ * the confetti animation frame interval in milliseconds
+ */
+ frameInterval: number,
+ /**
+ * the alpha opacity of the confetti (between 0 and 1, where 1 is opaque and 0 is invisible)
+ */
+ alpha: number,
+ /**
+ * use gradient instead of solid particle color
+ */
+ gradient: boolean,
+}
+
+type ConfettiParticle = {
+ color: string,
+ color2: string,
+ x: number,
+ y: number,
+ diameter: number,
+ tilt: number,
+ tiltAngleIncrement: number,
+ tiltAngle: number,
+}
+
+export const DefaultOptions: ConfettiOptions = {
+ maxCount: 150,
+ speed: 3,
+ frameInterval: 15,
+ alpha: 1.0,
+ gradient: false,
+};
+
+export default class Confetti implements ICanvasEffect {
+ private readonly options: ConfettiOptions;
+
+ constructor(options: { [key: string]: any }) {
+ this.options = {...DefaultOptions, ...options};
+ }
+
+ private context: CanvasRenderingContext2D | null = null;
+ private supportsAnimationFrame = window.requestAnimationFrame;
+ private colors = ['rgba(30,144,255,', 'rgba(107,142,35,', 'rgba(255,215,0,',
+ 'rgba(255,192,203,', 'rgba(106,90,205,', 'rgba(173,216,230,',
+ 'rgba(238,130,238,', 'rgba(152,251,152,', 'rgba(70,130,180,',
+ 'rgba(244,164,96,', 'rgba(210,105,30,', 'rgba(220,20,60,'];
+
+ private lastFrameTime = Date.now();
+ private particles: Array = [];
+ private waveAngle = 0;
+
+ public isRunning: boolean;
+
+ public start = async (canvas: HTMLCanvasElement, timeout = 3000) => {
+ if (!canvas) {
+ return;
+ }
+ this.context = canvas.getContext('2d');
+ this.particles = [];
+ const count = this.options.maxCount;
+ while (this.particles.length < count) {
+ this.particles.push(this.resetParticle({} as ConfettiParticle, canvas.width, canvas.height));
+ }
+ this.isRunning = true;
+ this.runAnimation();
+ if (timeout) {
+ window.setTimeout(this.stop, timeout);
+ }
+ }
+
+ public stop = async () => {
+ this.isRunning = false;
+ }
+
+ private resetParticle = (particle: ConfettiParticle, width: number, height: number): ConfettiParticle => {
+ particle.color = this.colors[(Math.random() * this.colors.length) | 0] + (this.options.alpha + ')');
+ if (this.options.gradient) {
+ particle.color2 = this.colors[(Math.random() * this.colors.length) | 0] + (this.options.alpha + ')');
+ } else {
+ particle.color2 = particle.color;
+ }
+ particle.x = Math.random() * width;
+ particle.y = Math.random() * -height;
+ particle.diameter = Math.random() * 10 + 5;
+ particle.tilt = Math.random() * -10;
+ particle.tiltAngleIncrement = Math.random() * 0.07 + 0.05;
+ particle.tiltAngle = Math.random() * Math.PI;
+ return particle;
+ }
+
+ private runAnimation = (): void => {
+ if (!this.context || !this.context.canvas) {
+ return;
+ }
+ if (this.particles.length === 0) {
+ this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+ } else {
+ const now = Date.now();
+ const delta = now - this.lastFrameTime;
+ if (!this.supportsAnimationFrame || delta > this.options.frameInterval) {
+ this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+ this.updateParticles();
+ this.drawParticles(this.context);
+ this.lastFrameTime = now - (delta % this.options.frameInterval);
+ }
+ requestAnimationFrame(this.runAnimation);
+ }
+ }
+
+
+ private drawParticles = (context: CanvasRenderingContext2D): void => {
+ if (!this.context || !this.context.canvas) {
+ return;
+ }
+ let x; let x2; let y2;
+ for (const particle of this.particles) {
+ this.context.beginPath();
+ context.lineWidth = particle.diameter;
+ x2 = particle.x + particle.tilt;
+ x = x2 + particle.diameter / 2;
+ y2 = particle.y + particle.tilt + particle.diameter / 2;
+ if (this.options.gradient) {
+ const gradient = context.createLinearGradient(x, particle.y, x2, y2);
+ gradient.addColorStop(0, particle.color);
+ gradient.addColorStop(1.0, particle.color2);
+ context.strokeStyle = gradient;
+ } else {
+ context.strokeStyle = particle.color;
+ }
+ context.moveTo(x, particle.y);
+ context.lineTo(x2, y2);
+ context.stroke();
+ }
+ }
+
+ private updateParticles = () => {
+ if (!this.context || !this.context.canvas) {
+ return;
+ }
+ const width = this.context.canvas.width;
+ const height = this.context.canvas.height;
+ let particle: ConfettiParticle;
+ this.waveAngle += 0.01;
+ for (let i = 0; i < this.particles.length; i++) {
+ particle = this.particles[i];
+ if (!this.isRunning && particle.y < -15) {
+ particle.y = height + 100;
+ } else {
+ particle.tiltAngle += particle.tiltAngleIncrement;
+ particle.x += Math.sin(this.waveAngle) - 0.5;
+ particle.y += (Math.cos(this.waveAngle) + particle.diameter + this.options.speed) * 0.5;
+ particle.tilt = Math.sin(particle.tiltAngle) * 15;
+ }
+ if (particle.x > width + 20 || particle.x < -20 || particle.y > height) {
+ if (this.isRunning && this.particles.length <= this.options.maxCount) {
+ this.resetParticle(particle, width, height);
+ } else {
+ this.particles.splice(i, 1);
+ i--;
+ }
+ }
+ }
+ }
+}
diff --git a/src/effects/index.ts b/src/effects/index.ts
new file mode 100644
index 0000000000..16a0851070
--- /dev/null
+++ b/src/effects/index.ts
@@ -0,0 +1,89 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import { _t, _td } from "../languageHandler";
+
+export type Effect = {
+ /**
+ * one or more emojis that will trigger this effect
+ */
+ emojis: Array;
+ /**
+ * the matrix message type that will trigger this effect
+ */
+ msgType: string;
+ /**
+ * the room command to trigger this effect
+ */
+ command: string;
+ /**
+ * a function that returns the translated description of the effect
+ */
+ description: () => string;
+ /**
+ * a function that returns the translated fallback message. this message will be shown if the user did not provide a custom message
+ */
+ fallbackMessage: () => string;
+ /**
+ * animation options
+ */
+ options: TOptions;
+}
+
+type ConfettiOptions = {
+ /**
+ * max confetti count
+ */
+ maxCount: number,
+ /**
+ * particle animation speed
+ */
+ speed: number,
+ /**
+ * the confetti animation frame interval in milliseconds
+ */
+ frameInterval: number,
+ /**
+ * the alpha opacity of the confetti (between 0 and 1, where 1 is opaque and 0 is invisible)
+ */
+ alpha: number,
+ /**
+ * use gradient instead of solid particle color
+ */
+ gradient: boolean,
+}
+
+/**
+ * This configuration defines room effects that can be triggered by custom message types and emojis
+ */
+export const CHAT_EFFECTS: Array> = [
+ {
+ emojis: ['🎊', '🎉'],
+ msgType: 'nic.custom.confetti',
+ command: 'confetti',
+ description: () => _td("Sends the given message with confetti"),
+ fallbackMessage: () => _t("sends confetti") + " 🎉",
+ options: {
+ maxCount: 150,
+ speed: 3,
+ frameInterval: 15,
+ alpha: 1.0,
+ gradient: false,
+ },
+ } as Effect,
+];
+
+
diff --git a/src/effects/utils.ts b/src/effects/utils.ts
new file mode 100644
index 0000000000..c2b499b154
--- /dev/null
+++ b/src/effects/utils.ts
@@ -0,0 +1,24 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+/**
+ * Checks a message if it contains one of the provided emojis
+ * @param {Object} content The message
+ * @param {Array} emojis The list of emojis to check for
+ */
+export const containsEmoji = (content: { msgtype: string, body: string }, emojis: Array): boolean => {
+ return emojis.some((emoji) => content.body && content.body.includes(emoji));
+}
diff --git a/src/hooks/useRoomMembers.ts b/src/hooks/useRoomMembers.ts
new file mode 100644
index 0000000000..e25436045e
--- /dev/null
+++ b/src/hooks/useRoomMembers.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {useState} from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+
+import {useEventEmitter} from "./useEventEmitter";
+import {throttle} from "lodash";
+
+// Hook to simplify watching Matrix Room joined members
+export const useRoomMembers = (room: Room, throttleWait = 250) => {
+ const [members, setMembers] = useState(room.getJoinedMembers());
+ useEventEmitter(room.currentState, "RoomState.members", throttle(() => {
+ setMembers(room.getJoinedMembers());
+ }, throttleWait, {leading: true, trailing: true}));
+ return members;
+};
+
+// Hook to simplify watching Matrix Room joined member count
+export const useRoomMemberCount = (room: Room, throttleWait = 250) => {
+ const [count, setCount] = useState(room.getJoinedMemberCount());
+ useEventEmitter(room.currentState, "RoomState.members", throttle(() => {
+ setCount(room.getJoinedMemberCount());
+ }, throttleWait, {leading: true, trailing: true}));
+ return count;
+};
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index fec025da8d..5da09afd23 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1422,5 +1422,71 @@
"This will end the conference for everyone. Continue?": "هذا سينهي المؤتمر للجميع. استمر؟",
"The call was answered on another device.": "تم الرد على المكالمة على جهاز آخر.",
"The call could not be established": "تعذر إجراء المكالمة",
- "Call Declined": "رُفض الاتصال"
+ "Call Declined": "رُفض الاتصال",
+ "See videos posted to your active room": "أظهر الفيديوهات المرسلة إلى هذه غرفتك النشطة",
+ "See videos posted to this room": "أظهر الفيديوهات المرسلة إلى هذه الغرفة",
+ "Send videos as you in your active room": "أرسل الفيديوهات بهويتك في غرفتك النشطة",
+ "Send videos as you in this room": "أرسل الفيديوهات بهويتك في هذه الغرفة",
+ "See messages posted to this room": "أرسل الرسائل المرسلة إلى هذه الغرفة",
+ "See images posted to your active room": "أظهر الصور المرسلة إلى غرفتك النشطة",
+ "See images posted to this room": "أظهر الصور المرسلة إلى هذه الغرفة",
+ "Send images as you in your active room": "أرسل الصور بهويتك في غرفتك النشطة",
+ "Send images as you in this room": "أرسل الصور بهويتك في هذه الغرفة",
+ "See emotes posted to your active room": "أظهر الرموز التعبيرية المرسلة لغرفتك النشطة",
+ "See emotes posted to this room": "أظهر الرموز التعبيرية المرسلة إلى هذه الغرفة",
+ "Send emotes as you in your active room": "أظهر الرموز التعبيرية بهويتك في غرفتك النشطة",
+ "Send emotes as you in this room": "أرسل الرموز التعبيرية بهويتك",
+ "See text messages posted to your active room": "أظهر الرسائل النصية المرسلة إلى غرفتك النشطة",
+ "See text messages posted to this room": "أظهر الرسائل النصية المرسلة إلى هذه الغرفة",
+ "Send text messages as you in your active room": "أرسل الرسائل النصية بهويتك في غرفتك النشطة",
+ "Send text messages as you in this room": "أرسل الرسائل النصية بهويتك في هذه الغرفة",
+ "See messages posted to your active room": "أظهر الرسائل المرسلة إلى غرفتك النشطة",
+ "Send messages as you in your active room": "أرسل رسائل بهويتك في غرفتك النشطة",
+ "Send messages as you in this room": "أرسل رسائل بهويتك في هذه الغرفة",
+ "The %(capability)s capability": "القدرة %(capability)s",
+ "See %(eventType)s events posted to your active room": "أظهر أحداث %(eventType)s المنشورة بغرفة النشطة",
+ "Send %(eventType)s events as you in your active room": "أرسل أحداث %(eventType)s بهويتك في غرفتك النشطة",
+ "See %(eventType)s events posted to this room": "أظهر أحداث %(eventType)s المنشورة في هذه الغرفة",
+ "Send %(eventType)s events as you in this room": "أرسل أحداث %(eventType)s بهويتك في هذه الغرفة",
+ "with state key %(stateKey)s": "مع مفتاح الحالة %(stateKey)s",
+ "with an empty state key": "بمفتاح حالة فارغ",
+ "See when anyone posts a sticker to your active room": "أظهر وضع أي أحد للملصقات لغرفتك النشطة",
+ "Send stickers to your active room as you": "أرسل ملصقات لغرفتك النشطة بهويتك",
+ "See when a sticker is posted in this room": "أظهر وضع الملصقات في هذه الغرفة",
+ "Send stickers to this room as you": "أرسل ملصقات لهذه الغرفة بهويتك",
+ "See when the avatar changes in your active room": "أظهر تغييرات صورة غرفتك النشطة",
+ "Change the avatar of your active room": "غير صورة غرفتك النشطة",
+ "See when the avatar changes in this room": "أظهر تغييرات الصورة في هذه الغرفة",
+ "Change the avatar of this room": "غير صورة هذه الغرفة",
+ "See when the name changes in your active room": "أظهر تغييرات الاسم في غرفتك النشطة",
+ "Change the name of your active room": "غير اسم غرفتك النشطة",
+ "See when the name changes in this room": "أظهر تغييرات الاسم في هذه الغرفة",
+ "Change the name of this room": "غير اسم هذه الغرفة",
+ "See when the topic changes in your active room": "أظهر تغيير موضوع غرفتك النشطة",
+ "Change the topic of your active room": "غير موضوع غرفتك النشطة",
+ "See when the topic changes in this room": "أظهر تغير موضوع هذه الغرفة",
+ "Change the topic of this room": "تغيير موضوع هذه الغرفة",
+ "Change which room you're viewing": "تغيير الغرفة التي تشاهدها",
+ "Send stickers into your active room": "أرسل ملصقات إلى غرفتك النشطة",
+ "Send stickers into this room": "أرسل ملصقات إلى هذه الغرفة",
+ "Remain on your screen while running": "ابقَ على شاشتك أثناء إجراء",
+ "Remain on your screen when viewing another room, when running": "ابقَ على شاشتك عند مشاهدة غرفة أخرى أثناء إجراء",
+ "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر المستخدمين المطابقة %(glob)s بسبب %(reason)s",
+ "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر الخوادم المطابقة %(glob)s بسبب %(reason)s",
+ "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر الغرفة المطابقة %(glob)s بسبب %(reason)s",
+ "%(senderName)s declined the call.": "%(senderName)s رفض المكالمة.",
+ "(an error occurred)": "(حدث خطأ)",
+ "(their device couldn't start the camera / microphone)": "(تعذر على جهازهم بدء تشغيل الكاميرا / الميكروفون)",
+ "(connection failed)": "(فشل الاتصال)",
+ "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 جميع الخوادم ممنوعة من المشاركة! لم يعد من الممكن استخدام هذه الغرفة.",
+ "Takes the call in the current room off hold": "يوقف المكالمة في الغرفة الحالية",
+ "Places the call in the current room on hold": "يضع المكالمة في الغرفة الحالية قيد الانتظار",
+ "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "يلصق (͡ ° ͜ʖ ͡ °) أوَّل رسالة نصية عادية",
+ "No other application is using the webcam": "لا يوجد تطبيق آخر يستخدم كاميرا الويب",
+ "Permission is granted to use the webcam": "منح الإذن باستخدام كاميرا الويب",
+ "A microphone and webcam are plugged in and set up correctly": "الميكروفون وكاميرا ويب موصولان ومعدان بشكل صحيح",
+ "Call failed because no webcam or microphone could not be accessed. Check that:": "فشلت المكالمة نظرًا لتعذر الوصول إلى كاميرا الويب أو الميكروفون. تحقق مما يلي:",
+ "Unable to access webcam / microphone": "تعذر الوصول إلى كاميرا الويب / الميكروفون",
+ "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "فشلت المكالمة لأنه لا يمكن الوصول إلى ميكروفون. تحقق من توصيل الميكروفون وإعداده بشكل صحيح.",
+ "Unable to access microphone": "تعذر الوصول إلى الميكروفون"
}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 4d9d27363f..3f9d231317 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -119,7 +119,7 @@
"Error: Problem communicating with the given homeserver.": "Chyba: problém v komunikaci s daným domovským serverem.",
"Existing Call": "Probíhající hovor",
"Export": "Exportovat",
- "Export E2E room keys": "Exportovat end-to-end klíče místnosti",
+ "Export E2E room keys": "Exportovat end-to-end klíče místností",
"Failed to ban user": "Nepodařilo se vykázat uživatele",
"Failed to join room": "Vstup do místnosti se nezdařil",
"Failed to kick": "Vykopnutí se nezdařilo",
@@ -131,14 +131,14 @@
"Failed to send request.": "Odeslání žádosti se nezdařilo.",
"Failed to set display name": "Nepodařilo se nastavit zobrazované jméno",
"Failed to unban": "Přijetí zpět se nezdařilo",
- "Failed to upload profile picture!": "Nahrání profilového obrázku se nezdařilo",
+ "Failed to upload profile picture!": "Nahrání profilového obrázku se nezdařilo!",
"Failure to create room": "Vytvoření místnosti se nezdařilo",
"Forget room": "Zapomenout místnost",
"For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
"and %(count)s others...|other": "a %(count)s další...",
"%(widgetName)s widget modified by %(senderName)s": "Uživatel %(senderName)s upravil widget %(widgetName)s",
"%(widgetName)s widget removed by %(senderName)s": "Uživatel %(senderName)s odstranil widget %(widgetName)s",
- "%(widgetName)s widget added by %(senderName)s": "Uživatel %(senderName)s přidal widget %(widgetName)s",
+ "%(widgetName)s widget added by %(senderName)s": "Uživatel %(senderName)s přidal widget %(widgetName)s",
"Automatically replace plain text Emoji": "Automaticky nahrazovat textové emoji",
"Failed to upload image": "Obrázek se nepodařilo nahrát",
"%(senderName)s answered the call.": "Uživatel %(senderName)s přijal hovor.",
@@ -219,7 +219,7 @@
"Submit": "Odeslat",
"Success": "Úspěch",
"The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
- "This email address is already in use": "Tato e-mailová adresa je již požívána",
+ "This email address is already in use": "Tato e-mailová adresa je již používána",
"This email address was not found": "Tato e-mailová adresa nebyla nalezena",
"This room has no local addresses": "Tato místnost nemá žádné místní adresy",
"This room is not recognised.": "Tato místnost nebyla rozpoznána.",
@@ -438,7 +438,7 @@
"URL previews are enabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres povolené pro členy této místnosti.",
"URL previews are disabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres zakázané pro členy této místnosti.",
"Invalid file%(extra)s": "Neplatný soubor%(extra)s",
- "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s %(integrationsUrl)s. Chcete pokračovat?",
+ "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s %(integrationsUrl)s. Chcete pokračovat?",
"Please check your email to continue registration.": "Pro pokračování v registraci prosím zkontrolujte své e-maily.",
"Token incorrect": "Neplatný token",
"A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s byla odeslána textová zpráva",
@@ -557,7 +557,7 @@
"Failed to add the following users to the summary of %(groupId)s:": "Do souhrnného seznamu skupiny %(groupId)s se nepodařilo přidat následující uživatele:",
"Add a User": "Přidat uživatele",
"Failed to remove a user from the summary of %(groupId)s": "Ze souhrnného seznamu skupiny %(groupId)s se nepodařilo odstranit uživatele",
- "The user '%(displayName)s' could not be removed from the summary.": "Nelze odstranit uživatele '%(displayName)s' ze souhrnného seznamu.",
+ "The user '%(displayName)s' could not be removed from the summary.": "Nelze odstranit uživatele '%(displayName)s' ze souhrnného seznamu.",
"Unable to accept invite": "Nelze přijmout pozvání",
"Unable to reject invite": "Nelze odmítnout pozvání",
"Community Settings": "Nastavení skupiny",
@@ -1332,7 +1332,7 @@
"The homeserver may be unavailable or overloaded.": "Domovský server je nedostupný nebo přetížený.",
"Add room": "Přidat místnost",
"You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
- "You have %(count)s unread notifications in a prior version of this room.|one": "Máte jedno nepřečtené oznámení v předchozí verzi této místnosti.",
+ "You have %(count)s unread notifications in a prior version of this room.|one": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
"Your profile": "Váš profil",
"Your Matrix account on debug logs to help us track down the problem.": "TIP pro profíky: Pokud nahlásíte chybu, odešlete prosím ladicí protokoly , které nám pomohou problém vypátrat.",
+ "Please view existing bugs on Github first. No match? Start a new one .": "Nejříve si prosím prohlédněte existující chyby na Githubu . Žádná shoda? Nahlašte novou chybu .",
+ "Report a bug": "Nahlásit chybu",
+ "Add widgets, bridges & bots": "Přidat widgety, bridge a boty",
+ "Widgets": "Widgety",
+ "Show Widgets": "Zobrazit widgety",
+ "Hide Widgets": "Skrýt widgety",
+ "Room settings": "Nastavení místnosti",
+ "Use the Desktop app to see all encrypted files": "Pomocí desktopové aplikace zobrazíte všechny šifrované soubory",
+ "Attach files from chat or just drag and drop them anywhere in a room.": "Připojte soubory z chatu nebo je jednoduše přetáhněte kamkoli do místnosti.",
+ "No files visible in this room": "V této místnosti nejsou viditelné žádné soubory",
+ "Show files": "Zobrazit soubory",
+ "%(count)s people|other": "%(count)s lidé",
+ "About": "O",
+ "You’re all caught up": "Vše vyřízeno",
+ "You have no visible notifications in this room.": "V této místnosti nemáte žádná viditelná oznámení.",
+ "Hey you. You're the best!": "Hej ty. Jsi nejlepší!",
+ "Secret storage:": "Bezpečné úložiště:",
+ "Backup key cached:": "Klíč zálohy cachován:",
+ "Backup key stored:": "Klíč zálohy uložen:",
+ "Backup version:": "Verze zálohy:",
+ "Algorithm:": "Algoritmus:",
+ "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Tuto možnost můžete povolit, pokud bude místnost použita pouze pro spolupráci s interními týmy na vašem domovském serveru. Toto nelze později změnit.",
+ "Block anyone not part of %(serverName)s from ever joining this room.": "Blokovat komukoli, kdo není součástí serveru %(serverName)s, aby se nikdy nepřipojil do této místnosti.",
+ "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "Zálohujte šifrovací klíče s daty vašeho účtu pro případ, že ztratíte přístup k relacím. Vaše klíče budou zabezpečeny jedinečným klíčem pro obnovení.",
+ "Manage the names of and sign out of your sessions below or verify them in your User Profile.": "Níže můžete spravovat názvy a odhlásit se ze svých relací nebo je ověřit v uživatelském profilu.",
+ "or another cross-signing capable Matrix client": "nebo jiný Matrix klient schopný cross-signing",
+ "Cross-signing is not set up.": "Cross-signing není nastaveno.",
+ "Cross-signing is ready for use.": "Cross-signing je připraveno k použití.",
+ "Create a Group Chat": "Vytvořit skupinový chat",
+ "Send a Direct Message": "Poslat přímou zprávu",
+ "This requires the latest %(brand)s on your other devices:": "To vyžaduje nejnovější %(brand)s na vašich ostatních zařízeních:",
+ "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Potvrďte svou identitu ověřením tohoto přihlášení z jedné z vašich dalších relací a udělte mu přístup k šifrovaným zprávám.",
+ "Verify this login": "Ověřte toto přihlášení",
+ "Welcome to %(appName)s": "Vítá vás %(appName)s",
+ "Liberate your communication": "Osvoboďte svou komunikaci",
+ "Navigation": "Navigace",
+ "Use the + to make a new room or explore existing ones below": "Pomocí + vytvořte novou místnost nebo prozkoumejte stávající místnosti",
+ "Secure Backup": "Zabezpečená záloha",
+ "Jump to oldest unread message": "Jít na nejstarší nepřečtenou zprávu",
+ "Upload a file": "Nahrát soubor",
+ "You've reached the maximum number of simultaneous calls.": "Dosáhli jste maximálního počtu souběžných hovorů.",
+ "Too Many Calls": "Přiliš mnoho hovorů",
+ "Community and user menu": "Nabídka komunity a uživatele",
+ "User menu": "Uživatelská nabídka",
+ "Switch theme": "Přepnout téma",
+ "Switch to dark mode": "Přepnout do tmavého režimu",
+ "Switch to light mode": "Přepnout do světlého režimu",
+ "User settings": "Uživatelská nastavení",
+ "Community settings": "Nastavení komunity",
+ "Confirm your recovery passphrase": "Potvrďte vaši frázi pro obnovení",
+ "Repeat your recovery passphrase...": "Opakujte přístupovou frázi pro obnovení...",
+ "Please enter your recovery passphrase a second time to confirm.": "Potvrďte prosím podruhé svou frázi pro obnovení.",
+ "Use a different passphrase?": "Použít jinou frázi?",
+ "Great! This recovery passphrase looks strong enough.": "Skvělé! Tato fráze pro obnovení vypadá dostatečně silně.",
+ "Enter a recovery passphrase": "Zadejte frázi pro obnovení",
+ "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s nebo %(usernamePassword)s",
+ "If you've joined lots of rooms, this might take a while": "Pokud jste se připojili ke spoustě místností, může to chvíli trvat",
+ "There was a problem communicating with the homeserver, please try again later.": "Při komunikaci s domovským serverem došlo k potížím, zkuste to prosím později.",
+ "Continue with %(ssoButtons)s": "Pokračovat s %(ssoButtons)s",
+ "Use Recovery Key": "Použít klíč pro obnovu",
+ "Use Recovery Key or Passphrase": "Použít klíč pro obnovu nebo frázi",
+ "Already have an account? Sign in here": "Máte již účet? Přihlašte se zde",
+ "Host account on": "Hostovat účet na",
+ "Signing In...": "Přihlašování...",
+ "Syncing...": "Synchronizuji...",
+ "That username already exists, please try another.": "Toto uživatelské jméno již existuje, zkuste prosím jiné.",
+ "Verify other session": "Ověření jiné relace",
+ "Filter rooms and people": "Filtrovat místnosti a lidi",
+ "Explore rooms in %(communityName)s": "Prozkoumejte místnosti v %(communityName)s",
+ "delete the address.": "smazat adresu.",
+ "Delete the room address %(alias)s and remove %(name)s from the directory?": "Smazat adresu místnosti %(alias)s a odebrat %(name)s z adresáře?",
+ "Self-verification request": "Požadavek na sebeověření",
+ "%(creator)s created this DM.": "%(creator)s vytvořil tuto přímou zprávu.",
+ "You do not have permission to create rooms in this community.": "Nemáte oprávnění k vytváření místností v této komunitě.",
+ "Cannot create rooms in this community": "V této komunitě nelze vytvořit místnosti",
+ "Great, that'll help people know it's you": "Skvělé, to pomůže lidem zjistit, že jste to vy",
+ "Add a photo so people know it's you.": "Přidejte fotku, aby lidé věděli, že jste to vy.",
+ "Explore Public Rooms": "Prozkoumat veřejné místnosti",
+ "Welcome %(name)s": "Vítejte %(name)s",
+ "Now, let's help you get started": "Nyní vám pomůžeme začít",
+ "Effects": "Efekty",
+ "Alt": "Alt",
+ "Approve": "Schválit",
+ "Looks good!": "To vypadá dobře!",
+ "Wrong file type": "Špatný typ souboru",
+ "The server has denied your request.": "Server odmítl váš požadavek.",
+ "The server is offline.": "Server je offline.",
+ "not ready": "nepřipraveno",
+ "Remove messages sent by others": "Odstranit zprávy odeslané ostatními",
+ "Decline All": "Odmítnout vše",
+ "Use the Desktop app to search encrypted messages": "K prohledávání šifrovaných zpráv použijte aplikaci pro stolní počítače",
+ "Invite someone using their name, email address, username (like existing bugs on Github first. No match? Start a new one .": "Bitte wirf einen Blick auf existierende Bugs auf Github . Keinen gefunden? Erstelle einen neuen .",
+ "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.": "PRO TIPP: Wenn du einen Bug meldest, füge bitte Debug-Logs hinzu um uns zu helfen das Problem zu finden.",
+ "Invite by email": "Via Email einladen",
+ "Start a conversation with someone using their name, email address or username (like valid signature from this user": "Varmuuskopiossa on kelvollinen allekirjoitus tältä käyttäjältä",
"Backup has a invalid signature from this user": "Varmuuskopiossa on epäkelpo allekirjoitus tältä käyttäjältä",
"Backup has a signature from unknown user with ID %(deviceId)s": "Varmuuskopiossa on tuntematon allekirjoitus käyttäjältä, jonka ID on %(deviceId)s",
@@ -1956,7 +1956,7 @@
"Liberate your communication": "Vapauta viestintäsi",
"Send a Direct Message": "Lähetä yksityisviesti",
"Explore Public Rooms": "Selaa julkisia huoneita",
- "Create a Group Chat": "Luo ryhmäkeskustelu",
+ "Create a Group Chat": "Luo ryhmä",
"Super": "Super",
"Cancel replying to a message": "Peruuta viestiin vastaaminen",
"Jump to room search": "Siirry huonehakuun",
@@ -2019,10 +2019,10 @@
"Verify all your sessions to ensure your account & messages are safe": "Varmenna kaikki istuntosi varmistaaksesi, että tunnuksesi ja viestisi ovat turvassa",
"Verify the new login accessing your account: %(name)s": "Varmenna uusi tunnuksellesi sisäänkirjautunut taho: %(name)s",
"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.": "Tällä hetkellä salasanan vaihtaminen nollaa kaikki osapuolten välisen salauksen avaimet kaikissa istunnoissa, tehden salatusta keskusteluhistoriasta lukukelvotonta, ellet ensin vie kaikkia huoneavaimiasi ja tuo niitä salasanan vaihtamisen jäkeen takaisin. Tulevaisuudessa tämä tulee toimimaan paremmin.",
- "Your homeserver does not support cross-signing.": "Kotipalvelimesi ei tue ristivarmennusta.",
- "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Tunnuksellasi on ristivarmennuksen identiteetti salavarastossa, mutta tämä istunto ei luota siihen.",
+ "Your homeserver does not support cross-signing.": "Kotipalvelimesi ei tue ristiinvarmennusta.",
+ "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Tunnuksellasi on ristiinvarmennuksen identiteetti salaisessa tallennustilassa, mutta tämä istunto ei vielä luota siihen.",
"Reset cross-signing and secret storage": "Nollaa ristivarmennus ja salavarasto",
- "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Varmenna jokainen käyttäjän istunto erikseen, äläkä luota ristivarmennettuihin laitteisiin.",
+ "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Varmenna jokainen istunto erikseen, äläkä luota ristiinvarmennettuihin laitteisiin.",
"Securely cache encrypted messages locally for them to appear in search results.": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa.",
"%(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 search components added .": "%(brand)sissa ei ole joitain komponentteja, joita tarvitaan viestien turvalliseen välimuistitallennukseen. Jos haluat kokeilla tätä ominaisuutta, käännä mukautettu %(brand)s Desktop, jossa on mukana hakukomponentit .",
"This session is backing up your keys. ": "Tämä istunto varmuuskopioi avaimesi. ",
@@ -2093,9 +2093,9 @@
"Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Tämän huoneen viestit ovat salattuja osapuolten välisellä salauksella. Lue lisää ja varmenna tämä käyttäjä hänen profiilistaan.",
"Enter the name of a new server you want to explore.": "Syötä sen uuden palvelimen nimi, jota hauat tutkia.",
"%(networkName)s rooms": "Verkon %(networkName)s huoneet",
- "Destroy cross-signing keys?": "Tuhoa ristivarmennuksen avaimet?",
- "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Ristivarmennuksen avainten tuhoamista ei voi kumota. Jokainen, jonka olet varmentanut, tulee näkemään turvallisuushälytyksiä. Et todennäköisesti halua tehdä tätä, ellet ole hukannut kaikkia laitteitasi, joista pystyt ristivarmentamaan.",
- "Clear cross-signing keys": "Tyhjennä ristivarmennuksen avaimet",
+ "Destroy cross-signing keys?": "Tuhoa ristiinvarmennuksen avaimet?",
+ "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Ristiinvarmennuksen avainten tuhoamista ei voi kumota. Jokainen, jonka olet varmentanut, tulee näkemään turvallisuushälytyksiä. Et todennäköisesti halua tehdä tätä, ellet ole hukannut kaikkia laitteitasi, joista pystyit ristiinvarmentamaan.",
+ "Clear cross-signing keys": "Tyhjennä ristiinvarmennuksen avaimet",
"Enable end-to-end encryption": "Ota osapuolten välinen salaus käyttöön",
"Session key": "Istunnon tunnus",
"Verification Requests": "Varmennuspyynnöt",
@@ -2144,7 +2144,7 @@
"Address (optional)": "Osoite (valinnainen)",
"Light": "Vaalea",
"Dark": "Tumma",
- "Emoji picker": "Emojivalitsin",
+ "Emoji picker": "Emojit",
"No recently visited rooms": "Ei hiljattain vierailtuja huoneita",
"People": "Ihmiset",
"Sort by": "Lajittelutapa",
@@ -2245,7 +2245,7 @@
"Add widgets, bridges & bots": "Lisää sovelmia, siltoja ja botteja",
"Edit widgets, bridges & bots": "Muokkaa sovelmia, siltoja ja botteja",
"Widgets": "Sovelmat",
- "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Yhteisöjen v2 prototyypit. Vaatii yhteensopivan kotipalvelimen. Erittäin kokeellinen — käytä varoen.",
+ "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Yhteisöjen v2 prototyypit. Vaatii yhteensopivan kotipalvelimen. Erittäin kokeellinen – käytä varoen.",
"Change notification settings": "Muokkaa ilmoitusasetuksia",
"The person who invited you already left the room, or their server is offline.": "Henkilö, joka kutsui sinut, on jo lähtenyt huoneesta, tai hänen palvelin on pois verkosta.",
"The person who invited you already left the room.": "Henkilö, joka kutsui sinut, lähti jo huoneesta.",
@@ -2263,5 +2263,448 @@
"Answered Elsewhere": "Vastattu muualla",
"The call could not be established": "Puhelua ei voitu aloittaa",
"The other party declined the call.": "Toinen osapuoli hylkäsi puhelun.",
- "Call Declined": "Puhelu hylätty"
+ "Call Declined": "Puhelu hylätty",
+ "%(brand)s Android": "%(brand)s Android",
+ "%(brand)s iOS": "%(brand)s iOS",
+ "Starting microphone...": "Käynnistetään mikrofonia...",
+ "Starting camera...": "Käynnistetään kameraa...",
+ "Call connecting...": "Yhdistetään puhelua...",
+ "Calling...": "Soitetaan...",
+ "%(creator)s created this DM.": "%(creator)s loi tämän yksityisviestin.",
+ "You do not have permission to create rooms in this community.": "Sinulla ei ole lupaa luoda huoneita tähän yhteisöön.",
+ "Cannot create rooms in this community": "Tähän yhteisöön ei voi luoda huoneita",
+ "Welcome %(name)s": "Tervetuloa, %(name)s",
+ "Create community": "Luo yhteisö",
+ "No files visible in this room": "Tässä huoneessa ei näy tiedostoja",
+ "Take a picture": "Ota kuva",
+ "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Palvelimesi ei vastaa joihinkin pyynnöistäsi. Alla on joitakin todennäköisimpiä syitä.",
+ "Server isn't responding": "Palvelin ei vastaa",
+ "Add comment": "Lisää kommentti",
+ "Update community": "Päivitä yhteisö",
+ "Create a room in %(communityName)s": "Luo huone yhteisöön %(communityName)s",
+ "Your server requires encryption to be enabled in private rooms.": "Palvelimesi edellyttää, että salaus on käytössä yksityisissä huoneissa.",
+ "An image will help people identify your community.": "Kuva auttaa ihmisiä tunnistamaan yhteisösi.",
+ "Add image (optional)": "Lisää kuva (valinnainen)",
+ "Enter name": "Syötä nimi",
+ "What's the name of your community or team?": "Mikä on yhteisösi tai tiimisi nimi?",
+ "Invite people to join %(communityName)s": "Kutsu ihmisiä yhteisöön %(communityName)s",
+ "Send %(count)s invites|one": "Lähetä %(count)s kutsu",
+ "Send %(count)s invites|other": "Lähetä %(count)s kutsua",
+ "Add another email": "Lisää toinen sähköposti",
+ "Click to view edits": "Napsauta nähdäksesi muokkaukset",
+ "Edited at %(date)s": "Muokattu %(date)s",
+ "Role": "Rooli",
+ "Show files": "Näytä tiedostot",
+ "%(count)s people|one": "%(count)s henkilö",
+ "%(count)s people|other": "%(count)s ihmistä",
+ "Forget Room": "Unohda huone",
+ "Show previews of messages": "Näytä viestien esikatselut",
+ "Show rooms with unread messages first": "Näytä ensimmäisenä huoneet, joissa on lukemattomia viestejä",
+ "%(count)s results|one": "%(count)s tulos",
+ "%(count)s results|other": "%(count)s tulosta",
+ "Start a new chat": "Aloita uusi keskustelu",
+ "Can't see what you’re looking for?": "Etkö löydä, mitä etsit?",
+ "This is the start of Re-request encryption keys from your other sessions.": "Volta a solicitar chaves de cifrado desde as outras sesións.",
"This message cannot be decrypted": "Esta mensaxe non pode descifrarse",
@@ -1713,7 +1713,7 @@
"Remove recent messages": "Eliminar mensaxes recentes",
"%(role)s in %(roomName)s": "%(role)s en %(roomName)s",
"Deactivate user?": "¿Desactivar usuaria?",
- "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Ao desactivar esta usuaria ficará desconectada e non poderá voltar a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
+ "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Ao desactivar esta usuaria ficará desconectada e non poderá volver a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
"Deactivate user": "Desactivar usuaria",
"Failed to deactivate user": "Fallo ao desactivar a usuaria",
"This client does not support end-to-end encryption.": "Este cliente non soporta o cifrado extremo-a-extremo.",
@@ -1864,8 +1864,8 @@
"Hide advanced": "Ocultar Avanzado",
"Show advanced": "Mostrar Avanzado",
"Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarias de outros servidores matrix se unan a esta sala (Este axuste non se pode cambiar máis tarde!)",
- "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás voltar á nova versión de %(brand)s para facer esto",
- "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e voltar a conectar.",
+ "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás volver á nova versión de %(brand)s para facer esto",
+ "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e volver a conectar.",
"Incompatible Database": "Base de datos non compatible",
"Continue With Encryption Disabled": "Continuar con Cifrado Desactivado",
"Are you sure you want to deactivate your account? This is irreversible.": "¿Tes a certeza de querer desactivar a túa conta? Esto é irreversible.",
@@ -1918,7 +1918,7 @@
"The authenticity of this encrypted message can't be guaranteed on this device.": "A autenticidade desta mensaxe cifrada non está garantida neste dispositivo.",
"Signature upload success": "Subeuse correctamente a sinatura",
"Signature upload failed": "Fallou a subida da sinatura",
- "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Anteriormente utilizaches %(brand)s en %(host)s con carga preguiceira de membros. Nesta versión a carga preguiceira está desactivada. Como a caché local non é compatible entre as dúas configuracións, %(brand)s precisa voltar a sincronizar a conta.",
+ "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Anteriormente utilizaches %(brand)s en %(host)s con carga preguiceira de membros. Nesta versión a carga preguiceira está desactivada. Como a caché local non é compatible entre as dúas configuracións, %(brand)s precisa volver a sincronizar a conta.",
"Incompatible local cache": "Caché local incompatible",
"Clear cache and resync": "Baleirar caché e sincronizar",
"%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s utiliza agora entre 3 e 5 veces menos memoria, cargando só información sobre as usuarias cando é preciso. Agarda mentras se sincroniza co servidor!",
@@ -2079,7 +2079,7 @@
"Premium hosting for organisations Learn more": "Hospedaxe Premium para organizacións Saber máis",
"Find other public servers or use a custom server": "Atopa outros servidores públicos ou usa un servidor personalizado",
"Couldn't load page": "Non se puido cargar a páxina",
- "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás voltar a unirte sen un convite doutra persoa administradora.",
+ "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás volver a unirte sen un convite doutra persoa administradora.",
"Want more than a community? Get your own server": "¿Queres algo máis que unha comunidade? Monta o teu propio servidor",
"This homeserver does not support communities": "Este servidor non soporta comunidades",
"Welcome to %(appName)s": "Benvida a %(appName)s",
@@ -2845,5 +2845,131 @@
"Filter rooms and people": "Fitrar salas e persoas",
"Open the link in the email to continue registration.": "Abre a ligazón que hai no email para continuar co rexistro.",
"A confirmation email has been sent to %(emailAddress)s": "Enviouse un email de confirmación a %(emailAddress)s",
- "Start a new chat": "Comezar nova conversa"
+ "Start a new chat": "Comezar nova conversa",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
+ "Go to Home View": "Ir á Páxina de Inicio",
+ "debug logs to help us track down the problem.": "PRO PATARIMAS: Jei pradėjote klaidos pranešimą, pateikite derinimo žurnalus , kad padėtumėte mums išsiaiškinti problemą.",
+ "Please review and accept the policies of this homeserver:": "Peržiūrėkite ir sutikite su šio serverio politika:",
+ "Please review and accept all of the homeserver's policies": "Peržiūrėkite ir sutikite su visa serverio politika",
+ "Please view existing bugs on Github first. No match? Start a new one .": "Pirmiausia peržiūrėkite Github'e esančius pranešimus apie klaidas . Jokio atitikmens? Pradėkite naują pranešimą .",
+ "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.": "Paprastai tai turi įtakos tik kambario apdorojimui serveryje. Jei jūs turite problemų su savo %(brand)s, praneškite apie klaidą.",
+ "Report a bug": "Pranešti apie klaidą",
+ "Invite someone using their name, email address, username (like anonymous usage data which helps us improve %(brand)s. This will use a cookie .": "Wysyłaj anonimowe dane o wykorzystywaniu , które pomogą nam usprawnić %(brand)s. To będzie korzystać z pliku cookie .",
+ "Help us improve %(brand)s": "Pomóż nam usprawnić %(brand)s",
+ "Unknown App": "Nieznana aplikacja",
+ "Enable desktop notifications": "Włącz powiadomienia na pulpicie",
+ "Don't miss a reply": "Nie przegap odpowiedzi",
+ "A session's public name is visible to people you communicate with": "Publiczna nazwa sesji jest widoczna dla osób z którymi się komunikujesz",
+ "Manage the names of and sign out of your sessions below or verify them in your User Profile.": "Zarządzaj nazwami i unieważnaj sesje poniżej, lub weryfikuj je na swoim profilu.",
+ "Where you’re logged in": "Gdzie jesteś zalogowany(-a)",
+ "Review where you’re logged in": "Przejrzyj, gdzie jesteś zalogowany(-a)",
+ "Show tray icon and minimize window to it on close": "Pokazuj ikonę w zasobniku i minimalizuj okno do zasobnika przy zamknięciu",
+ "Display your community flair in rooms configured to show it.": "Wyświetlaj swój wyróżnik społeczności w pokojach skonfigurowanych, aby go używać.",
+ "System font name": "Nazwa czcionki systemowej",
+ "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Wybierz nazwę czcionki zainstalowanej w systemie, a %(brand)s spróbuje jej użyć.",
+ "Use a system font": "Użyj czcionki systemowej",
+ "Enable experimental, compact IRC style layout": "Włącz eksperymentalny, kompaktowy układ w stylu IRC",
+ "Use a more compact ‘Modern’ layout": "Użyj bardziej kompaktowego „nowoczesnego” układu",
+ "Use custom size": "Użyj niestandardowego rozmiaru",
+ "Appearance Settings only affect this %(brand)s session.": "Ustawienia wyglądu wpływają tylko na tę sesję %(brand)s.",
+ "Customise your appearance": "Dostosuj wygląd",
+ "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji aby zarządzać botami, widżetami i pakietami naklejek.",
+ "Use an Integration Manager (%(serverName)s) to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji %(serverName)s aby zarządzać botami, widżetami i pakietami naklejek.",
+ "There are two ways you can provide feedback and help us improve %(brand)s.": "Są dwa sposoby na przekazanie informacji zwrotnych i pomoc w usprawnieniu %(brand)s.",
+ "Feedback sent": "Wysłano informacje zwrotne",
+ "Send feedback": "Wyślij informacje zwrotne",
+ "Feedback": "Informacje zwrotne",
+ "You have no visible notifications in this room.": "Nie masz widocznych powiadomień w tym pokoju.",
+ "%(creator)s created this DM.": "%(creator)s utworzył(a) tę wiadomość bezpośrednią.",
+ "You do not have permission to create rooms in this community.": "Nie masz uprawnień do tworzenia pokojów w tej społeczności.",
+ "Cannot create rooms in this community": "Nie można utworzyć pokojów w tej społeczności",
+ "Liberate your communication": "Uwolnij swoją komunikację",
+ "Welcome to %(appName)s": "Witamy w %(appName)s",
+ "Now, let's help you get started": "Teraz pomożemy Ci zacząć",
+ "Welcome %(name)s": "Witaj, %(name)s",
+ "Israel": "Izrael",
+ "Isle of Man": "Man",
+ "Ireland": "Irlandia",
+ "Iraq": "Irak",
+ "Iran": "Iran",
+ "Indonesia": "Indonezja",
+ "India": "Indie",
+ "Iceland": "Islandia",
+ "Hungary": "Węgry",
+ "Hong Kong": "Hong Kong",
+ "Honduras": "Honduras",
+ "Heard & McDonald Islands": "Wyspy Heard i McDonald",
+ "Haiti": "Haiti",
+ "Guyana": "Gujana",
+ "Guinea-Bissau": "Gwinea Bissau",
+ "Guinea": "Gwinea",
+ "Guernsey": "Guernsey",
+ "Guatemala": "Gwatemala",
+ "Guam": "Guam",
+ "Guadeloupe": "Gwadelupa",
+ "Grenada": "Grenada",
+ "Greenland": "Grenlandia",
+ "Greece": "Grecja",
+ "Gibraltar": "Gibraltar",
+ "Ghana": "Ghana",
+ "Germany": "Niemcy",
+ "Georgia": "Gruzja",
+ "Gambia": "Gambia",
+ "Gabon": "Gabon",
+ "French Southern Territories": "Francuskie Terytoria Południowe i Antarktyczne",
+ "French Polynesia": "Polinezja Francuska",
+ "French Guiana": "Gujana Francuska",
+ "France": "Francja",
+ "Finland": "Finlandia",
+ "Fiji": "Fidżi",
+ "Faroe Islands": "Wyspy Owcze",
+ "Falkland Islands": "Falklandy",
+ "Ethiopia": "Etiopia",
+ "Estonia": "Estonia",
+ "Eritrea": "Erytrea",
+ "Equatorial Guinea": "Gwinea Równikowa",
+ "El Salvador": "Salwador",
+ "Egypt": "Egipt",
+ "Ecuador": "Ekwador",
+ "Dominican Republic": "Dominikana",
+ "Dominica": "Dominika",
+ "Djibouti": "Dżibuti",
+ "Denmark": "Dania",
+ "Côte d’Ivoire": "Wybrzeże Kości Słoniowej",
+ "Czech Republic": "Czechy",
+ "Cyprus": "Cypr",
+ "Curaçao": "Curaçao",
+ "Cuba": "Kuba",
+ "Croatia": "Chorwacja",
+ "Costa Rica": "Kostaryka",
+ "Cook Islands": "Wyspy Cooka",
+ "Congo - Kinshasa": "Kinszasa",
+ "Congo - Brazzaville": "Kongo",
+ "Comoros": "Komory",
+ "Colombia": "Kolumbia",
+ "Cocos (Keeling) Islands": "Wyspy Kokosowe",
+ "Christmas Island": "Wyspa Bożego Narodzenia",
+ "China": "Chiny",
+ "Chile": "Chile",
+ "Chad": "Czad",
+ "Central African Republic": "Republika Środkowoafrykańska",
+ "Cayman Islands": "Kajmany",
+ "Caribbean Netherlands": "Holandia Karaibska",
+ "Cape Verde": "Republika Zielonego Przylądka",
+ "Canada": "Kanada",
+ "Cameroon": "Kamerun",
+ "Cambodia": "Kambodża",
+ "Burundi": "Burundi",
+ "Burkina Faso": "Burkina Faso",
+ "Bulgaria": "Bułgaria",
+ "Brunei": "Brunei",
+ "British Virgin Islands": "Brytyjskie Wyspy Dziewicze",
+ "British Indian Ocean Territory": "Brytyjskie Terytorium Oceanu Indyjskiego",
+ "Brazil": "Brazylia",
+ "Bouvet Island": "Wyspa Bouveta",
+ "Botswana": "Botswana",
+ "Bosnia": "Bośnia",
+ "Bolivia": "Boliwia",
+ "Bhutan": "Bhutan",
+ "Bermuda": "Bermudy",
+ "Benin": "Benin",
+ "Belize": "Belize",
+ "Belgium": "Belgia",
+ "Belarus": "Białoruś",
+ "Barbados": "Barbados",
+ "Bangladesh": "Bangladesz",
+ "Bahrain": "Bahrajn",
+ "Bahamas": "Bahamy",
+ "Azerbaijan": "Azerbejdżan",
+ "Austria": "Austria",
+ "Australia": "Australia",
+ "Aruba": "Aruba",
+ "Armenia": "Armenia",
+ "Argentina": "Argentyna",
+ "Antigua & Barbuda": "Antigua i Barbuda",
+ "Antarctica": "Antarktyda",
+ "Anguilla": "Anguilla",
+ "Angola": "Angola",
+ "Andorra": "Andora",
+ "American Samoa": "Samoa Amerykańskie",
+ "Algeria": "Algeria",
+ "Albania": "Albania",
+ "Åland Islands": "Wyspy Alandzkie",
+ "Afghanistan": "Afganistan",
+ "United States": "Stany Zjednoczone",
+ "United Kingdom": "Wielka Brytania",
+ "Marshall Islands": "Wyspy Marshalla",
+ "Malta": "Malta",
+ "Mali": "Mali",
+ "Maldives": "Malediwy",
+ "Malaysia": "Malezja",
+ "Malawi": "Malawi",
+ "Madagascar": "Madagaskar",
+ "Macedonia": "Macedonia",
+ "Macau": "Makau",
+ "Luxembourg": "Luksemburg",
+ "Lithuania": "Litwa",
+ "Liechtenstein": "Liechtenstein",
+ "Libya": "Libia",
+ "Liberia": "Liberia",
+ "Lesotho": "Lesotho",
+ "Lebanon": "Liban",
+ "Latvia": "Łotwa",
+ "Laos": "Laos",
+ "Kyrgyzstan": "Kirgistan",
+ "Kuwait": "Kuwejt",
+ "Kosovo": "Kosowo",
+ "Kiribati": "Kiribati",
+ "Kenya": "Kenia",
+ "Kazakhstan": "Kazachstan",
+ "Jordan": "Jordania",
+ "Jersey": "Jersey",
+ "User rules": "Zasady użytkownika",
+ "Server rules": "Zasady serwera",
+ "not found": "nie znaleziono",
+ "Decline (%(counter)s)": "Odrzuć (%(counter)s)",
+ "Starting backup...": "Rozpoczynanie kopii zapasowej…",
+ "User Autocomplete": "Autouzupełnianie użytkowników",
+ "Community Autocomplete": "Autouzupełnianie społeczności",
+ "Room Autocomplete": "Autouzupełnianie pokojów",
+ "Notification Autocomplete": "Autouzupełnianie powiadomień",
+ "Emoji Autocomplete": "Autouzupełnianie emoji",
+ "Phone (optional)": "Telefon (opcjonalny)",
+ "Upload Error": "Błąd wysyłania",
+ "GitHub issue": "Błąd na GitHubie",
+ "Close dialog": "Zamknij okno dialogowe",
+ "Show all": "Zobacz wszystko",
+ "Deactivate user": "Dezaktywuj użytkownika",
+ "Deactivate user?": "Dezaktywować użytkownika?",
+ "Revoke invite": "Wygaś zaproszenie",
+ "Code block": "Blok kodu",
+ "Ban users": "Zablokuj użytkowników",
+ "Kick users": "Wyrzuć użytkowników",
+ "Syncing...": "Synchronizacja…",
+ "General failure": "Ogólny błąd",
+ "Removing…": "Usuwanie…",
+ "Premium": "Premium",
+ "Cancelling…": "Anulowanie…",
+ "Algorithm:": "Algorytm:",
+ "Bulk options": "Masowe działania",
+ "Modern": "Współczesny",
+ "Compact": "Kompaktowy",
+ "Approve": "Zatwierdź",
+ "Incompatible Database": "Niekompatybilna baza danych",
+ "Show": "Pokaż",
+ "Information": "Informacje",
+ "Categories": "Kategorie",
+ "Reactions": "Reakcje",
+ "Role": "Rola",
+ "Trusted": "Zaufane",
+ "Accepting…": "Akceptowanie…",
+ "Re-join": "Dołącz ponownie",
+ "Unencrypted": "Nieszyfrowane",
+ "Revoke": "Unieważnij",
+ "Encrypted": "Szyfrowane",
+ "Unsubscribe": "Odsubskrybuj",
+ "None": "Brak",
+ "exists": "istnieje",
+ "Change the topic of this room": "Zmień temat tego pokoju",
+ "Change which room you're viewing": "Zmień pokój który przeglądasz",
+ "Send stickers into your active room": "Wyślij naklejki w swoim aktywnym pokoju",
+ "Send stickers into this room": "Wyślij naklejki w tym pokoju",
+ "Zimbabwe": "Zimbabwe",
+ "Zambia": "Zambia",
+ "Yemen": "Jemen",
+ "Western Sahara": "Sahara Zachodnia",
+ "Wallis & Futuna": "Wallis i Futuna",
+ "Vietnam": "Wietnam",
+ "Venezuela": "Wenezuela",
+ "Vatican City": "Watykan",
+ "Vanuatu": "Vanuatu",
+ "Uzbekistan": "Uzbekistan",
+ "Uruguay": "Urugwaj",
+ "United Arab Emirates": "Zjednoczone Emiraty Arabskie",
+ "Ukraine": "Ukraina",
+ "Uganda": "Uganda",
+ "U.S. Virgin Islands": "Wyspy Dziewicze Stanów Zjednoczonych",
+ "Tuvalu": "Tuvalu",
+ "Turks & Caicos Islands": "Turks i Caicos",
+ "Turkmenistan": "Turkmenistan",
+ "Turkey": "Turcja",
+ "Tunisia": "Tunezja",
+ "Trinidad & Tobago": "Trynidad i Tobago",
+ "Tonga": "Tonga",
+ "Tokelau": "Tokelau",
+ "Togo": "Togo",
+ "Timor-Leste": "Timor Wschodni",
+ "Thailand": "Tajlandia",
+ "Tanzania": "Tanzania",
+ "Tajikistan": "Tadżykistan",
+ "Taiwan": "Tajwan",
+ "São Tomé & Príncipe": "Wyspy Świętego Tomasza i Książęca",
+ "Syria": "Syria",
+ "Switzerland": "Szwajcaria",
+ "Sweden": "Szwecja",
+ "Swaziland": "Eswatini",
+ "Svalbard & Jan Mayen": "Svalbard i Jan Mayen",
+ "Suriname": "Surinam",
+ "Sudan": "Sudan",
+ "St. Vincent & Grenadines": "Saint Vincent i Grenadyny",
+ "St. Pierre & Miquelon": "Saint-Pierre i Miquelon",
+ "St. Martin": "Sint Maarten",
+ "St. Lucia": "Saint Lucia",
+ "St. Kitts & Nevis": "Saint Kitts & Nevis",
+ "St. Helena": "Święta Helena",
+ "St. Barthélemy": "Wspólnota Saint-Barthélemy",
+ "Sri Lanka": "Sri Lanka",
+ "Spain": "Hiszpania",
+ "South Sudan": "Sudan Południowy",
+ "South Korea": "Korea Południowa",
+ "South Georgia & South Sandwich Islands": "Georgia Południowa i Sandwich Południowy",
+ "South Africa": "Republika Południowej Afryki",
+ "Somalia": "Somalia",
+ "Solomon Islands": "Wyspy Salomona",
+ "Slovenia": "Słowenia",
+ "Slovakia": "Słowacja",
+ "Sint Maarten": "Sint Maarten",
+ "Singapore": "Singapur",
+ "Sierra Leone": "Sierra Leone",
+ "Seychelles": "Seszele",
+ "Serbia": "Serbia",
+ "Senegal": "Senegal",
+ "Saudi Arabia": "Arabia Saudyjska",
+ "San Marino": "San Marino",
+ "Samoa": "Samoa",
+ "Réunion": "Reunion",
+ "Rwanda": "Rwanda",
+ "Russia": "Rosja",
+ "Romania": "Rumunia",
+ "Qatar": "Katar",
+ "Puerto Rico": "Portoryko",
+ "Portugal": "Portugalia",
+ "Poland": "Polska",
+ "Pitcairn Islands": "Pitcairn",
+ "Philippines": "Filipiny",
+ "Peru": "Peru",
+ "Paraguay": "Paragwaj",
+ "Papua New Guinea": "Papua Nowa Gwinea",
+ "Panama": "Panama",
+ "Palestine": "Palestyna",
+ "Palau": "Palau",
+ "Pakistan": "Pakistan",
+ "Oman": "Oman",
+ "Norway": "Norwegia",
+ "Northern Mariana Islands": "Mariany Północne",
+ "North Korea": "Korea Północna",
+ "Norfolk Island": "Norfolk",
+ "Niue": "Niue",
+ "Nigeria": "Nigeria",
+ "Niger": "Niger",
+ "Nicaragua": "Nikaragua",
+ "New Zealand": "Nowa Zelandia",
+ "New Caledonia": "Nowa Kaledonia",
+ "Netherlands": "Holandia",
+ "Nepal": "Nepal",
+ "Nauru": "Nauru",
+ "Namibia": "Namibia",
+ "Myanmar": "Mjanma",
+ "Mozambique": "Mozambik",
+ "Morocco": "Maroko",
+ "Montserrat": "Montserrat",
+ "Montenegro": "Czarnogóra",
+ "Mongolia": "Mongolia",
+ "Monaco": "Monako",
+ "Moldova": "Mołdawia",
+ "Micronesia": "Mikronezja",
+ "Mexico": "Meksyk",
+ "Mayotte": "Majotta",
+ "Mauritius": "Mauritius",
+ "Mauritania": "Mauretania",
+ "Martinique": "Martynika"
}
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index aa4bfc41ca..b456c98aed 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -501,7 +501,7 @@
"Visibility in Room List": "Visibilidade na lista de salas",
"Visible to everyone": "Visível para todos",
"Only visible to community members": "Apenas visível para participantes da comunidade",
- "Filter community rooms": "Filtrar salas da comunidade",
+ "Filter community rooms": "Pesquisar salas da comunidade",
"Something went wrong when trying to get your communities.": "Não foi possível carregar suas comunidades.",
"Display your community flair in rooms configured to show it.": "Mostrar o ícone da sua comunidade nas salas que o permitem.",
"You're not currently a member of any communities.": "No momento, você não é participante de nenhuma comunidade.",
@@ -2772,5 +2772,136 @@
"Uzbekistan": "Uzbequistão",
"Role": "Função",
"Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s sala.",
- "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas."
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas.",
+ "Filter": "Pesquisar",
+ "Start a new chat": "Iniciar uma nova conversa",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s sala.",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s salas.",
+ "Filter rooms and people": "Pesquisar salas e pessoas",
+ "Open the link in the email to continue registration.": "Abra o link no e-mail para continuar o registro.",
+ "A confirmation email has been sent to %(emailAddress)s": "Um e-mail de confirmação foi enviado para %(emailAddress)s",
+ "Go to Home View": "Ir para a tela inicial",
+ "create a new issue on GitHub so that we can investigate this bug.": "Пожалуйста, создайте новую проблему/вопрос на GitHub, чтобы мы могли расследовать эту ошибку.",
- "Use an identity server to invite by email. Use the default (%(defaultIdentityServerName)s) or manage in Settings .": "Используйте идентификационный сервер для приглашения по электронной почте. Используйте значение по умолчанию (%(defaultIdentityServerName)s) или управляйте в Настройках .",
+ "Use an identity server to invite by email. Use the default (%(defaultIdentityServerName)s) or manage in Settings .": "Используйте идентификационный сервер для приглашения по электронной почте. Используйте значение по умолчанию (%(defaultIdentityServerName)s) или управляйте в Настройках .",
"Use an identity server to invite by email. Manage in Settings .": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в Настройки .",
"Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
"Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
@@ -2191,8 +2191,8 @@
"There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Произошла ошибка при обновлении альтернативных адресов комнаты. Это может быть запрещено сервером или произошел временный сбой.",
"There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "При создании этого адреса произошла ошибка. Это может быть запрещено сервером или произошел временный сбой.",
"There was an error removing that address. It may no longer exist or a temporary error occurred.": "Произошла ошибка при удалении этого адреса. Возможно, он больше не существует или произошла временная ошибка.",
- "Using this widget may share data ;
+
interface IRoomWidgets {
widgets: IApp[];
- pinned: Record;
+ pinned: PinnedWidgets;
}
export const MAX_PINNED = 3;
+function widgetUid(app: IApp): string {
+ return `${app.roomId ?? MatrixClientPeg.get().getUserId()}::${app.id}`;
+}
+
// TODO consolidate WidgetEchoStore into this
// TODO consolidate ActiveWidgetStore into this
export default class WidgetStore extends AsyncStoreWithClient {
private static internalInstance = new WidgetStore();
- private widgetMap = new Map();
- private roomMap = new Map();
+ private widgetMap = new Map(); // Key is widget Unique ID (UID)
+ private roomMap = new Map(); // Key is room ID
private constructor() {
super(defaultDispatcher, {});
@@ -126,13 +134,21 @@ export default class WidgetStore extends AsyncStoreWithClient {
// first clean out old widgets from the map which originate from this room
// otherwise we are out of sync with the rest of the app with stale widget events during removal
Array.from(this.widgetMap.values()).forEach(app => {
- if (app.roomId === room.roomId) {
- this.widgetMap.delete(app.id);
- }
+ if (app.roomId !== room.roomId) return; // skip - wrong room
+ this.widgetMap.delete(widgetUid(app));
});
this.generateApps(room).forEach(app => {
- this.widgetMap.set(app.id, app);
+ // Sanity check for https://github.com/vector-im/element-web/issues/15705
+ const existingApp = this.widgetMap.get(widgetUid(app));
+ if (existingApp) {
+ console.warn(
+ `Possible widget ID conflict for ${app.id} - wants to store in room ${app.roomId} ` +
+ `but is currently stored as ${existingApp.roomId} - letting the want win`,
+ );
+ }
+
+ this.widgetMap.set(widgetUid(app), app);
roomInfo.widgets.push(app);
});
this.emit(room.roomId);
@@ -146,61 +162,68 @@ export default class WidgetStore extends AsyncStoreWithClient {
this.emit(UPDATE_EVENT);
};
- public getRoomId = (widgetId: string) => {
- const app = this.widgetMap.get(widgetId);
- if (!app) return null;
- return app.roomId;
- }
-
public getRoom = (roomId: string) => {
return this.roomMap.get(roomId);
};
private onPinnedWidgetsChange = (settingName: string, roomId: string) => {
this.initRoom(roomId);
- this.getRoom(roomId).pinned = SettingsStore.getValue(settingName, roomId);
+
+ const pinned: PinnedWidgets = SettingsStore.getValue(settingName, roomId);
+
+ // Sanity check for https://github.com/vector-im/element-web/issues/15705
+ const roomInfo = this.getRoom(roomId);
+ const remappedPinned: PinnedWidgets = {};
+ for (const widgetId of Object.keys(pinned)) {
+ const isPinned = pinned[widgetId];
+ if (!roomInfo.widgets?.some(w => w.id === widgetId)) {
+ console.warn(`Skipping pinned widget update for ${widgetId} in ${roomId} -- wrong room`);
+ } else {
+ remappedPinned[widgetId] = isPinned;
+ }
+ }
+ roomInfo.pinned = remappedPinned;
+
this.emit(roomId);
this.emit(UPDATE_EVENT);
};
- public isPinned(widgetId: string) {
- const roomId = this.getRoomId(widgetId);
+ public isPinned(roomId: string, widgetId: string) {
return !!this.getPinnedApps(roomId).find(w => w.id === widgetId);
}
- public canPin(widgetId: string) {
- const roomId = this.getRoomId(widgetId);
+ // dev note: we don't need the widgetId on this function, but the contract makes more sense
+ // when we require it.
+ public canPin(roomId: string, widgetId: string) {
return this.getPinnedApps(roomId).length < MAX_PINNED;
}
- public pinWidget(widgetId: string) {
- const roomId = this.getRoomId(widgetId);
+ public pinWidget(roomId: string, widgetId: string) {
const roomInfo = this.getRoom(roomId);
if (!roomInfo) return;
// When pinning, first confirm all the widgets (Jitsi) which were autopinned so that the order is correct
const autoPinned = this.getPinnedApps(roomId).filter(app => !roomInfo.pinned[app.id]);
autoPinned.forEach(app => {
- this.setPinned(app.id, true);
+ this.setPinned(roomId, app.id, true);
});
- this.setPinned(widgetId, true);
+ this.setPinned(roomId, widgetId, true);
// Show the apps drawer upon the user pinning a widget
- if (RoomViewStore.getRoomId() === this.getRoomId(widgetId)) {
+ if (RoomViewStore.getRoomId() === roomId) {
defaultDispatcher.dispatch({
action: "appsDrawer",
show: true,
- })
+ });
}
}
- public unpinWidget(widgetId: string) {
- this.setPinned(widgetId, false);
+ public unpinWidget(roomId: string, widgetId: string) {
+ this.setPinned(roomId, widgetId, false);
}
- private setPinned(widgetId: string, value: boolean) {
- const roomId = this.getRoomId(widgetId);
+ private setPinned(roomId: string, widgetId: string, value: boolean) {
const roomInfo = this.getRoom(roomId);
if (!roomInfo) return;
if (roomInfo.pinned[widgetId] === false && value) {
@@ -211,7 +234,7 @@ export default class WidgetStore extends AsyncStoreWithClient {
// Clean up the pinned record
Object.keys(roomInfo).forEach(wId => {
- if (!roomInfo.widgets.some(w => w.id === wId)) {
+ if (!roomInfo.widgets.some(w => w.id === wId) || !roomInfo.pinned[wId]) {
delete roomInfo.pinned[wId];
}
});
@@ -221,9 +244,8 @@ export default class WidgetStore extends AsyncStoreWithClient {
this.emit(UPDATE_EVENT);
}
- public movePinnedWidget(widgetId: string, delta: 1 | -1) {
+ public movePinnedWidget(roomId: string, widgetId: string, delta: 1 | -1) {
// TODO simplify this by changing the storage medium of pinned to an array once the Jitsi default-on goes away
- const roomId = this.getRoomId(widgetId);
const roomInfo = this.getRoom(roomId);
if (!roomInfo || roomInfo.pinned[widgetId] === false) return;
@@ -264,12 +286,33 @@ export default class WidgetStore extends AsyncStoreWithClient {
});
const order = Object.keys(roomInfo.pinned).filter(k => roomInfo.pinned[k]);
- let apps = order.map(wId => this.widgetMap.get(wId)).filter(Boolean);
- apps = apps.slice(0, priorityWidget ? MAX_PINNED - 1 : MAX_PINNED);
+ const apps = order
+ .map(wId => Array.from(this.widgetMap.values())
+ .find(w2 => w2.roomId === roomId && w2.id === wId))
+ .filter(Boolean)
+ .slice(0, priorityWidget ? MAX_PINNED - 1 : MAX_PINNED);
if (priorityWidget) {
apps.push(priorityWidget);
}
+ // Sanity check for https://github.com/vector-im/element-web/issues/15705
+ // We union the app IDs the above generated with the roomInfo's known widgets to
+ // get a list of IDs which both exist. We then diff that against the generated app
+ // IDs above to ensure that all of the app IDs are captured by the union with the
+ // room - if we grabbed a widget that wasn't part of the roomInfo's list, it wouldn't
+ // be in the union and thus result in a diff.
+ const appIds = apps.map(a => widgetUid(a));
+ const roomAppIds = roomInfo.widgets.map(a => widgetUid(a));
+ const roomAppIdsUnion = arrayUnion(appIds, roomAppIds);
+ const missingSomeApps = arrayHasDiff(roomAppIdsUnion, appIds);
+ if (missingSomeApps) {
+ const diff = arrayDiff(roomAppIdsUnion, appIds);
+ console.warn(
+ `${roomId} appears to have a conflict for which widgets belong to it. ` +
+ `Widget UIDs are: `, [...diff.added, ...diff.removed],
+ );
+ }
+
return apps;
}
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 0f3138fe9e..b2fe630760 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -34,6 +34,7 @@ import { MarkedExecution } from "../../utils/MarkedExecution";
import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
import { NameFilterCondition } from "./filters/NameFilterCondition";
import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
+import { VisibilityProvider } from "./filters/VisibilityProvider";
interface IState {
tagsEnabled?: boolean;
@@ -401,6 +402,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient {
}
private async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise {
+ if (!VisibilityProvider.instance.isRoomVisible(room)) {
+ return; // don't do anything on rooms that aren't visible
+ }
+
const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
if (shouldUpdate) {
if (SettingsStore.getValue("advancedRoomListLogging")) {
@@ -544,7 +549,8 @@ export class RoomListStoreClass extends AsyncStoreWithClient {
public async regenerateAllLists({trigger = true}) {
console.warn("Regenerating all room lists");
- const rooms = this.matrixClient.getVisibleRooms();
+ const rooms = this.matrixClient.getVisibleRooms()
+ .filter(r => VisibilityProvider.instance.isRoomVisible(r));
const customTags = new Set();
if (this.state.tagsEnabled) {
for (const room of rooms) {
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 439141edb4..25059aabe7 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -34,6 +34,7 @@ import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } f
import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
import { getListAlgorithmInstance } from "./list-ordering";
import SettingsStore from "../../../settings/SettingsStore";
+import { VisibilityProvider } from "../filters/VisibilityProvider";
/**
* Fired when the Algorithm has determined a list has been updated.
@@ -188,6 +189,10 @@ export class Algorithm extends EventEmitter {
// Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
// otherwise we risk duplicating rooms.
+ if (val && !VisibilityProvider.instance.isRoomVisible(val)) {
+ val = null; // the room isn't visible - lie to the rest of this function
+ }
+
// Set the last sticky room to indicate that we're in a change. The code throughout the
// class can safely handle a null room, so this should be safe to do as a backup.
this._lastStickyRoom = this._stickyRoom || {};
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
new file mode 100644
index 0000000000..553dd33ce0
--- /dev/null
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {Room} from "matrix-js-sdk/src/models/room";
+import { RoomListCustomisations } from "../../../customisations/RoomList";
+
+export class VisibilityProvider {
+ private static internalInstance: VisibilityProvider;
+
+ private constructor() {
+ }
+
+ public static get instance(): VisibilityProvider {
+ if (!VisibilityProvider.internalInstance) {
+ VisibilityProvider.internalInstance = new VisibilityProvider();
+ }
+ return VisibilityProvider.internalInstance;
+ }
+
+ public isRoomVisible(room: Room): boolean {
+ /* eslint-disable prefer-const */
+ let isVisible = true; // Returned at the end of this function
+ let forced = false; // When true, this function won't bother calling the customisation points
+ /* eslint-enable prefer-const */
+
+ // ------
+ // TODO: The `if` statements to control visibility of custom room types
+ // would go here. The remainder of this function assumes that the statements
+ // will be here.
+ //
+ // When removing this comment block, please remove the lint disable lines in the area.
+ // ------
+
+ const isVisibleFn = RoomListCustomisations.isRoomVisible;
+ if (!forced && isVisibleFn) {
+ isVisible = isVisibleFn(room);
+ }
+
+ return isVisible;
+ }
+}
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index 60988040d3..2d2d1fcbdb 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -40,6 +40,9 @@ import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermi
import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
import { WidgetType } from "../../widgets/WidgetType";
import { EventType } from "matrix-js-sdk/src/@types/event";
+import { CHAT_EFFECTS } from "../../effects";
+import { containsEmoji } from "../../effects/utils";
+import dis from "../../dispatcher/dispatcher";
// TODO: Purge this from the universe
@@ -123,6 +126,14 @@ export class StopGapWidgetDriver extends WidgetDriver {
} else {
// message event
r = await client.sendEvent(roomId, eventType, content);
+
+ if (eventType === EventType.RoomMessage) {
+ CHAT_EFFECTS.forEach((effect) => {
+ if (containsEmoji(content, effect.emojis)) {
+ dis.dispatch({action: `effects.${effect.command}`});
+ }
+ });
+ }
}
return {roomId, eventId: r.event_id};
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 94aa0c3544..18b6451d3e 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -34,6 +34,8 @@ export class ValidatedServerConfig {
isUrl: string;
isDefault: boolean;
+ // when the server config is based on static URLs the hsName is not resolvable and things may wish to use hsUrl
+ isNameResolvable: boolean;
warning: string;
}
@@ -161,7 +163,7 @@ export default class AutoDiscoveryUtils {
const url = new URL(homeserverUrl);
const serverName = url.hostname;
- return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result, syntaxOnly);
+ return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result, syntaxOnly, true);
}
/**
@@ -179,12 +181,12 @@ export default class AutoDiscoveryUtils {
* input.
* @param {string} serverName The domain name the AutoDiscovery result is for.
* @param {*} discoveryResult The AutoDiscovery result.
- * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will
- * not be raised.
+ * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will not be raised.
+ * @param {boolean} isSynthetic If true, then the discoveryResult was synthesised locally.
* @returns {Promise} Resolves to the validated configuration.
*/
static buildValidatedConfigFromDiscovery(
- serverName: string, discoveryResult, syntaxOnly=false): ValidatedServerConfig {
+ serverName: string, discoveryResult, syntaxOnly=false, isSynthetic=false): ValidatedServerConfig {
if (!discoveryResult || !discoveryResult["m.homeserver"]) {
// This shouldn't happen without major misconfiguration, so we'll log a bit of information
// in the log so we can find this bit of codee but otherwise tell teh user "it broke".
@@ -252,6 +254,7 @@ export default class AutoDiscoveryUtils {
isUrl: preferredIdentityUrl,
isDefault: false,
warning: hsResult.error,
+ isNameResolvable: !isSynthetic,
});
}
}
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index e29b6d9b0e..c90281bacf 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -190,3 +190,79 @@ export function trackStores(client) {
export function setCryptoInitialised(cryptoInited) {
localStorage.setItem("mx_crypto_initialised", cryptoInited);
}
+
+/* Simple wrapper functions around IndexedDB.
+ */
+
+let idb = null;
+
+async function idbInit(): Promise {
+ if (!indexedDB) {
+ throw new Error("IndexedDB not available");
+ }
+ idb = await new Promise((resolve, reject) => {
+ const request = indexedDB.open("matrix-react-sdk", 1);
+ request.onerror = reject;
+ request.onsuccess = (event) => { resolve(request.result); };
+ request.onupgradeneeded = (event) => {
+ const db = request.result;
+ db.createObjectStore("pickleKey");
+ db.createObjectStore("account");
+ };
+ });
+}
+
+export async function idbLoad(
+ table: string,
+ key: string | string[],
+): Promise {
+ if (!idb) {
+ await idbInit();
+ }
+ return new Promise((resolve, reject) => {
+ const txn = idb.transaction([table], "readonly");
+ txn.onerror = reject;
+
+ const objectStore = txn.objectStore(table);
+ const request = objectStore.get(key);
+ request.onerror = reject;
+ request.onsuccess = (event) => { resolve(request.result); };
+ });
+}
+
+export async function idbSave(
+ table: string,
+ key: string | string[],
+ data: any,
+): Promise {
+ if (!idb) {
+ await idbInit();
+ }
+ return new Promise((resolve, reject) => {
+ const txn = idb.transaction([table], "readwrite");
+ txn.onerror = reject;
+
+ const objectStore = txn.objectStore(table);
+ const request = objectStore.put(data, key);
+ request.onerror = reject;
+ request.onsuccess = (event) => { resolve(); };
+ });
+}
+
+export async function idbDelete(
+ table: string,
+ key: string | string[],
+): Promise {
+ if (!idb) {
+ await idbInit();
+ }
+ return new Promise((resolve, reject) => {
+ const txn = idb.transaction([table], "readwrite");
+ txn.onerror = reject;
+
+ const objectStore = txn.objectStore(table);
+ const request = objectStore.delete(key);
+ request.onerror = reject;
+ request.onsuccess = (event) => { resolve(); };
+ });
+}
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index 696bd57880..80f04dfe76 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -140,6 +140,6 @@ export async function leaveRoomBehaviour(roomId: string) {
}
if (RoomViewStore.getRoomId() === roomId) {
- dis.dispatch({action: 'view_next_room'});
+ dis.dispatch({action: 'view_home_page'});
}
}
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 0f54bcce05..39c5776852 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -129,6 +129,17 @@ export class RoomPermalinkCreator {
return getPermalinkConstructor().forEvent(this._roomId, eventId, this._serverCandidates);
}
+ forShareableRoom() {
+ if (this._room) {
+ // Prefer to use canonical alias for permalink if possible
+ const alias = this._room.getCanonicalAlias();
+ if (alias) {
+ return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
+ }
+ }
+ return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
+ }
+
forRoom() {
return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
}
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 7ca210ff93..9b73137936 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -52,7 +52,7 @@ describe('Login', function() {
// Set non-empty flows & matrixClient to get past the loading spinner
root.setState({
- currentFlow: "m.login.password",
+ flows: [{ type: "m.login.password" }],
});
const form = ReactTestUtils.findRenderedComponentWithType(
@@ -61,10 +61,7 @@ describe('Login', function() {
);
expect(form).toBeTruthy();
- const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(
- root,
- 'mx_AuthBody_editServerDetails',
- );
+ const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_ServerPicker_change');
expect(changeServerLink).toBeTruthy();
});
@@ -77,7 +74,7 @@ describe('Login', function() {
// Set non-empty flows & matrixClient to get past the loading spinner
root.setState({
- currentFlow: "m.login.password",
+ flows: [{ type: "m.login.password" }],
});
const form = ReactTestUtils.findRenderedComponentWithType(
@@ -86,10 +83,70 @@ describe('Login', function() {
);
expect(form).toBeTruthy();
- const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(
- root,
- 'mx_AuthBody_editServerDetails',
- );
+ const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, 'mx_ServerPicker_change');
expect(changeServerLinks).toHaveLength(0);
});
+
+ it("should show SSO button if that flow is available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{ type: "m.login.sso" }],
+ });
+
+ const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+ expect(ssoButton).toBeTruthy();
+ });
+
+ it("should show both SSO button and username+password if both are available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }],
+ });
+
+ const form = ReactTestUtils.findRenderedComponentWithType(root, sdk.getComponent('auth.PasswordLogin'));
+ expect(form).toBeTruthy();
+
+ const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+ expect(ssoButton).toBeTruthy();
+ });
+
+ it("should show multiple SSO buttons if multiple identity_providers are available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{
+ "type": "m.login.sso",
+ "org.matrix.msc2858.identity_providers": [{
+ id: "a",
+ name: "Provider 1",
+ }, {
+ id: "b",
+ name: "Provider 2",
+ }, {
+ id: "c",
+ name: "Provider 3",
+ }],
+ }],
+ });
+
+ const ssoButtons = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, "mx_SSOButton");
+ expect(ssoButtons.length).toBe(3);
+ });
});
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index bf26763a79..3e8e887329 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -48,12 +48,9 @@ describe('Registration', function() {
/>, parentDiv);
}
- it('should show server type selector', function() {
+ it('should show server picker', function() {
const root = render();
- const selector = ReactTestUtils.findRenderedComponentWithType(
- root,
- sdk.getComponent('auth.ServerTypeSelector'),
- );
+ const selector = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_ServerPicker");
expect(selector).toBeTruthy();
});
@@ -79,4 +76,27 @@ describe('Registration', function() {
);
expect(form).toBeTruthy();
});
+
+ it("should show SSO options if those are available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{
+ stages: [],
+ }],
+ ssoFlow: {
+ type: "m.login.sso",
+ },
+ matrixClient: {},
+ busy: false,
+ });
+
+ const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+ expect(ssoButton).toBeTruthy();
+ });
});
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.js
index 83a9388609..6eeac7ceea 100644
--- a/test/components/views/rooms/SendMessageComposer-test.js
+++ b/test/components/views/rooms/SendMessageComposer-test.js
@@ -18,8 +18,10 @@ import Adapter from "enzyme-adapter-react-16";
import { configure, mount } from "enzyme";
import React from "react";
import {act} from "react-dom/test-utils";
-
-import SendMessageComposer, {createMessageContent} from "../../../../src/components/views/rooms/SendMessageComposer";
+import SendMessageComposer, {
+ createMessageContent,
+ isQuickReaction,
+} from "../../../../src/components/views/rooms/SendMessageComposer";
import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
import EditorModel from "../../../../src/editor/model";
import {createPartCreator, createRenderer} from "../../../editor/mock";
@@ -227,6 +229,42 @@ describe('` don't use the Riot copy and static server provided by the tests, but use a running server like the Webpack watch server to run the tests against. Make sure to have the following local config:
- - `welcomeUserId` disabled as the tests assume there is no riot-bot currently.
+ - `--app-url ` don't use the Element Web copy and static server provided by the tests, but use a running server like the Webpack watch server to run the tests against.
- `--slow-mo` type at a human speed, useful with `--windowed`.
- `--throttle-cpu ` throttle cpu in the browser by the given factor. Useful to reproduce failures because of insufficient timeouts happening on the slower CI server.
- `--windowed` run the tests in an actual browser window Try to limit interacting with the windows while the tests are running. Hovering over the window tends to fail the tests, dragging the title bar should be fine though.
diff --git a/test/end-to-end-tests/Windows.md b/test/end-to-end-tests/Windows.md
index 39b06a9a62..f6ea87d0af 100644
--- a/test/end-to-end-tests/Windows.md
+++ b/test/end-to-end-tests/Windows.md
@@ -5,14 +5,14 @@ and start following these steps to get going:
1. Navigate to your working directory (`cd /mnt/c/users/travisr/whatever/matrix-react-sdk` for example).
2. Run `sudo apt-get install unzip python3 virtualenv dos2unix`
-3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/riot/*.sh`
+3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/element/*.sh`
4. Install NodeJS for ubuntu:
```bash
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
sudo apt-get update
sudo apt-get install nodejs
```
-5. Start Riot on Windows through `yarn start`
+5. Start Element on Windows through `yarn start`
6. While that builds... Run:
```bash
sudo apt-get install x11-apps
@@ -25,11 +25,11 @@ and start following these steps to get going:
cd ./test/end-to-end-tests
./synapse/install.sh
./install.sh
- ./run.sh --riot-url http://localhost:8080 --no-sandbox
+ ./run.sh --app-url http://localhost:8080 --no-sandbox
```
Note that using `yarn test:e2e` probably won't work for you. You might also have to use the config.json from the
-`riot/config-template` directory in order to actually succeed at the tests.
+`element/config-template` directory in order to actually succeed at the tests.
Also note that you'll have to use `--no-sandbox` otherwise Chrome will complain that there's no sandbox available. You
could probably fix this with enough effort, or you could run a headless Chrome in the WSL container without a sandbox.
diff --git a/test/end-to-end-tests/element/.gitignore b/test/end-to-end-tests/element/.gitignore
new file mode 100644
index 0000000000..57fac2072f
--- /dev/null
+++ b/test/end-to-end-tests/element/.gitignore
@@ -0,0 +1,2 @@
+element-web
+element.pid
diff --git a/test/end-to-end-tests/riot/config-template/config.json b/test/end-to-end-tests/element/config-template/config.json
similarity index 92%
rename from test/end-to-end-tests/riot/config-template/config.json
rename to test/end-to-end-tests/element/config-template/config.json
index b647d0bec8..b90fefc2cb 100644
--- a/test/end-to-end-tests/riot/config-template/config.json
+++ b/test/end-to-end-tests/element/config-template/config.json
@@ -8,7 +8,7 @@
"brand": "Element",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
- "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+ "bug_report_endpoint_url": "https://element.io/bugreports/submit",
"showLabsSettings": true,
"default_federate": true,
"welcomePageUrl": "home.html",
diff --git a/test/end-to-end-tests/riot/install-webserver.sh b/test/end-to-end-tests/element/install-webserver.sh
similarity index 100%
rename from test/end-to-end-tests/riot/install-webserver.sh
rename to test/end-to-end-tests/element/install-webserver.sh
diff --git a/test/end-to-end-tests/element/install.sh b/test/end-to-end-tests/element/install.sh
new file mode 100755
index 0000000000..e38f795df1
--- /dev/null
+++ b/test/end-to-end-tests/element/install.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+ELEMENT_BRANCH=develop
+
+if [ -d $BASE_DIR/element-web ]; then
+ echo "Element is already installed"
+ exit
+fi
+
+curl -L https://github.com/vector-im/element-web/archive/${ELEMENT_BRANCH}.zip --output element.zip
+unzip -q element.zip
+rm element.zip
+mv element-web-${ELEMENT_BRANCH} element-web
+cd element-web
+yarn install
+yarn run build
diff --git a/test/end-to-end-tests/riot/start.sh b/test/end-to-end-tests/element/start.sh
similarity index 87%
rename from test/end-to-end-tests/riot/start.sh
rename to test/end-to-end-tests/element/start.sh
index be226ed257..b344f91a19 100755
--- a/test/end-to-end-tests/riot/start.sh
+++ b/test/end-to-end-tests/element/start.sh
@@ -3,7 +3,7 @@ set -e
PORT=5000
BASE_DIR=$(cd $(dirname $0) && pwd)
-PIDFILE=$BASE_DIR/riot.pid
+PIDFILE=$BASE_DIR/element.pid
CONFIG_BACKUP=config.e2etests_backup.json
if [ -f $PIDFILE ]; then
@@ -11,8 +11,8 @@ if [ -f $PIDFILE ]; then
fi
cd $BASE_DIR/
-echo -n "starting riot on http://localhost:$PORT ... "
-pushd riot-web/webapp/ > /dev/null
+echo -n "Starting Element on http://localhost:$PORT ... "
+pushd element-web/webapp/ > /dev/null
# backup config file before we copy template
if [ -f config.json ]; then
@@ -34,7 +34,7 @@ LOGFILE=$(mktemp)
# NOT expected SIGTERM (128 + 15)
# from stop.sh?
if [ $RESULT -ne 143 ]; then
- echo "failed"
+ echo "Failed"
cat $LOGFILE
rm $PIDFILE 2> /dev/null
fi
@@ -49,6 +49,6 @@ sleep 0.5 &
wait -n; RESULT=$?
# return exit code of first child to exit
if [ $RESULT -eq 0 ]; then
- echo "running"
+ echo "Running"
fi
exit $RESULT
diff --git a/test/end-to-end-tests/riot/stop.sh b/test/end-to-end-tests/element/stop.sh
similarity index 79%
rename from test/end-to-end-tests/riot/stop.sh
rename to test/end-to-end-tests/element/stop.sh
index eb99fa11cc..e39f0077eb 100755
--- a/test/end-to-end-tests/riot/stop.sh
+++ b/test/end-to-end-tests/element/stop.sh
@@ -2,19 +2,19 @@
set -e
BASE_DIR=$(cd $(dirname $0) && pwd)
-PIDFILE=riot.pid
+PIDFILE=element.pid
CONFIG_BACKUP=config.e2etests_backup.json
cd $BASE_DIR
if [ -f $PIDFILE ]; then
- echo "stopping riot server ..."
+ echo "Stopping Element server ..."
PID=$(cat $PIDFILE)
rm $PIDFILE
kill $PID
# revert config file
- cd riot-web/webapp
+ cd element-web/webapp
rm config.json
if [ -f $CONFIG_BACKUP ]; then
mv $CONFIG_BACKUP config.json
diff --git a/test/end-to-end-tests/has_custom_riot.js b/test/end-to-end-tests/has-custom-app.js
similarity index 83%
rename from test/end-to-end-tests/has_custom_riot.js
rename to test/end-to-end-tests/has-custom-app.js
index 95f32d8ad0..00184088fd 100644
--- a/test/end-to-end-tests/has_custom_riot.js
+++ b/test/end-to-end-tests/has-custom-app.js
@@ -15,10 +15,10 @@ limitations under the License.
*/
// used from run.sh as getopts doesn't support long parameters
-const idx = process.argv.indexOf("--riot-url");
-let hasRiotUrl = false;
+const idx = process.argv.indexOf("--app-url");
+let hasAppUrl = false;
if (idx !== -1) {
const value = process.argv[idx + 1];
- hasRiotUrl = !!value;
+ hasAppUrl = !!value;
}
-process.stdout.write(hasRiotUrl ? "1" : "0" );
+process.stdout.write(hasAppUrl ? "1" : "0" );
diff --git a/test/end-to-end-tests/riot/.gitignore b/test/end-to-end-tests/riot/.gitignore
deleted file mode 100644
index 0f07d8e498..0000000000
--- a/test/end-to-end-tests/riot/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-riot-web
-riot.pid
\ No newline at end of file
diff --git a/test/end-to-end-tests/riot/install.sh b/test/end-to-end-tests/riot/install.sh
deleted file mode 100755
index f66ab3224e..0000000000
--- a/test/end-to-end-tests/riot/install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-RIOT_BRANCH=develop
-
-if [ -d $BASE_DIR/riot-web ]; then
- echo "riot is already installed"
- exit
-fi
-
-curl -L https://github.com/vector-im/riot-web/archive/${RIOT_BRANCH}.zip --output riot.zip
-unzip -q riot.zip
-rm riot.zip
-mv riot-web-${RIOT_BRANCH} riot-web
-cd riot-web
-yarn install
-yarn run build
diff --git a/test/end-to-end-tests/run.sh b/test/end-to-end-tests/run.sh
index b9d589eed9..4421bddc34 100755
--- a/test/end-to-end-tests/run.sh
+++ b/test/end-to-end-tests/run.sh
@@ -9,16 +9,16 @@ echo "Please first run $BASE_DIR/install.sh"
exit 1
fi
-has_custom_riot=$(node has_custom_riot.js $@)
+has_custom_app=$(node has-custom-app.js $@)
-if [ ! -d "riot/riot-web" ] && [ $has_custom_riot -ne "1" ]; then
- echo "Please provide an instance of riot to test against by passing --riot-url or running $BASE_DIR/riot/install.sh"
+if [ ! -d "element/element-web" ] && [ $has_custom_app -ne "1" ]; then
+ echo "Please provide an instance of Element to test against by passing --element-url or running $BASE_DIR/element/install.sh"
exit 1
fi
stop_servers() {
- if [ $has_custom_riot -ne "1" ]; then
- ./riot/stop.sh
+ if [ $has_custom_app -ne "1" ]; then
+ ./element/stop.sh
fi
./synapse/stop.sh
}
@@ -32,8 +32,8 @@ handle_error() {
trap 'handle_error' ERR
./synapse/start.sh
-if [ $has_custom_riot -ne "1" ]; then
- ./riot/start.sh
+if [ $has_custom_app -ne "1" ]; then
+ ./element/start.sh
fi
node start.js $@
stop_servers
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 907ee2fb8e..433baa5e48 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -22,12 +22,12 @@ const {delay} = require('./util');
const DEFAULT_TIMEOUT = 20000;
-module.exports = class RiotSession {
- constructor(browser, page, username, riotserver, hsUrl) {
+module.exports = class ElementSession {
+ constructor(browser, page, username, elementServer, hsUrl) {
this.browser = browser;
this.page = page;
this.hsUrl = hsUrl;
- this.riotserver = riotserver;
+ this.elementServer = elementServer;
this.username = username;
this.consoleLog = new LogBuffer(page, "console", (msg) => `${msg.text()}\n`);
this.networkLog = new LogBuffer(page, "requestfinished", async (req) => {
@@ -38,7 +38,7 @@ module.exports = class RiotSession {
this.log = new Logger(this.username);
}
- static async create(username, puppeteerOptions, riotserver, hsUrl, throttleCpuFactor = 1) {
+ static async create(username, puppeteerOptions, elementServer, hsUrl, throttleCpuFactor = 1) {
const browser = await puppeteer.launch(puppeteerOptions);
const page = await browser.newPage();
await page.setViewport({
@@ -50,7 +50,7 @@ module.exports = class RiotSession {
console.log("throttling cpu by a factor of", throttleCpuFactor);
await client.send('Emulation.setCPUThrottlingRate', { rate: throttleCpuFactor });
}
- return new RiotSession(browser, page, username, riotserver, hsUrl);
+ return new ElementSession(browser, page, username, elementServer, hsUrl);
}
async tryGetInnertext(selector) {
@@ -194,7 +194,7 @@ module.exports = class RiotSession {
}
url(path) {
- return this.riotserver + path;
+ return this.elementServer + path;
}
delay(ms) {
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ef8a259091..804cee9599 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -22,24 +22,12 @@ module.exports = async function signup(session, username, password, homeserver)
await session.goto(session.url('/#/register'));
// change the homeserver by clicking the advanced section
if (homeserver) {
- const advancedButton = await session.query('.mx_ServerTypeSelector_type_Advanced');
- await advancedButton.click();
+ const changeButton = await session.query('.mx_ServerPicker_change');
+ await changeButton.click();
- // depending on what HS is configured as the default, the advanced registration
- // goes the HS/IS entry directly (for matrix.org) or takes you to the user/pass entry (not matrix.org).
- // To work with both, we look for the "Change" link in the user/pass entry but don't fail when we can't find it
- // As this link should be visible immediately, and to not slow down the case where it isn't present,
- // pick a lower timeout of 5000ms
- try {
- const changeHsField = await session.query('.mx_AuthBody_editServerDetails', 5000);
- if (changeHsField) {
- await changeHsField.click();
- }
- } catch (err) {}
-
- const hsInputField = await session.query('#mx_ServerConfig_hsUrl');
+ const hsInputField = await session.query('.mx_ServerPickerDialog_otherHomeserver');
await session.replaceInputText(hsInputField, homeserver);
- const nextButton = await session.query('.mx_Login_submit');
+ const nextButton = await session.query('.mx_ServerPickerDialog_continue');
// accept homeserver
await nextButton.click();
}
@@ -68,7 +56,7 @@ module.exports = async function signup(session, username, password, homeserver)
await registerButton.click();
//confirm dialog saying you cant log back in without e-mail
- const continueButton = await session.query('.mx_QuestionDialog button.mx_Dialog_primary');
+ const continueButton = await session.query('.mx_RegistrationEmailPromptDialog button.mx_Dialog_primary');
await continueButton.click();
//find the privacy policy checkbox and check it
diff --git a/test/end-to-end-tests/start.js b/test/end-to-end-tests/start.js
index 6c80608903..234d60da9f 100644
--- a/test/end-to-end-tests/start.js
+++ b/test/end-to-end-tests/start.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-const RiotSession = require('./src/session');
+const ElementSession = require('./src/session');
const scenario = require('./src/scenario');
const RestSessionCreator = require('./src/rest/creator');
const fs = require("fs");
@@ -22,7 +22,7 @@ const fs = require("fs");
const program = require('commander');
program
.option('--no-logs', "don't output logs, document html on error", false)
- .option('--riot-url [url]', "riot url to test", "http://localhost:5000")
+ .option('--app-url [url]', "url to test", "http://localhost:5000")
.option('--windowed', "dont run tests headless", false)
.option('--slow-mo', "type at a human speed", false)
.option('--dev-tools', "open chrome devtools in browser window", false)
@@ -57,7 +57,7 @@ async function runTests() {
);
async function createSession(username) {
- const session = await RiotSession.create(username, options, program.riotUrl, hsUrl, program.throttleCpu);
+ const session = await ElementSession.create(username, options, program.appUrl, hsUrl, program.throttleCpu);
sessions.push(session);
return session;
}
diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index 536c017b9e..deb750666f 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -875,8 +875,8 @@ password_config:
# Enable sending emails for notification events
-# Defining a custom URL for Riot is only needed if email notifications
-# should contain links to a self-hosted installation of Riot; when set
+# Defining a custom URL for Element is only needed if email notifications
+# should contain links to a self-hosted installation of Element; when set
# the "app_name" setting is ignored.
#
# If your SMTP server requires authentication, the optional smtp_user &
@@ -897,7 +897,7 @@ email:
notif_template_html: notif_mail.html
notif_template_text: notif_mail.txt
notif_for_new_users: True
- riot_base_url: "http://localhost/riot"
+ client_base_url: "http://localhost/element"
#password_providers:
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index 72cd66cb69..0bd4466d97 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -34,6 +34,7 @@ function mockRoom(roomId, members, serverACL) {
return {
roomId,
+ getCanonicalAlias: () => roomId,
getJoinedMembers: () => members,
getMember: (userId) => members.find(m => m.userId === userId),
currentState: {
diff --git a/yarn.lock b/yarn.lock
index c06494d319..1a6a0b0fb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1256,10 +1256,10 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.11.2":
- version "7.11.2"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
- integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+"@babel/runtime@^7.12.5":
+ version "7.12.5"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+ integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
dependencies:
regenerator-runtime "^0.13.4"
@@ -4842,9 +4842,9 @@ has@^1.0.1, has@^1.0.3:
function-bind "^1.1.1"
highlight.js@^10.1.2:
- version "10.1.2"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
- integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
+ version "10.4.1"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
+ integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
hoist-non-react-statics@^3.3.0:
version "3.3.2"
@@ -6390,10 +6390,10 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
dependencies:
chalk "^2.0.1"
-loglevel@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
- integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+loglevel@^1.7.1:
+ version "1.7.1"
+ resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+ integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
lolex@^5.0.0, lolex@^5.1.2:
version "5.1.2"
@@ -6513,15 +6513,15 @@ mathml-tag-names@^2.0.1:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "9.2.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c"
+ version "9.3.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ff6612f9d0aa1a7c08b65a0b41c5ab997506016f"
dependencies:
- "@babel/runtime" "^7.11.2"
+ "@babel/runtime" "^7.12.5"
another-json "^0.2.0"
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.4"
- loglevel "^1.7.0"
+ loglevel "^1.7.1"
qs "^6.9.4"
request "^2.88.2"
unhomoglyph "^1.0.6"
@@ -6994,6 +6994,10 @@ object.values@^1.1.1:
function-bind "^1.1.1"
has "^1.0.3"
+"olm@https://packages.matrix.org/npm/olm/olm-3.2.1.tgz":
+ version "3.2.1"
+ resolved "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz#d623d76f99c3518dde68be8c86618d68bc7b004a"
+
once@^1.3.0, once@^1.3.1, once@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
{
- dis.dispatch({
- action: 'hangup',
- room_id: this.state.call.roomId,
- });
- }}
- />
- {vidMuteButton}
-
-
-
;
+ if (this.state.showMoreMenu) {
+ contextMenu =
+
+ {
+ dis.dispatch({
+ action: 'hangup',
+ room_id: this.props.call.roomId,
+ });
+ }}
+ />
+ {vidMuteButton}
+
+
+ {contextMenuButton}
+
;
+
// The 'content' for the call, ie. the videos for a video call and profile picture
// for voice calls (fills the bg)
let contentView: React.ReactNode;
- if (this.state.call.type === CallType.Video) {
+ const isOnHold = this.state.isLocalOnHold || this.state.isRemoteOnHold;
+ let onHoldText = null;
+ if (this.state.isRemoteOnHold) {
+ onHoldText = _t("You held the call Resume", {}, {
+ a: sub =>
+ {onHoldText}
+
;
+ const backgroundAvatarUrl = avatarUrlForMember(
+ // is it worth getting the size of the div to pass here?
+ this.props.call.getOpponentMember(), 1024, 1024, 'crop',
+ );
+ backgroundStyle.backgroundImage = 'url(' + backgroundAvatarUrl + ')';
+ onHoldBackground = ;
+ }
+
// if we're fullscreen, we don't want to set a maxHeight on the video element.
- const maxVideoHeight = getFullScreenElement() ? null : this.props.maxVideoHeight - HEADER_HEIGHT;
- contentView =
-
+ {onHoldBackground}
+
;
} else {
- const avatarSize = this.props.room ? 200 : 75;
- contentView =
- {
;
let header: React.ReactNode;
- if (this.props.room) {
+ if (!this.props.pipMode) {
header =
+
;
+ }
+
+ contentView =
+
;
}
- const callTypeText = this.state.call.type === CallType.Video ? _t("Video Call") : _t("Voice Call");
+ const callTypeText = this.props.call.type === CallType.Video ? _t("Video Call") : _t("Voice Call");
let myClassName;
let fullScreenButton;
- if (this.state.call.type === CallType.Video && this.props.room) {
+ if (this.props.call.type === CallType.Video && !this.props.pipMode) {
fullScreenButton = ;
}
let expandButton;
- if (!this.props.room) {
+ if (this.props.pipMode) {
expandButton = ;
@@ -407,7 +532,7 @@ export default class CallView extends React.Component
+
+
+
+ {secondaryCallAvatar}
+ {onHoldText}
{callControls}
{callTypeText}
@@ -415,13 +540,28 @@ export default class CallView extends React.Component {
;
myClassName = 'mx_CallView_large';
} else {
+ let secondaryCallInfo;
+ if (this.props.secondaryCall) {
+ secondaryCallInfo =
+
+
{headerControls}
;
@@ -431,6 +571,7 @@ export default class CallView extends React.Component{callRoom.name}
- {callTypeText}
+
+ {callTypeText}
+ {secondaryCallInfo}
+
{header}
{contentView}
+ {contextMenu}
;
}
}
diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx
new file mode 100644
index 0000000000..4cb4e66fbe
--- /dev/null
+++ b/src/components/views/voip/CallViewForRoom.tsx
@@ -0,0 +1,87 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import React from 'react';
+import CallHandler from '../../../CallHandler';
+import CallView from './CallView';
+import dis from '../../../dispatcher/dispatcher';
+
+interface IProps {
+ // What room we should display the call for
+ roomId: string,
+
+ // maxHeight style attribute for the video panel
+ maxVideoHeight?: number;
+
+ // a callback which is called when the content in the callview changes
+ // in a way that is likely to cause a resize.
+ onResize?: any;
+}
+
+interface IState {
+ call: MatrixCall,
+}
+
+/*
+ * Wrapper for CallView that always display the call in a given room,
+ * or nothing if there is no call in that room.
+ */
+export default class CallViewForRoom extends React.ComponentHTML 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 für die Seite Ihrer Community
\n\n Verwenden Sie die ausführliche Beschreibung, um die Community neuen Mitgliedern vorzustellen,\n oder teilen Sie einige wichtige Links links\n
\n\n Sie können sogar Bilder mit Matrix-URLs hinzufügen \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.": "Alternatively, you can try to use the public server at turn.matrix.org, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.",
"Try using turn.matrix.org": "Try using turn.matrix.org",
"OK": "OK",
+ "Unable to access microphone": "Unable to access microphone",
+ "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.",
+ "Unable to access webcam / microphone": "Unable to access webcam / microphone",
+ "Call failed because webcam or microphone could not be accessed. Check that:": "Call failed because webcam or microphone could not be accessed. Check that:",
+ "A microphone and webcam are plugged in and set up correctly": "A microphone and webcam are plugged in and set up correctly",
+ "Permission is granted to use the webcam": "Permission is granted to use the webcam",
+ "No other application is using the webcam": "No other application is using the webcam",
"Unable to capture screen": "Unable to capture screen",
- "Existing Call": "Existing Call",
- "You are already in a call.": "You are already in a call.",
"VoIP is unsupported": "VoIP is unsupported",
"You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
+ "Too Many Calls": "Too Many Calls",
+ "You've reached the maximum number of simultaneous calls.": "You've reached the maximum number of simultaneous calls.",
"You cannot place a call with yourself.": "You cannot place a call with yourself.",
"Call in Progress": "Call in Progress",
"A call is currently being placed!": "A call is currently being placed!",
@@ -399,6 +406,7 @@
"Messages": "Messages",
"Actions": "Actions",
"Advanced": "Advanced",
+ "Effects": "Effects",
"Other": "Other",
"Command error": "Command error",
"Usage": "Usage",
@@ -812,13 +820,13 @@
"Show hidden events in timeline": "Show hidden events in timeline",
"Low bandwidth mode": "Low bandwidth mode",
"Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
- "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
"Show previews/thumbnails for images": "Show previews/thumbnails for images",
"Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
"How fast should messages be downloaded.": "How fast should messages be downloaded.",
"Manually verify all remote sessions": "Manually verify all remote sessions",
"IRC display name width": "IRC display name width",
"Enable experimental, compact IRC style layout": "Enable experimental, compact IRC style layout",
+ "Show chat effects": "Show chat effects",
"Collecting app version information": "Collecting app version information",
"Collecting logs": "Collecting logs",
"Uploading logs": "Uploading logs",
@@ -837,10 +845,15 @@
"When rooms are upgraded": "When rooms are upgraded",
"My Ban List": "My Ban List",
"This is your list of users/servers you have blocked - don't leave the room!": "This is your list of users/servers you have blocked - don't leave the room!",
+ "Sends the given message with confetti": "Sends the given message with confetti",
+ "sends confetti": "sends confetti",
+ "You held the call Resume": "You held the call Resume",
+ "%(peerName)s held the call": "%(peerName)s held the call",
"Video Call": "Video Call",
"Voice Call": "Voice Call",
"Fill Screen": "Fill Screen",
"Return to call": "Return to call",
+ "%(name)s paused": "%(name)s paused",
"Unknown caller": "Unknown caller",
"Incoming voice call": "Incoming voice call",
"Incoming video call": "Incoming video call",
@@ -1129,6 +1142,8 @@
"Message layout": "Message layout",
"Compact": "Compact",
"Modern": "Modern",
+ "Hide advanced": "Hide advanced",
+ "Show advanced": "Show advanced",
"Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
"Customise your appearance": "Customise your appearance",
"Appearance Settings only affect this %(brand)s session.": "Appearance Settings only affect this %(brand)s session.",
@@ -1888,6 +1903,11 @@
"This address is available to use": "This address is available to use",
"This address is already in use": "This address is already in use",
"Room directory": "Room directory",
+ "Server Options": "Server Options",
+ "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.",
+ "Join millions for free on the largest public server": "Join millions for free on the largest public server",
+ "Homeserver": "Homeserver",
+ "Continue with %(provider)s": "Continue with %(provider)s",
"Sign in with single sign-on": "Sign in with single sign-on",
"And %(count)s more...|other": "And %(count)s more...",
"Home": "Home",
@@ -1948,6 +1968,7 @@
"Removing…": "Removing…",
"Confirm Removal": "Confirm Removal",
"Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
+ "Reason (optional)": "Reason (optional)",
"Clear all data in this session?": "Clear all data in this session?",
"Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.",
"Clear all data": "Clear all data",
@@ -1982,8 +2003,6 @@
"Name": "Name",
"Topic (optional)": "Topic (optional)",
"Make this room public": "Make this room public",
- "Hide advanced": "Hide advanced",
- "Show advanced": "Show advanced",
"Block anyone not part of %(serverName)s from ever joining this room.": "Block anyone not part of %(serverName)s from ever joining this room.",
"Create Room": "Create Room",
"Sign out": "Sign out",
@@ -2106,6 +2125,10 @@
"Use this session to verify your new one, granting it access to encrypted messages:": "Use this session to verify your new one, granting it access to encrypted messages:",
"If you didn’t sign in to this session, your account may be compromised.": "If you didn’t sign in to this session, your account may be compromised.",
"This wasn't me": "This wasn't me",
+ "Doesn't look like a valid email address": "Doesn't look like a valid email address",
+ "Continuing without email": "Continuing without email",
+ "Just a heads up, if you don't add an email and forget your password, you could permanently lose access to your account.": "Just a heads up, if you don't add an email and forget your password, you could permanently lose access to your account.",
+ "Email (optional)": "Email (optional)",
"Please fill why you're reporting.": "Please fill why you're reporting.",
"Report Content to Your Homeserver Administrator": "Report Content to Your Homeserver Administrator",
"Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.",
@@ -2139,6 +2162,16 @@
"A connection error occurred while trying to contact the server.": "A connection error occurred while trying to contact the server.",
"The server is not configured to indicate what the problem is (CORS).": "The server is not configured to indicate what the problem is (CORS).",
"Recent changes that have not yet been received": "Recent changes that have not yet been received",
+ "Unable to validate homeserver": "Unable to validate homeserver",
+ "Invalid URL": "Invalid URL",
+ "Specify a homeserver": "Specify a homeserver",
+ "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.",
+ "Sign into your homeserver": "Sign into your homeserver",
+ "We call the places where you can host your account ‘homeservers’.": "We call the places where you can host your account ‘homeservers’.",
+ "Other homeserver": "Other homeserver",
+ "Use your preferred Matrix homeserver if you have one, or host your own.": "Use your preferred Matrix homeserver if you have one, or host your own.",
+ "Learn more": "Learn more",
+ "About homeservers": "About homeservers",
"Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
"Clear Storage and Sign Out": "Clear Storage and Sign Out",
"Send Logs": "Send Logs",
@@ -2232,6 +2265,8 @@
"Warning: You should only set up key backup from a trusted computer.": "Warning: You should only set up key backup from a trusted computer.",
"Access your secure message history and set up secure messaging by entering your recovery key.": "Access your secure message history and set up secure messaging by entering your recovery key.",
"If you've forgotten your recovery key you can ": "If you've forgotten your recovery key you can ",
+ "Resume": "Resume",
+ "Hold": "Hold",
"Reject invitation": "Reject invitation",
"Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
"Unable to reject invite": "Unable to reject invite",
@@ -2267,8 +2302,6 @@
"powered by Matrix": "powered by Matrix",
"This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
"Country Dropdown": "Country Dropdown",
- "Custom Server Options": "Custom Server Options",
- "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.",
"Confirm your identity by entering your account password below.": "Confirm your identity by entering your account password below.",
"Password": "Password",
"Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.",
@@ -2282,48 +2315,30 @@
"Code": "Code",
"Submit": "Submit",
"Start authentication": "Start authentication",
- "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
- "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of element.io.": "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of element.io.",
- "Server Name": "Server Name",
"Enter password": "Enter password",
"Nice, strong password!": "Nice, strong password!",
"Password is allowed, but unsafe": "Password is allowed, but unsafe",
"Keep going...": "Keep going...",
"Enter username": "Enter username",
"Enter email address": "Enter email address",
- "Doesn't look like a valid email address": "Doesn't look like a valid email address",
"Enter phone number": "Enter phone number",
- "Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
+ "That phone number doesn't look quite right, please check and try again": "That phone number doesn't look quite right, please check and try again",
"Email": "Email",
"Username": "Username",
"Phone": "Phone",
- "Not sure of your password? Set a new one": "Not sure of your password? Set a new one",
+ "Forgot password?": "Forgot password?",
"Sign in with": "Sign in with",
"Sign in": "Sign in",
- "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No identity server is configured so you cannot add an email address in order to reset your password in the future.",
- "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
"Use an email address to recover your account": "Use an email address to recover your account",
"Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
"Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
"Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
"Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
- "Email (optional)": "Email (optional)",
"Phone (optional)": "Phone (optional)",
"Register": "Register",
- "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
- "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
- "Enter your custom homeserver URL What does this mean?": "Enter your custom homeserver URL What does this mean?",
- "Homeserver URL": "Homeserver URL",
- "Enter your custom identity server URL What does this mean?": "Enter your custom identity server URL What does this mean?",
- "Identity Server URL": "Identity Server URL",
- "Other servers": "Other servers",
- "Free": "Free",
- "Join millions for free on the largest public server": "Join millions for free on the largest public server",
- "Premium": "Premium",
- "Premium hosting for organisations Learn more": "Premium hosting for organisations Learn more",
- "Find other public servers or use a custom server": "Find other public servers or use a custom server",
- "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
- "Sign in to your Matrix account on 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
Sinu kogukonna lehe HTML'i näidis - see on pealkiri
\n\n Tutvustamaks uutele liikmetele kogukonda, kasuta seda pikka kirjeldust\n või jaga olulist teavet viidetena\n
\n\n Pildite lisaminseks võid sa isegi kasutada img-märgendit Matrix'i url'idega \n
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 para a páxina da túa comunidade
\n\n Usa a descrición longa para presentar a comunidade ás novas particpantes, ou publicar \nalgunha ligazón importante\n \n
\n\n Tamén podes engadir imaxes con URLs de Matrix \n
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 per la pagina della tua comunità
\n\n Usa la descrizione estesa per introdurre i nuovi membri alla comunità, o distribuisci\n alcuni link importanti\n
\n\n Puoi anche aggiungere immagini con gli URL Matrix \n
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 para a página da sua comunidade
\n\n Escreva uma descrição longa para apresentar novos membros à comunidade, ou liste\n alguns links importantes\n
\n\n Você pode até adicionar fotos com URLs na Matrix \n
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 для страницы вашего сообщества
\n\n Используйте подробное описание, чтобы представить новых участников сообществу или распространить\n некоторые важные ссылки\n
\n\n Вы даже можете добавлять изображения с URL-адресами Matrix \n
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 për faqen e bashkësisë tuaj
\n\n Përdoreni përshkrimin e gjatë që t’i prezantoni bashkësisë anëtarë të rinj, ose për t’u dhënë lidhje të rëndësishme\n
\n\n Mundeni madje të shtoni figura me URL-ra Matrix \n
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
\n\n 使用詳細說明向社群介紹新成員，或散佈\n 一些重要的連結\n
\n\n 您甚至可以使用 Matrix URL 新增圖片\n