{_t("Enter your account password to confirm the upgrade:")}
+
;
+ nextCaption = _t("Restore");
} else {
authPrompt = {_t("Restore your key backup to upgrade your encryption")}
+ {_t("You'll need to authenticate with the server to confirm the upgrade.")} @@ -411,9 +463,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent { return
; + } + + _renderPhasePassPhraseConfirm() { + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + const Field = sdk.getComponent('views.elements.Field'); + + let matchText; + let changeText; + if (this.state.passPhraseConfirm === this.state.passPhrase) { + matchText = _t("That matches!"); + changeText = _t("Use a different passphrase?"); + } else if (!this.state.passPhrase.startsWith(this.state.passPhraseConfirm)) { + // only tell them they're wrong if they've actually gone wrong. + // Security concious readers will note that if you left riot-web unattended + // on this screen, this would make it easy for a malicious person to guess + // your passphrase one letter at a time, but they could get this faster by + // just opening the browser's developer tools and reading it. + // Note that not having typed anything at all will not hit this clause and + // fall through so empty box === no hint. + matchText = _t("That doesn't match."); + changeText = _t("Go back to set it again."); } + let passPhraseMatch = null; + if (matchText) { + passPhraseMatch =
+
;
+ }
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+ return ;
+ }
+
+ _renderPhaseShowKey() {
+ const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
return {matchText}
+
+
+ {changeText}
+
+
+ {_t( - "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.", + "Your recovery key is a safety net - you can use it to restore " + + "access to your encrypted messages if you forget your recovery passphrase.", + )}
+{_t( + "Keep a copy of it somewhere secure, like a password manager or even a safe.", )}
+
- {continueButton}
+
+ {_t("Your recovery key")}
+
{this._recoveryKey.encodedPrivateKey}
-
- {_t("Download")}
-
- {_t("or")}
- {this.state.copied ? _t("Copied!") : _t("Copy")}
+ {_t("Copy")}
+
+
+ {_t("Download")}
+ {introText}
+
+
+
;
}
@@ -483,6 +671,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
}
_renderPhaseLoadError() {
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return -
+
- {_t("Print it and store it somewhere safe", {}, {b: s => {s}})} +
- {_t("Save it on a USB key or backup drive", {}, {b: s => {s}})} +
- {_t("Copy it to your personal cloud storage", {}, {b: s => {s}})} +
{_t("Unable to query secret storage status")}
@@ -495,44 +684,29 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
;
}
- _renderPhaseIntro() {
- let cancelButton;
- if (this.props.force) {
- // if this is a forced key reset then aborting will just leave the old keys
- // in place, and is thereforece just 'cancel'
- cancelButton = ;
- } else {
- // if it's setting up from scratch then aborting leaves the user without
- // crypto set up, so they skipping the setup.
- cancelButton = ;
- }
-
+ _renderPhaseDone() {
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return {_t( - "Create a Recovery Key to store encryption keys & secrets with your account data. " + - "If you lose access to this login you’ll need it to unlock your data.", + "You can now verify your other devices, " + + "and other users to keep your chats safe.", )}
-
-
- {cancelButton}
-
-
+
{_t(
"Without completing security on this session, it won’t have " +
"access to encrypted messages.",
)}
@@ -542,15 +716,21 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
_titleForPhase(phase) {
switch (phase) {
- case PHASE_INTRO:
- return _t('Create a Recovery Key');
case PHASE_MIGRATE:
- return _t('Upgrade your Recovery Key');
+ return _t('Upgrade your encryption');
+ case PHASE_PASSPHRASE:
+ return _t('Set up encryption');
+ case PHASE_PASSPHRASE_CONFIRM:
+ return _t('Confirm recovery passphrase');
case PHASE_CONFIRM_SKIP:
return _t('Are you sure?');
case PHASE_SHOWKEY:
+ case PHASE_KEEPITSAFE:
+ return _t('Make a copy of your recovery key');
case PHASE_STORING:
- return _t('Store your Recovery Key');
+ return _t('Setting up keys');
+ case PHASE_DONE:
+ return _t("You're done!");
default:
return '';
}
@@ -561,6 +741,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
let content;
if (this.state.error) {
+ const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
content =
{
@@ -126,7 +126,7 @@ export default class Tooltip extends React.Component {
tooltip: this.tooltip,
parent: parent,
});
- }
+ };
public render() {
// Render a placeholder
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index bf65c7fb7c..254e28dffa 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -28,6 +28,7 @@ export const E2E_STATE = {
WARNING: "warning",
UNKNOWN: "unknown",
NORMAL: "normal",
+ UNAUTHENTICATED: "unauthenticated",
};
const crossSigningUserTitles = {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7508cf3372..88c4ed2e7d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -313,35 +313,52 @@ export default createReactClass({
return;
}
- // If we directly trust the device, short-circuit here
- const verified = await this.context.isEventSenderVerified(mxEvent);
- if (verified) {
+ const encryptionInfo = this.context.getEventEncryptionInfo(mxEvent);
+ const senderId = mxEvent.getSender();
+ const userTrust = this.context.checkUserTrust(senderId);
+
+ if (encryptionInfo.mismatchedSender) {
+ // something definitely wrong is going on here
this.setState({
- verified: E2E_STATE.VERIFIED,
- }, () => {
- // Decryption may have caused a change in size
- this.props.onHeightChanged();
- });
+ verified: E2E_STATE.WARNING,
+ }, this.props.onHeightChanged); // Decryption may have caused a change in size
return;
}
- if (!this.context.checkUserTrust(mxEvent.getSender()).isCrossSigningVerified()) {
+ if (!userTrust.isCrossSigningVerified()) {
+ // user is not verified, so default to everything is normal
this.setState({
verified: E2E_STATE.NORMAL,
- }, this.props.onHeightChanged);
+ }, this.props.onHeightChanged); // Decryption may have caused a change in size
return;
}
- const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
+ const eventSenderTrust = this.context.checkDeviceTrust(
+ senderId, encryptionInfo.sender.deviceId,
+ );
if (!eventSenderTrust) {
this.setState({
verified: E2E_STATE.UNKNOWN,
- }, this.props.onHeightChanged); // Decryption may have cause a change in size
+ }, this.props.onHeightChanged); // Decryption may have caused a change in size
+ return;
+ }
+
+ if (!eventSenderTrust.isVerified()) {
+ this.setState({
+ verified: E2E_STATE.WARNING,
+ }, this.props.onHeightChanged); // Decryption may have caused a change in size
+ return;
+ }
+
+ if (!encryptionInfo.authenticated) {
+ this.setState({
+ verified: E2E_STATE.UNAUTHENTICATED,
+ }, this.props.onHeightChanged); // Decryption may have caused a change in size
return;
}
this.setState({
- verified: eventSenderTrust.isVerified() ? E2E_STATE.VERIFIED : E2E_STATE.WARNING,
+ verified: E2E_STATE.VERIFIED,
}, this.props.onHeightChanged); // Decryption may have caused a change in size
},
@@ -526,6 +543,8 @@ export default createReactClass({
return; // no icon if we've not even cross-signed the user
} else if (this.state.verified === E2E_STATE.VERIFIED) {
return; // no icon for verified
+ } else if (this.state.verified === E2E_STATE.UNAUTHENTICATED) {
+ return ( {
+ private countWatcherRef: string;
+
constructor(props: IProps) {
super(props);
this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+
+ this.state = {
+ showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId),
+ };
+
+ this.countWatcherRef = SettingsStore.watchSetting(
+ "Notifications.alwaysShowBadgeCounts", this.roomId,
+ this.countPreferenceChanged,
+ );
+ }
+
+ private get roomId(): string {
+ // We should convert this to null for safety with the SettingsStore
+ return this.props.roomId || null;
+ }
+
+ public componentWillUnmount() {
+ SettingsStore.unwatchSetting(this.countWatcherRef);
}
public componentDidUpdate(prevProps: Readonly) {
@@ -75,24 +99,34 @@ export default class NotificationBadge extends React.PureComponent {
+ this.setState({showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId)});
+ };
+
private onNotificationUpdate = () => {
this.forceUpdate(); // notification state changed - update
};
public render(): React.ReactElement {
// Don't show a badge if we don't need to
- if (this.props.notification.color <= NotificationColor.Bold) return null;
+ if (this.props.notification.color <= NotificationColor.None) return null;
const hasNotif = this.props.notification.color >= NotificationColor.Red;
const hasCount = this.props.notification.color >= NotificationColor.Grey;
- const isEmptyBadge = this.props.allowNoCount && !localStorage.getItem("mx_rl_rt_badgeCount");
+ const hasUnread = this.props.notification.color >= NotificationColor.Bold;
+ const couldBeEmpty = (!this.state.showCounts || hasUnread) && !hasNotif;
+ let isEmptyBadge = couldBeEmpty && (!this.state.showCounts || !hasCount);
+ if (this.props.forceCount) {
+ isEmptyBadge = false;
+ if (!hasCount) return null; // Can't render a badge
+ }
let symbol = this.props.notification.symbol || formatMinimalBadgeCount(this.props.notification.count);
if (isEmptyBadge) symbol = "";
const classes = classNames({
'mx_NotificationBadge': true,
- 'mx_NotificationBadge_visible': hasCount,
+ 'mx_NotificationBadge_visible': isEmptyBadge ? true : hasCount,
'mx_NotificationBadge_highlighted': hasNotif,
'mx_NotificationBadge_dot': isEmptyBadge,
'mx_NotificationBadge_2char': symbol.length > 0 && symbol.length < 3,
@@ -107,14 +141,14 @@ export default class NotificationBadge extends React.PureComponent {
+ if (!readReceiptChangeIsFor(event, MatrixClientPeg.get())) return; // not our own - ignore
+ if (room.roomId !== this.room.roomId) return; // not for us - ignore
+ this.updateNotificationState();
+ };
+
private handleRoomEventUpdate = (event: MatrixEvent) => {
const roomId = event.getRoomId();
@@ -205,13 +245,38 @@ export class RoomNotificationState extends EventEmitter implements IDestroyable
}
}
-export class ListNotificationState extends EventEmitter implements IDestroyable {
+export class TagSpecificNotificationState extends RoomNotificationState {
+ private static TAG_TO_COLOR: {
+ // @ts-ignore - TS wants this to be a string key, but we know better
+ [tagId: TagID]: NotificationColor,
+ } = {
+ [DefaultTagID.DM]: NotificationColor.Red,
+ };
+
+ private readonly colorWhenNotIdle?: NotificationColor;
+
+ constructor(room: Room, tagId: TagID) {
+ super(room);
+
+ const specificColor = TagSpecificNotificationState.TAG_TO_COLOR[tagId];
+ if (specificColor) this.colorWhenNotIdle = specificColor;
+ }
+
+ public get color(): NotificationColor {
+ if (!this.colorWhenNotIdle) return super.color;
+
+ if (super.color !== NotificationColor.None) return this.colorWhenNotIdle;
+ return super.color;
+ }
+}
+
+export class ListNotificationState extends EventEmitter implements IDestroyable, INotificationState {
private _count: number;
private _color: NotificationColor;
private rooms: Room[] = [];
private states: { [roomId: string]: RoomNotificationState } = {};
- constructor(private byTileCount = false) {
+ constructor(private byTileCount = false, private tagId: TagID) {
super();
}
@@ -240,12 +305,13 @@ export class ListNotificationState extends EventEmitter implements IDestroyable
this.rooms = rooms;
for (const oldRoom of diff.removed) {
const state = this.states[oldRoom.roomId];
+ if (!state) continue; // We likely just didn't have a badge (race condition)
delete this.states[oldRoom.roomId];
state.off(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
state.destroy();
}
for (const newRoom of diff.added) {
- const state = new RoomNotificationState(newRoom);
+ const state = new TagSpecificNotificationState(newRoom, this.tagId);
state.on(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
if (this.states[newRoom.roomId]) {
// "Should never happen" disclaimer.
@@ -258,6 +324,12 @@ export class ListNotificationState extends EventEmitter implements IDestroyable
this.calculateTotalState();
}
+ public getForRoom(room: Room) {
+ const state = this.states[room.roomId];
+ if (!state) throw new Error("Unknown room for notification state");
+ return state;
+ }
+
public destroy() {
for (const state of Object.values(this.states)) {
state.destroy();
diff --git a/src/components/views/rooms/RoomBreadcrumbs2.tsx b/src/components/views/rooms/RoomBreadcrumbs2.tsx
index 1b912b39d6..69cca39d9f 100644
--- a/src/components/views/rooms/RoomBreadcrumbs2.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs2.tsx
@@ -97,7 +97,7 @@ export default class RoomBreadcrumbs2 extends React.PureComponent
- )
+ );
});
if (tiles.length > 0) {
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 4fdce360c1..be3a7c4fdd 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -193,6 +193,7 @@ export default class RoomList2 extends React.Component {
components.push(
{
super(props);
this.state = {
- notificationState: new ListNotificationState(this.props.isInvite),
+ notificationState: new ListNotificationState(this.props.isInvite, this.props.tagId),
menuDisplayed: false,
};
this.state.notificationState.setRooms(this.props.rooms);
@@ -105,7 +112,12 @@ export default class RoomSublist2 extends React.Component {
};
private onShowAllClick = () => {
- this.props.layout.visibleTiles = this.numTiles;
+ this.props.layout.visibleTiles = this.props.layout.tilesWithPadding(this.numTiles, MAX_PADDING_HEIGHT);
+ this.forceUpdate(); // because the layout doesn't trigger a re-render
+ };
+
+ private onShowLessClick = () => {
+ this.props.layout.visibleTiles = this.props.layout.minVisibleTiles;
this.forceUpdate(); // because the layout doesn't trigger a re-render
};
@@ -120,13 +132,13 @@ export default class RoomSublist2 extends React.Component {
};
private onUnreadFirstChanged = async () => {
- const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.layout.tagId) === ListAlgorithm.Importance;
+ const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
const newAlgorithm = isUnreadFirst ? ListAlgorithm.Natural : ListAlgorithm.Importance;
- await RoomListStore.instance.setListOrder(this.props.layout.tagId, newAlgorithm);
+ await RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
};
private onTagSortChanged = async (sort: SortAlgorithm) => {
- await RoomListStore.instance.setTagSorting(this.props.layout.tagId, sort);
+ await RoomListStore.instance.setTagSorting(this.props.tagId, sort);
};
private onMessagePreviewChanged = () => {
@@ -134,7 +146,28 @@ export default class RoomSublist2 extends React.Component {
this.forceUpdate(); // because the layout doesn't trigger a re-render
};
+ private onHeaderClick = (ev: React.MouseEvent) => {
+ let target = ev.target as HTMLDivElement;
+ if (!target.classList.contains('mx_RoomSublist2_headerText')) {
+ // If we don't have the headerText class, the user clicked the span in the headerText.
+ target = target.parentElement as HTMLDivElement;
+ }
+
+ const possibleSticky = target.parentElement;
+ const sublist = possibleSticky.parentElement.parentElement;
+ if (possibleSticky.classList.contains('mx_RoomSublist2_headerContainer_sticky')) {
+ // is sticky - jump to list
+ sublist.scrollIntoView({behavior: 'smooth'});
+ } else {
+ // on screen - toggle collapse
+ this.props.layout.isCollapsed = !this.props.layout.isCollapsed;
+ this.forceUpdate(); // because the layout doesn't trigger an update
+ }
+ };
+
private renderTiles(): React.ReactElement[] {
+ if (this.props.layout && this.props.layout.isCollapsed) return []; // don't waste time on rendering
+
const tiles: React.ReactElement[] = [];
if (this.props.rooms) {
@@ -145,6 +178,7 @@ export default class RoomSublist2 extends React.Component {
key={`room-${room.roomId}`}
showMessagePreview={this.props.layout.showPreviews}
isMinimized={this.props.isMinimized}
+ tag={this.props.tagId}
/>
);
}
@@ -157,8 +191,8 @@ export default class RoomSublist2 extends React.Component {
let contextMenu = null;
if (this.state.menuDisplayed) {
const elementRect = this.menuButtonRef.current.getBoundingClientRect();
- const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.layout.tagId) === SortAlgorithm.Alphabetic;
- const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.layout.tagId) === ListAlgorithm.Importance;
+ const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.tagId) === SortAlgorithm.Alphabetic;
+ const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
contextMenu = (
{
this.onTagSortChanged(SortAlgorithm.Recent)}
checked={!isAlphabetical}
- name={`mx_${this.props.layout.tagId}_sortBy`}
+ name={`mx_${this.props.tagId}_sortBy`}
>
{_t("Activity")}
this.onTagSortChanged(SortAlgorithm.Alphabetic)}
checked={isAlphabetical}
- name={`mx_${this.props.layout.tagId}_sortBy`}
+ name={`mx_${this.props.tagId}_sortBy`}
>
{_t("A-Z")}
@@ -235,7 +269,7 @@ export default class RoomSublist2 extends React.Component {
// TODO: Collapsed state
- const badge = ;
+ const badge = ;
let addRoomButton = null;
if (!!this.props.onAddRoom) {
@@ -249,28 +283,48 @@ export default class RoomSublist2 extends React.Component {
);
}
+ const collapseClasses = classNames({
+ 'mx_RoomSublist2_collapseBtn': true,
+ 'mx_RoomSublist2_collapseBtn_collapsed': this.props.layout && this.props.layout.isCollapsed,
+ });
+
const classes = classNames({
'mx_RoomSublist2_headerContainer': true,
'mx_RoomSublist2_headerContainer_withAux': !!addRoomButton,
});
+ const badgeContainer = (
+
{_t("Unable to set up secret storage")}
@@ -579,16 +760,27 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
case PHASE_LOADERROR:
content = this._renderPhaseLoadError();
break;
- case PHASE_INTRO:
- content = this._renderPhaseIntro();
- break;
case PHASE_MIGRATE:
content = this._renderPhaseMigrate();
break;
+ case PHASE_PASSPHRASE:
+ content = this._renderPhasePassPhrase();
+ break;
+ case PHASE_PASSPHRASE_CONFIRM:
+ content = this._renderPhasePassPhraseConfirm();
+ break;
case PHASE_SHOWKEY:
- case PHASE_STORING:
content = this._renderPhaseShowKey();
break;
+ case PHASE_KEEPITSAFE:
+ content = this._renderPhaseKeepItSafe();
+ break;
+ case PHASE_STORING:
+ content = this._renderBusyPhase();
+ break;
+ case PHASE_DONE:
+ content = this._renderPhaseDone();
+ break;
case PHASE_CONFIRM_SKIP:
content = this._renderPhaseSkipConfirm();
break;
@@ -605,7 +797,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
onFinished={this.props.onFinished}
title={this._titleForPhase(this.state.phase)}
headerImage={headerImage}
- hasCancel={this.props.hasCancel}
+ hasCancel={this.props.hasCancel && [PHASE_PASSPHRASE].includes(this.state.phase)}
fixedWidth={false}
>
{
if (SettingsStore.isFeatureEnabled("feature_new_room_list")) {
// TODO: Supply props like collapsed and disabled to LeftPanel2
leftPanel = (
- {
this.accountPasswordTimer = null;
}, 60 * 5 * 1000);
- // Wait for the client to be logged in (but not started)
- // which is enough to ask the server about account data.
- const loggedIn = new Promise(resolve => {
- const actionHandlerRef = dis.register(payload => {
- if (payload.action !== "on_logged_in") {
- return;
- }
- dis.unregister(actionHandlerRef);
- resolve();
- });
- });
-
- // Create and start the client in the background
- const setLoggedInPromise = Lifecycle.setLoggedIn(credentials);
- await loggedIn;
+ // Create and start the client
+ await Lifecycle.setLoggedIn(credentials);
const cli = MatrixClientPeg.get();
- // We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
- // because the client hasn't been started yet.
- const cryptoAvailable = isCryptoAvailable();
- if (!cryptoAvailable) {
+ const cryptoEnabled = cli.isCryptoEnabled();
+ if (!cryptoEnabled) {
this.onLoggedIn();
}
- this.setState({ pendingInitialSync: true });
- await this.firstSyncPromise.promise;
-
- if (!cryptoAvailable) {
- this.setState({ pendingInitialSync: false });
- return setLoggedInPromise;
+ const promisesList = [this.firstSyncPromise.promise];
+ if (cryptoEnabled) {
+ // wait for the client to finish downloading cross-signing keys for us so we
+ // know whether or not we have keys set up on this account
+ promisesList.push(cli.downloadKeys([cli.getUserId()]));
}
- // Test for the master cross-signing key in SSSS as a quick proxy for
- // whether cross-signing has been set up on the account.
- const masterKeyInStorage = !!cli.getAccountData("m.cross_signing.master");
- if (masterKeyInStorage) {
+ // Now update the state to say we're waiting for the first sync to complete rather
+ // than for the login to finish.
+ this.setState({ pendingInitialSync: true });
+
+ await Promise.all(promisesList);
+
+ if (!cryptoEnabled) {
+ this.setState({ pendingInitialSync: false });
+ return;
+ }
+
+ const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(cli.getUserId());
+ if (crossSigningIsSetUp) {
this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
} else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
this.setStateForNewView({ view: Views.E2E_SETUP });
@@ -1913,8 +1906,6 @@ export default class MatrixChat extends React.PureComponent {
this.onLoggedIn();
}
this.setState({ pendingInitialSync: false });
-
- return setLoggedInPromise;
};
// complete security / e2e setup has finished
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4a0cc470d5..19f1cccebd 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -39,7 +39,7 @@ import Tinter from '../../Tinter';
import rate_limited_func from '../../ratelimitedfunc';
import * as ObjectUtils from '../../ObjectUtils';
import * as Rooms from '../../Rooms';
-import eventSearch from '../../Searching';
+import eventSearch, {searchPagination} from '../../Searching';
import {isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
@@ -166,7 +166,7 @@ export default createReactClass({
canReact: false,
canReply: false,
- useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
+ useIRCLayout: SettingsStore.getValue("useIRCLayout"),
matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
};
@@ -199,7 +199,7 @@ export default createReactClass({
this._roomView = createRef();
this._searchResultsPanel = createRef();
- this._layoutWatcherRef = SettingsStore.watchSetting("feature_irc_ui", null, this.onLayoutChange);
+ this._layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
},
_onReadReceiptsChange: function() {
@@ -546,7 +546,7 @@ export default createReactClass({
onLayoutChange: function() {
this.setState({
- useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
+ useIRCLayout: SettingsStore.getValue("useIRCLayout"),
});
},
@@ -1036,8 +1036,7 @@ export default createReactClass({
if (this.state.searchResults.next_batch) {
debuglog("requesting more search results");
- const searchPromise = this.context.backPaginateRoomEventsSearch(
- this.state.searchResults);
+ const searchPromise = searchPagination(this.state.searchResults);
return this._handleSearchResult(searchPromise);
} else {
debuglog("no more search results");
@@ -1314,6 +1313,14 @@ export default createReactClass({
const mxEv = result.context.getEvent();
const roomId = mxEv.getRoomId();
const room = this.context.getRoom(roomId);
+ if (!room) {
+ // if we do not have the room in js-sdk stores then hide it as we cannot easily show it
+ // As per the spec, an all rooms search can create this condition,
+ // it happens with Seshat but not Synapse.
+ // It will make the result count not match the displayed count.
+ console.log("Hiding search result from an unknown room", roomId);
+ continue;
+ }
if (!haveTileForEvent(mxEv)) {
// XXX: can this ever happen? It will make the result count
@@ -1322,16 +1329,9 @@ export default createReactClass({
}
if (this.state.searchScope === 'All') {
- if (roomId != lastRoomId) {
-
- // XXX: if we've left the room, we might not know about
- // it. We should tell the js sdk to go and find out about
- // it. But that's not an issue currently, as synapse only
- // returns results for rooms we're joined to.
- const roomName = room ? room.name : _t("Unknown room %(roomId)s", { roomId: roomId });
-
+ if (roomId !== lastRoomId) {
ret.push(
- );
lastRoomId = roomId;
}
diff --git a/src/components/structures/UserMenuButton.tsx b/src/components/structures/UserMenuButton.tsx
index f3626ba270..27dfdac5a1 100644
--- a/src/components/structures/UserMenuButton.tsx
+++ b/src/components/structures/UserMenuButton.tsx
@@ -15,7 +15,6 @@ limitations under the License.
*/
import * as React from "react";
-import {User} from "matrix-js-sdk/src/models/user";
import { MatrixClientPeg } from "../../MatrixClientPeg";
import defaultDispatcher from "../../dispatcher/dispatcher";
import { ActionPayload } from "../../dispatcher/payloads";
@@ -34,12 +33,13 @@ import {getHostingLink} from "../../utils/HostingLink";
import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
import SdkConfig from "../../SdkConfig";
import {getHomePageUrl} from "../../utils/pages";
+import { OwnProfileStore } from "../../stores/OwnProfileStore";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
interface IProps {
}
interface IState {
- user: User;
menuDisplayed: boolean;
isDarkTheme: boolean;
}
@@ -54,19 +54,10 @@ export default class UserMenuButton extends React.Component {
this.state = {
menuDisplayed: false,
- user: MatrixClientPeg.get().getUser(MatrixClientPeg.get().getUserId()),
isDarkTheme: this.isUserOnDarkTheme(),
};
- }
- private get displayName(): string {
- if (MatrixClientPeg.get().isGuest()) {
- return _t("Guest");
- } else if (this.state.user) {
- return this.state.user.displayName;
- } else {
- return MatrixClientPeg.get().getUserId();
- }
+ OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
}
private get hasHomePage(): boolean {
@@ -81,6 +72,7 @@ export default class UserMenuButton extends React.Component {
public componentWillUnmount() {
if (this.themeWatcherRef) SettingsStore.unwatchSetting(this.themeWatcherRef);
if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
+ OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
}
private isUserOnDarkTheme(): boolean {
@@ -91,6 +83,12 @@ export default class UserMenuButton extends React.Component {
return theme === "dark";
}
+ private onProfileUpdate = async () => {
+ // the store triggered an update, so force a layout update. We don't
+ // have any state to store here for that to magically happen.
+ this.forceUpdate();
+ };
+
private onThemeChanged = () => {
this.setState({isDarkTheme: this.isUserOnDarkTheme()});
};
@@ -117,7 +115,7 @@ export default class UserMenuButton extends React.Component {
SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false);
const newTheme = this.state.isDarkTheme ? "light" : "dark";
- SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme);
+ SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme); // set at same level as Appearance tab
};
private onSettingsOpen = (ev: ButtonEvent, tabId: string) => {
@@ -190,7 +188,7 @@ export default class UserMenuButton extends React.Component {
homeButton = (
- ![]({require("../../../res/img/feather-customised/home.svg")})
+
{_t("Home")}
@@ -209,7 +207,7 @@ export default class UserMenuButton extends React.Component {
{sub} ,
- },
- );
- } else {
- keyPrompt = _t("Enter your Recovery Key to continue.");
- }
-
- const Field = sdk.getComponent('elements.Field');
- return ;
} else if (phase === PHASE_DONE) {
let message;
if (this.state.backupInfo) {
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index f09791ce26..2f5064447e 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -118,7 +118,7 @@ class PassphraseField extends PureComponent {
value={this.props.value}
onChange={this.props.onChange}
onValidate={this.onValidate}
- />
+ />;
}
}
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 87ba6f7396..dd34dfbbf0 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -88,7 +88,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
_onResetRecoveryClick = () => {
this.props.onFinished(false);
- accessSecretStorage(() => {}, {forceReset: true});
+ accessSecretStorage(() => {}, /* forceReset = */ true);
}
_onRecoveryKeyChange = (e) => {
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 43697f8ee7..e2ceadfbb9 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -32,9 +32,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
keyInfo: PropTypes.object.isRequired,
// Function from one of { passphrase, recoveryKey } -> boolean
checkPrivateKey: PropTypes.func.isRequired,
- // If true, only prompt for a passphrase and do not offer to restore with
- // a recovery key or reset keys.
- passphraseOnly: PropTypes.bool,
}
constructor(props) {
@@ -61,7 +58,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
_onResetRecoveryClick = () => {
// Re-enter the access flow, but resetting storage this time around.
this.props.onFinished(false);
- accessSecretStorage(() => {}, {forceReset: true});
+ accessSecretStorage(() => {}, /* forceReset = */ true);
}
_onRecoveryKeyChange = (e) => {
@@ -167,7 +164,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
primaryDisabled={this.state.passPhrase.length === 0}
/>
- {this.props.passphraseOnly ? null : _t(
+ {_t(
"If you've forgotten your recovery passphrase you can "+
"use your recovery key or " +
"set up new recovery options ."
@@ -237,7 +234,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
primaryDisabled={!this.state.recoveryKeyValid}
/>
- {this.props.passphraseOnly ? null : _t(
+ {_t(
"If you've forgotten your recovery key you can "+
"."
, {}, {
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 18dd43ad02..01a27d9522 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -19,7 +19,7 @@ import React from 'react';
import {Key} from '../../../Keyboard';
import classnames from 'classnames';
-export type ButtonEvent = React.MouseEvent | React.KeyboardEvent
+export type ButtonEvent = React.MouseEvent | React.KeyboardEvent;
/**
* children: React's magic prop. Represents all children given to the element.
@@ -40,7 +40,7 @@ interface IProps extends React.InputHTMLAttributes {
disabled?: boolean;
className?: string;
onClick?(e?: ButtonEvent): void;
-};
+}
interface IAccessibleButtonProps extends React.InputHTMLAttributes {
ref?: React.Ref;
diff --git a/src/components/views/elements/Draggable.tsx b/src/components/views/elements/Draggable.tsx
index 3096ac42f7..3397fd901c 100644
--- a/src/components/views/elements/Draggable.tsx
+++ b/src/components/views/elements/Draggable.tsx
@@ -17,20 +17,20 @@ limitations under the License.
import React from 'react';
interface IProps {
- className: string,
- dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState,
- onMouseUp: (event: MouseEvent) => void,
+ className: string;
+ dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState;
+ onMouseUp: (event: MouseEvent) => void;
}
interface IState {
- onMouseMove: (event: MouseEvent) => void,
- onMouseUp: (event: MouseEvent) => void,
- location: ILocationState,
+ onMouseMove: (event: MouseEvent) => void;
+ onMouseUp: (event: MouseEvent) => void;
+ location: ILocationState;
}
export interface ILocationState {
- currentX: number,
- currentY: number,
+ currentX: number;
+ currentY: number;
}
export default class Draggable extends React.Component {
@@ -58,13 +58,13 @@ export default class Draggable extends React.Component {
document.addEventListener("mousemove", this.state.onMouseMove);
document.addEventListener("mouseup", this.state.onMouseUp);
- }
+ };
private onMouseUp = (event: MouseEvent): void => {
document.removeEventListener("mousemove", this.state.onMouseMove);
document.removeEventListener("mouseup", this.state.onMouseUp);
this.props.onMouseUp(event);
- }
+ };
private onMouseMove(event: MouseEvent): void {
const newLocation = this.props.dragFunc(this.state.location, event);
@@ -75,7 +75,7 @@ export default class Draggable extends React.Component {
}
render() {
- return
+ return ;
}
}
\ No newline at end of file
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
new file mode 100644
index 0000000000..7d8b774955
--- /dev/null
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -0,0 +1,129 @@
+/*
+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 classnames from 'classnames';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+
+import * as Avatar from '../../../Avatar';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import EventTile from '../rooms/EventTile';
+
+interface IProps {
+ /**
+ * The text to be displayed in the message preview
+ */
+ message: string;
+
+ /**
+ * Whether to use the irc layout or not
+ */
+ useIRCLayout: boolean;
+
+ /**
+ * classnames to apply to the wrapper of the preview
+ */
+ className: string;
+}
+
+interface IState {
+ userId: string;
+ displayname: string;
+ avatar_url: string;
+}
+
+const AVATAR_SIZE = 32;
+
+export default class EventTilePreview extends React.Component {
+ constructor(props: IProps) {
+ super(props);
+
+ this.state = {
+ userId: "@erim:fink.fink",
+ displayname: "Erimayas Fink",
+ avatar_url: null,
+ };
+ }
+
+ async componentDidMount() {
+ // Fetch current user data
+ const client = MatrixClientPeg.get();
+ const userId = client.getUserId();
+ const profileInfo = await client.getProfileInfo(userId);
+ const avatar_url = Avatar.avatarUrlForUser(
+ {avatarUrl: profileInfo.avatar_url},
+ AVATAR_SIZE, AVATAR_SIZE, "crop");
+
+ this.setState({
+ userId,
+ displayname: profileInfo.displayname,
+ avatar_url,
+ });
+
+ }
+
+ private fakeEvent({userId, displayname, avatar_url}: IState) {
+ // Fake it till we make it
+ const event = new MatrixEvent(JSON.parse(`{
+ "type": "m.room.message",
+ "sender": "${userId}",
+ "content": {
+ "m.new_content": {
+ "msgtype": "m.text",
+ "body": "${this.props.message}",
+ "displayname": "${displayname}",
+ "avatar_url": "${avatar_url}"
+ },
+ "msgtype": "m.text",
+ "body": "${this.props.message}",
+ "displayname": "${displayname}",
+ "avatar_url": "${avatar_url}"
+ },
+ "unsigned": {
+ "age": 97
+ },
+ "event_id": "$9999999999999999999999999999999999999999999",
+ "room_id": "!999999999999999999:matrix.org"
+ }`));
+
+ // Fake it more
+ event.sender = {
+ name: displayname,
+ userId: userId,
+ getAvatarUrl: (..._) => {
+ return avatar_url;
+ },
+ };
+
+ return event;
+ }
+
+ public render() {
+ const event = this.fakeEvent(this.state);
+
+ let className = classnames(
+ this.props.className,
+ {
+ "mx_IRCLayout": this.props.useIRCLayout,
+ "mx_GroupLayout": !this.props.useIRCLayout,
+ }
+ );
+
+ return {
private id: string;
private input: HTMLInputElement;
- private static defaultProps = {
+ public static readonly defaultProps = {
element: "input",
type: "text",
- }
+ };
/*
* This was changed from throttle to debounce: this is more traditional for
@@ -242,10 +244,9 @@ export default class Field extends React.PureComponent {
const Tooltip = sdk.getComponent("elements.Tooltip");
let fieldTooltip;
if (tooltipContent || this.state.feedback) {
- const addlClassName = tooltipClassName ? tooltipClassName : '';
fieldTooltip = {
constructor(props: IProps) {
@@ -37,20 +37,19 @@ export default class IRCTimelineProfileResizer extends React.Component this.updateCSSWidth(this.state.width))
+ }, () => this.updateCSSWidth(this.state.width));
}
private dragFunc = (location: ILocationState, event: React.MouseEvent): ILocationState => {
const offset = event.clientX - location.currentX;
const newWidth = this.state.width + offset;
- console.log({offset})
// If we're trying to go smaller than min width, don't.
if (newWidth < this.props.minWidth) {
return location;
@@ -69,8 +68,8 @@ export default class IRCTimelineProfileResizer extends React.Component
+ return {
this.props.roomId,
this.props.isExplicit,
),
- }
+ };
}
private onChange = (checked: boolean): void => {
this.save(checked);
this.setState({ value: checked });
if (this.props.onChange) this.props.onChange(checked);
- }
+ };
private checkBoxOnChange = (e: React.ChangeEvent) => {
this.onChange(e.target.checked);
- }
+ };
private save = (val?: boolean): void => {
return SettingsStore.setValue(
@@ -68,7 +68,7 @@ export default class SettingsFlag extends React.Component {
this.props.level,
val !== undefined ? val : this.state.value,
);
- }
+ };
public render() {
const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index f76a4684d3..a88c581d07 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -65,9 +65,9 @@ export default class Slider extends React.Component {
const intervalWidth = 1 / (values.length - 1);
- const linearInterpolation = (value - closestLessValue) / (closestGreaterValue - closestLessValue)
+ const linearInterpolation = (value - closestLessValue) / (closestGreaterValue - closestLessValue);
- return 100 * (closest - 1 + linearInterpolation) * intervalWidth
+ return 100 * (closest - 1 + linearInterpolation) * intervalWidth;
}
@@ -87,7 +87,7 @@ export default class Slider extends React.Component {
selection =
-
+ ;
}
return {
public static readonly defaultProps = {
className: '',
- }
+ };
public render() {
const { children, className, disabled, ...otherProps } = this.props;
@@ -36,6 +36,7 @@ export default class StyledRadioButton extends React.PureComponent
@@ -43,6 +44,6 @@ export default class StyledRadioButton extends React.PureComponent
{children}
-
+ ;
}
}
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index 7b690899ac..f05c45b3db 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -28,7 +28,7 @@ interface IProps {
// Called when the checked state changes. First argument will be the new state.
onChange(checked: boolean): void;
-};
+}
// Controlled Toggle Switch element, written with Accessibility in mind
export default ({checked, disabled = false, onChange, ...props}: IProps) => {
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 38960d1a58..69ad5e256c 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -29,15 +29,15 @@ const MIN_TOOLTIP_HEIGHT = 25;
interface IProps {
// Class applied to the element used to position the tooltip
- className: string,
+ className: string;
// Class applied to the tooltip itself
- tooltipClassName?: string,
+ tooltipClassName?: string;
// Whether the tooltip is visible or hidden.
// The hidden state allows animating the tooltip away via CSS.
// Defaults to visible if unset.
- visible?: boolean,
+ visible?: boolean;
// the react element to put into the tooltip
- label: React.ReactNode,
+ label: React.ReactNode;
}
export default class Tooltip extends React.Component
diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts
index 8384eb9d4f..2615736e09 100644
--- a/src/autocomplete/Autocompleter.ts
+++ b/src/autocomplete/Autocompleter.ts
@@ -35,15 +35,15 @@ export interface ISelectionRange {
export interface ICompletion {
type: "at-room" | "command" | "community" | "room" | "user";
- completion: string,
+ completion: string;
completionId?: string;
- component?: ReactElement,
- range: ISelectionRange,
- command?: string,
+ component?: ReactElement;
+ range: ISelectionRange;
+ command?: string;
suffix?: string;
// If provided, apply a LINK entity to the completion with the
// data = { url: href }.
- href?: string,
+ href?: string;
}
const PROVIDERS = [
diff --git a/src/autocomplete/Components.tsx b/src/autocomplete/Components.tsx
index 0ee0088f02..6ac2f4db14 100644
--- a/src/autocomplete/Components.tsx
+++ b/src/autocomplete/Components.tsx
@@ -46,7 +46,7 @@ export const TextualCompletion = forwardRef((props
});
interface IPillCompletionProps extends ITextualCompletionProps {
- children?: React.ReactNode,
+ children?: React.ReactNode;
}
export const PillCompletion = forwardRef((props, ref) => {
diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts
index 2c1899d813..7a0219e264 100644
--- a/src/autocomplete/QueryMatcher.ts
+++ b/src/autocomplete/QueryMatcher.ts
@@ -17,8 +17,6 @@ limitations under the License.
*/
import _at from 'lodash/at';
-import _flatMap from 'lodash/flatMap';
-import _sortBy from 'lodash/sortBy';
import _uniq from 'lodash/uniq';
function stripDiacritics(str: string): string {
@@ -35,8 +33,9 @@ interface IOptions {
/**
* Simple search matcher that matches any results with the query string anywhere
* in the search string. Returns matches in the order the query string appears
- * in the search key, earliest first, then in the order the items appeared in
- * the source array.
+ * in the search key, earliest first, then in the order the search key appears
+ * in the provided array of keys, then in the order the items appeared in the
+ * source array.
*
* @param {Object[]} objects Initial list of objects. Equivalent to calling
* setObjects() after construction
@@ -49,7 +48,7 @@ export default class QueryMatcher {
private _options: IOptions;
private _keys: IOptions["keys"];
private _funcs: Required["funcs"]>;
- private _items: Map;
+ private _items: Map;
constructor(objects: T[], options: IOptions = { keys: [] }) {
this._options = options;
@@ -85,13 +84,16 @@ export default class QueryMatcher {
keyValues.push(f(object));
}
- for (const keyValue of keyValues) {
+ for (const [index, keyValue] of Object.entries(keyValues)) {
if (!keyValue) continue; // skip falsy keyValues
const key = stripDiacritics(keyValue).toLowerCase();
if (!this._items.has(key)) {
this._items.set(key, []);
}
- this._items.get(key).push(object);
+ this._items.get(key).push({
+ keyWeight: Number(index),
+ object,
+ });
}
}
}
@@ -104,32 +106,40 @@ export default class QueryMatcher {
if (query.length === 0) {
return [];
}
- const results = [];
+ const matches = [];
// Iterate through the map & check each key.
// ES6 Map iteration order is defined to be insertion order, so results
// here will come out in the order they were put in.
- for (const key of this._items.keys()) {
+ for (const [key, candidates] of this._items.entries()) {
let resultKey = key;
if (this._options.shouldMatchWordsOnly) {
resultKey = resultKey.replace(/[^\w]/g, '');
}
const index = resultKey.indexOf(query);
if (index !== -1 && (!this._options.shouldMatchPrefix || index === 0)) {
- results.push({key, index});
+ matches.push(
+ ...candidates.map((candidate) => ({index, ...candidate}))
+ );
}
}
- // Sort them by where the query appeared in the search key
- // lodash sortBy is a stable sort, so results where the query
- // appeared in the same place will retain their order with
- // respect to each other.
- const sortedResults = _sortBy(results, (candidate) => {
- return candidate.index;
+ // Sort matches by where the query appeared in the search key, then by
+ // where the matched key appeared in the provided array of keys.
+ matches.sort((a, b) => {
+ if (a.index < b.index) {
+ return -1;
+ } else if (a.index === b.index) {
+ if (a.keyWeight < b.keyWeight) {
+ return -1;
+ } else if (a.keyWeight === b.keyWeight) {
+ return 0;
+ }
+ }
+
+ return 1;
});
- // Now map the keys to the result objects. Each result object is a list, so
- // flatMap will flatten those lists out into a single list. Also remove any
- // duplicates.
- return _uniq(_flatMap(sortedResults, (candidate) => this._items.get(candidate.key)));
+ // Now map the keys to the result objects. Also remove any duplicates.
+ return _uniq(matches.map((match) => match.object));
}
}
diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index a644aa4837..27583f26ee 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -15,11 +15,11 @@ limitations under the License.
*/
import * as React from "react";
+import { createRef } from "react";
import TagPanel from "./TagPanel";
import classNames from "classnames";
import dis from "../../dispatcher/dispatcher";
import { _t } from "../../languageHandler";
-import SearchBox from "./SearchBox";
import RoomList2 from "../views/rooms/RoomList2";
import { Action } from "../../dispatcher/actions";
import { MatrixClientPeg } from "../../MatrixClientPeg";
@@ -30,6 +30,10 @@ import AccessibleButton from "../views/elements/AccessibleButton";
import RoomBreadcrumbs2 from "../views/rooms/RoomBreadcrumbs2";
import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import ResizeNotifier from "../../utils/ResizeNotifier";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { throttle } from 'lodash';
+import { OwnProfileStore } from "../../stores/OwnProfileStore";
/*******************************************************************
* CAUTION *
@@ -41,6 +45,7 @@ import { UPDATE_EVENT } from "../../stores/AsyncStore";
interface IProps {
isMinimized: boolean;
+ resizeNotifier: ResizeNotifier;
}
interface IState {
@@ -49,6 +54,8 @@ interface IState {
}
export default class LeftPanel2 extends React.Component {
+ private listContainerRef: React.RefObject = createRef();
+
// TODO: Properly support TagPanel
// TODO: Properly support searching/filtering
// TODO: Properly support breadcrumbs
@@ -65,12 +72,36 @@ export default class LeftPanel2 extends React.Component {
};
BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+
+ // We watch the middle panel because we don't actually get resized, the middle panel does.
+ // We listen to the noisy channel to avoid choppy reaction times.
+ this.props.resizeNotifier.on("middlePanelResizedNoisy", this.onResize);
+
+ OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
}
public componentWillUnmount() {
BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+ this.props.resizeNotifier.off("middlePanelResizedNoisy", this.onResize);
+ OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
}
+ // TSLint wants this to be a member, but we don't want that.
+ // tslint:disable-next-line
+ private onRoomStateUpdate = throttle((ev: MatrixEvent) => {
+ const myUserId = MatrixClientPeg.get().getUserId();
+ if (ev.getType() === 'm.room.member' && ev.getSender() === myUserId && ev.getStateKey() === myUserId) {
+ // noinspection JSIgnoredPromiseFromCall
+ this.onProfileUpdate();
+ }
+ }, 200, {trailing: true, leading: true});
+
+ private onProfileUpdate = async () => {
+ // the store triggered an update, so force a layout update. We don't
+ // have any state to store here for that to magically happen.
+ this.forceUpdate();
+ };
+
private onSearch = (term: string): void => {
this.setState({searchFilter: term});
};
@@ -86,21 +117,60 @@ export default class LeftPanel2 extends React.Component {
}
};
+ private handleStickyHeaders(list: HTMLDivElement) {
+ const rlRect = list.getBoundingClientRect();
+ const bottom = rlRect.bottom;
+ const top = rlRect.top;
+ const sublists = list.querySelectorAll(".mx_RoomSublist2");
+ const headerHeight = 32; // Note: must match the CSS!
+ const headerRightMargin = 24; // calculated from margins and widths to align with non-sticky tiles
+
+ const headerStickyWidth = rlRect.width - headerRightMargin;
+
+ let gotBottom = false;
+ for (const sublist of sublists) {
+ const slRect = sublist.getBoundingClientRect();
+
+ const header = sublist.querySelector(".mx_RoomSublist2_stickable");
+
+ if (slRect.top + headerHeight > bottom && !gotBottom) {
+ header.classList.add("mx_RoomSublist2_headerContainer_sticky");
+ header.classList.add("mx_RoomSublist2_headerContainer_stickyBottom");
+ header.style.width = `${headerStickyWidth}px`;
+ header.style.top = `unset`;
+ gotBottom = true;
+ } else if (slRect.top < top) {
+ header.classList.add("mx_RoomSublist2_headerContainer_sticky");
+ header.classList.add("mx_RoomSublist2_headerContainer_stickyTop");
+ header.style.width = `${headerStickyWidth}px`;
+ header.style.top = `${rlRect.top}px`;
+ } else {
+ header.classList.remove("mx_RoomSublist2_headerContainer_sticky");
+ header.classList.remove("mx_RoomSublist2_headerContainer_stickyTop");
+ header.classList.remove("mx_RoomSublist2_headerContainer_stickyBottom");
+ header.style.width = `unset`;
+ header.style.top = `unset`;
+ }
+ }
+ }
+
+ // TODO: Apply this on resize, init, etc for reliability
+ private onScroll = (ev: React.MouseEvent) => {
+ const list = ev.target as HTMLDivElement;
+ this.handleStickyHeaders(list);
+ };
+
+ private onResize = () => {
+ if (!this.listContainerRef.current) return; // ignore: no headers to sticky
+ this.handleStickyHeaders(this.listContainerRef.current);
+ };
+
private renderHeader(): React.ReactNode {
// TODO: Update when profile info changes
// TODO: Presence
// TODO: Breadcrumbs toggle
// TODO: Menu button
- const avatarSize = 32;
- // TODO: Don't do this profile lookup in render()
- const client = MatrixClientPeg.get();
- let displayName = client.getUserId();
- let avatarUrl: string = null;
- const myUser = client.getUser(client.getUserId());
- if (myUser) {
- displayName = myUser.rawDisplayName;
- avatarUrl = myUser.avatarUrl;
- }
+ const avatarSize = 32; // should match border-radius of the avatar
let breadcrumbs;
if (this.state.showBreadcrumbs) {
@@ -111,7 +181,7 @@ export default class LeftPanel2 extends React.Component {
);
}
- let name = {displayName};
+ let name = {OwnProfileStore.instance.displayName};
let buttons = (
{
{
);
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index f37f77b31b..1bc656e6a3 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -677,7 +677,10 @@ class LoggedInView extends React.PureComponent{ _t("Room") }: { roomName }
+{ _t("Room") }: { room.name }
+
{_t("Home")}
- {this.displayName}
+ {OwnProfileStore.instance.displayName}
{MatrixClientPeg.get().getUserId()}
@@ -233,31 +231,31 @@ export default class UserMenuButton extends React.Component {
{homeButton}
this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}>
- ![]({require("../../../res/img/feather-customised/notifications.svg")})
+
{_t("Notification settings")}
this.onSettingsOpen(e, USER_SECURITY_TAB)}>
- ![]({require("../../../res/img/feather-customised/lock.svg")})
+
{_t("Security & privacy")}
this.onSettingsOpen(e, null)}>
- ![]({require("../../../res/img/feather-customised/settings.svg")})
+
{_t("All settings")}
- ![]({require("../../../res/img/feather-customised/archive.svg")})
+
{_t("Archived rooms")}
- ![]({require("../../../res/img/feather-customised/message-circle.svg")})
+
{_t("Feedback")}
@@ -267,7 +265,7 @@ export default class UserMenuButton extends React.Component {
);
- } else if (phase === PHASE_RECOVERY_KEY) {
- const store = SetupEncryptionStore.sharedInstance();
- let keyPrompt;
- if (keyHasPassphrase(store.keyInfo)) {
- keyPrompt = _t(
- "Enter your Recovery Key or enter a Recovery Passphrase to continue.", {},
- {
- a: sub =>
+
{_t("Notification settings")}
+
{_t("Security & privacy")}
+
{_t("All settings")}
+
{_t("Archived rooms")}
+
{_t("Feedback")}
-
- ![]({require("../../../res/img/feather-customised/sign-out.svg")})
+
{_t("Sign out")}
@@ -287,10 +285,10 @@ export default class UserMenuButton extends React.Component
![...]({require("../../../res/img/feather-customised/more-horizontal.svg")})
+ {/* masked image in CSS */}
{contextMenu}
- )
+ );
}
}
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index e38ecd3eac..c73691611d 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -21,7 +21,6 @@ import * as sdk from '../../../index';
import {
SetupEncryptionStore,
PHASE_INTRO,
- PHASE_RECOVERY_KEY,
PHASE_BUSY,
PHASE_DONE,
PHASE_CONFIRM_SKIP,
@@ -62,9 +61,6 @@ export default class CompleteSecurity extends React.Component {
if (phase === PHASE_INTRO) {
icon = ;
title = _t("Verify this login");
- } else if (phase === PHASE_RECOVERY_KEY) {
- icon = ;
- title = _t("Recovery Key");
} else if (phase === PHASE_DONE) {
icon = ;
title = _t("Session verified");
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 6349614d72..3b5f5676dc 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -378,7 +378,7 @@ export default createReactClass({
}
if (response.access_token) {
- const cli = await this.props.onLoggedIn({
+ await this.props.onLoggedIn({
userId: response.user_id,
deviceId: response.device_id,
homeserverUrl: this.state.matrixClient.getHomeserverUrl(),
@@ -386,7 +386,7 @@ export default createReactClass({
accessToken: response.access_token,
}, this.state.formVals.password);
- this._setupPushers(cli);
+ this._setupPushers();
// we're still busy until we get unmounted: don't show the registration form again
newState.busy = true;
} else {
@@ -397,10 +397,11 @@ export default createReactClass({
this.setState(newState);
},
- _setupPushers: function(matrixClient) {
+ _setupPushers: function() {
if (!this.props.brand) {
return Promise.resolve();
}
+ const matrixClient = MatrixClientPeg.get();
return matrixClient.getPushers().then((resp)=>{
const pushers = resp.pushers;
for (let i = 0; i < pushers.length; ++i) {
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 7886ed26dd..f2e702c8cb 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -19,12 +19,9 @@ import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import * as sdk from '../../../index';
-import withValidation from '../../views/elements/Validation';
-import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
import {
SetupEncryptionStore,
PHASE_INTRO,
- PHASE_RECOVERY_KEY,
PHASE_BUSY,
PHASE_DONE,
PHASE_CONFIRM_SKIP,
@@ -56,11 +53,6 @@ export default class SetupEncryptionBody extends React.Component {
// Because of the latter, it lives in the state.
verificationRequest: store.verificationRequest,
backupInfo: store.backupInfo,
- recoveryKey: '',
- // whether the recovery key is a valid recovery key
- recoveryKeyValid: null,
- // whether the recovery key is the correct key or not
- recoveryKeyCorrect: null,
};
}
@@ -83,19 +75,9 @@ export default class SetupEncryptionBody extends React.Component {
store.stop();
}
- _onResetClick = () => {
+ _onUsePassphraseClick = async () => {
const store = SetupEncryptionStore.sharedInstance();
- store.startKeyReset();
- }
-
- _onUseRecoveryKeyClick = async () => {
- const store = SetupEncryptionStore.sharedInstance();
- store.useRecoveryKey();
- }
-
- _onRecoveryKeyCancelClick() {
- const store = SetupEncryptionStore.sharedInstance();
- store.cancelUseRecoveryKey();
+ store.usePassPhrase();
}
onSkipClick = () => {
@@ -118,66 +100,6 @@ export default class SetupEncryptionBody extends React.Component {
store.done();
}
- _onUsePassphraseClick = () => {
- const store = SetupEncryptionStore.sharedInstance();
- store.usePassPhrase();
- }
-
- _onRecoveryKeyChange = (e) => {
- this.setState({recoveryKey: e.target.value});
- }
-
- _onRecoveryKeyValidate = async (fieldState) => {
- const result = await this._validateRecoveryKey(fieldState);
- this.setState({recoveryKeyValid: result.valid});
- return result;
- }
-
- _validateRecoveryKey = withValidation({
- rules: [
- {
- key: "required",
- test: async (state) => {
- try {
- const decodedKey = decodeRecoveryKey(state.value);
- const correct = await MatrixClientPeg.get().checkSecretStorageKey(
- decodedKey, SetupEncryptionStore.sharedInstance().keyInfo,
- );
- this.setState({
- recoveryKeyValid: true,
- recoveryKeyCorrect: correct,
- });
- return correct;
- } catch (e) {
- this.setState({
- recoveryKeyValid: false,
- recoveryKeyCorrect: false,
- });
- return false;
- }
- },
- invalid: function() {
- if (this.state.recoveryKeyValid) {
- return _t("This isn't the recovery key for your account");
- } else {
- return _t("This isn't a valid recovery key");
- }
- },
- valid: function() {
- return _t("Looks good!");
- },
- },
- ],
- })
-
- _onRecoveryKeyFormSubmit = (e) => {
- e.preventDefault();
- if (!this.state.recoveryKeyCorrect) return;
-
- const store = SetupEncryptionStore.sharedInstance();
- store.setupWithRecoveryKey(decodeRecoveryKey(this.state.recoveryKey));
- }
-
render() {
const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
@@ -196,11 +118,19 @@ export default class SetupEncryptionBody extends React.Component {
} else if (phase === PHASE_INTRO) {
const store = SetupEncryptionStore.sharedInstance();
let recoveryKeyPrompt;
- if (keyHasPassphrase(store.keyInfo)) {
+ if (store.keyInfo && keyHasPassphrase(store.keyInfo)) {
recoveryKeyPrompt = _t("Use Recovery Key or Passphrase");
- } else {
+ } else if (store.keyInfo) {
recoveryKeyPrompt = _t("Use Recovery Key");
}
+
+ let useRecoveryKeyButton;
+ if (recoveryKeyPrompt) {
+ useRecoveryKeyButton = {_t( @@ -224,67 +154,13 @@ export default class SetupEncryptionBody extends React.Component {
-
- {recoveryKeyPrompt}
-
+ {useRecoveryKeyButton}
{_t("Skip")}
- {_t(
- "If you've forgotten your recovery key you can " +
- "", {}, {
- button: sub =>
- {sub}
- ,
- },
- )}
+
;
+ }
+}
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 63bdce3e3b..834edff7df 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -54,6 +54,8 @@ interface IProps {
// If specified, contents will appear as a tooltip on the element and
// validation feedback tooltips will be suppressed.
tooltipContent?: React.ReactNode;
+ // If specified the tooltip will be shown regardless of feedback
+ forceTooltipVisible?: boolean;
// If specified alongside tooltipContent, the class name to apply to the
// tooltip itself.
tooltipClassName?: string;
@@ -85,20 +87,20 @@ interface ITextareaProps extends IProps, TextareaHTMLAttributes-
@@ -115,13 +115,13 @@ export default class Slider extends React.Component {
interface IDotProps {
// Callback for behavior onclick
- onClick: () => void,
+ onClick: () => void;
// Whether the dot should appear active
- active: boolean,
+ active: boolean;
// The label on the dot
- label: string,
+ label: string;
// Whether the slider is disabled
disabled: boolean;
@@ -129,7 +129,7 @@ interface IDotProps {
class Dot extends React.PureComponent {
render(): React.ReactNode {
- let className = "mx_Slider_dot"
+ let className = "mx_Slider_dot";
if (!this.props.disabled && this.props.active) {
className += " mx_Slider_dotActive";
}
diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx
index 341f59d5da..be983828ff 100644
--- a/src/components/views/elements/StyledCheckbox.tsx
+++ b/src/components/views/elements/StyledCheckbox.tsx
@@ -30,7 +30,7 @@ export default class StyledCheckbox extends React.PureComponent
public static readonly defaultProps = {
className: "",
- }
+ };
constructor(props: IProps) {
super(props);
@@ -51,6 +51,6 @@ export default class StyledCheckbox extends React.PureComponent
{ this.props.children }
-
+ ;
}
}
\ No newline at end of file
diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
index fdedd16230..d7ae4d5af8 100644
--- a/src/components/views/elements/StyledRadioButton.tsx
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -26,7 +26,7 @@ interface IState {
export default class StyledRadioButton extends React.PureComponent
+ {badge}
+
+ );
+
// TODO: a11y (see old component)
+ // Note: the addRoomButton conditionally gets moved around
+ // the DOM depending on whether or not the list is minimized.
+ // If we're minimized, we want it below the header so it
+ // doesn't become sticky.
+ // The same applies to the notification badge.
return (
-
- {this.props.label}
-
- {this.renderMenu()}
- {addRoomButton}
- {
const visibleTiles = tiles.slice(0, nVisible);
// If we're hiding rooms, show a 'show more' button to the user. This button
- // floats above the resize handle, if we have one present
- let showMoreButton = null;
+ // floats above the resize handle, if we have one present. If the user has all
+ // tiles visible, it becomes 'show less'.
+ let showNButton = null;
if (tiles.length > nVisible) {
// we have a cutoff condition - add the button to show all
const numMissing = tiles.length - visibleTiles.length;
let showMoreText = (
-
+
{_t("Show %(count)s more", {count: numMissing})}
);
if (this.props.isMinimized) showMoreText = null;
- showMoreButton = (
-
- {badge}
+
);
}}
@@ -303,25 +357,42 @@ export default class RoomSublist2 extends React.Component
+
+
+ {this.props.label}
+
+ {this.renderMenu()}
+ {this.props.isMinimized ? null : addRoomButton}
+ {this.props.isMinimized ? null : badgeContainer}
+ {this.props.isMinimized ? badgeContainer : null}
+ {this.props.isMinimized ? addRoomButton : null}
-
+ showNButton = (
+ {
// goes backwards and can become wildly incorrect (visibleTiles says 18 when there's
// only mathematically 7 possible).
- const showMoreHeight = 32; // As defined by CSS
- const resizeHandleHeight = 4; // As defined by CSS
-
// The padding is variable though, so figure out what we need padding for.
let padding = 0;
- if (showMoreButton) padding += showMoreHeight;
- if (handles.length > 0) padding += resizeHandleHeight;
+ if (showNButton) padding += SHOW_N_BUTTON_HEIGHT;
+ padding += RESIZE_HANDLE_HEIGHT; // always append the handle height
- const minTilesPx = layout.calculateTilesToPixelsMin(tiles.length, layout.minVisibleTiles, padding);
+ const relativeTiles = layout.tilesWithPadding(tiles.length, padding);
+ const minTilesPx = layout.calculateTilesToPixelsMin(relativeTiles, layout.minVisibleTiles, padding);
const maxTilesPx = layout.tilesToPixelsWithPadding(tiles.length, padding);
- const tilesWithoutPadding = Math.min(tiles.length, layout.visibleTiles);
- const tilesPx = layout.calculateTilesToPixelsMin(tiles.length, tilesWithoutPadding, padding);
+ const tilesWithoutPadding = Math.min(relativeTiles, layout.visibleTiles);
+ const tilesPx = layout.calculateTilesToPixelsMin(relativeTiles, tilesWithoutPadding, padding);
content = (
{
className="mx_RoomSublist2_resizeBox"
>
{visibleTiles}
- {showMoreButton}
+ {showNButton}
- )
+ );
}
// TODO: onKeyDown support
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 10845d3840..18b4ee8185 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -21,16 +21,21 @@ import React, { createRef } from "react";
import { Room } from "matrix-js-sdk/src/models/room";
import classNames from "classnames";
import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
-import AccessibleButton, {ButtonEvent} from "../../views/elements/AccessibleButton";
+import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
import RoomAvatar from "../../views/avatars/RoomAvatar";
import dis from '../../../dispatcher/dispatcher';
import { Key } from "../../../Keyboard";
import ActiveRoomObserver from "../../../ActiveRoomObserver";
-import NotificationBadge, { INotificationState, NotificationColor, RoomNotificationState } from "./NotificationBadge";
+import NotificationBadge, {
+ INotificationState,
+ NotificationColor,
+ TagSpecificNotificationState
+} from "./NotificationBadge";
import { _t } from "../../../languageHandler";
import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
import { DefaultTagID, TagID } from "../../../stores/room-list/models";
import { MessagePreviewStore } from "../../../stores/MessagePreviewStore";
+import RoomTileIcon from "./RoomTileIcon";
/*******************************************************************
* CAUTION *
@@ -44,6 +49,7 @@ interface IProps {
room: Room;
showMessagePreview: boolean;
isMinimized: boolean;
+ tag: TagID;
// TODO: Allow falsifying counts (for invites and stuff)
// TODO: Transparency? Was this ever used?
@@ -77,7 +83,7 @@ export default class RoomTile2 extends React.Component {
this.state = {
hover: false,
- notificationState: new RoomNotificationState(this.props.room),
+ notificationState: new TagSpecificNotificationState(this.props.room, this.props.tag),
selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
generalMenuDisplayed: false,
};
@@ -230,7 +236,7 @@ export default class RoomTile2 extends React.Component {
/>
{contextMenu}
- )
+ );
}
public render(): React.ReactElement {
@@ -246,7 +252,13 @@ export default class RoomTile2 extends React.Component {
'mx_RoomTile2_minimized': this.props.isMinimized,
});
- const badge = {
role="treeitem"
>
+
{/* set by CSS masking */}
{showMoreText}
);
+ } else if (tiles.length <= nVisible && tiles.length > this.props.layout.minVisibleTiles) {
+ // we have all tiles visible - add a button to show less
+ let showLessText = (
+
+ {_t("Show less")}
+
+ );
+ if (this.props.isMinimized) showLessText = null;
+ showNButton = (
+
+
+ {/* set by CSS masking */}
+
+ {showLessText}
+
+ );
}
// Figure out if we need a handle
@@ -340,18 +411,16 @@ export default class RoomSublist2 extends React.Component
-
+
{nameContainer}
diff --git a/src/components/views/rooms/RoomTileIcon.tsx b/src/components/views/rooms/RoomTileIcon.tsx
new file mode 100644
index 0000000000..b0cf10e313
--- /dev/null
+++ b/src/components/views/rooms/RoomTileIcon.tsx
@@ -0,0 +1,150 @@
+/*
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
+import { User } from "matrix-js-sdk/src/models/user";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { isPresenceEnabled } from "../../../utils/presence";
+
+enum Icon {
+ // Note: the names here are used in CSS class names
+ None = "NONE", // ... except this one
+ Globe = "GLOBE",
+ PresenceOnline = "ONLINE",
+ PresenceAway = "AWAY",
+ PresenceOffline = "OFFLINE",
+}
+
+interface IProps {
+ room: Room;
+ tag: TagID;
+}
+
+interface IState {
+ icon: Icon;
+}
+
+export default class RoomTileIcon extends React.Component {
+ private _dmUser: User;
+ private isUnmounted = false;
+ private isWatchingTimeline = false;
+
+ constructor(props: IProps) {
+ super(props);
+
+ this.state = {
+ icon: this.calculateIcon(),
+ };
+ }
+
+ private get isPublicRoom(): boolean {
+ const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+ const joinRule = joinRules && joinRules.getContent().join_rule;
+ return joinRule === 'public';
+ }
+
+ private get dmUser(): User {
+ return this._dmUser;
+ }
+
+ private set dmUser(val: User) {
+ const oldUser = this._dmUser;
+ this._dmUser = val;
+ if (oldUser && oldUser !== this._dmUser) {
+ oldUser.off('User.currentlyActive', this.onPresenceUpdate);
+ oldUser.off('User.presence', this.onPresenceUpdate);
+ }
+ if (this._dmUser && oldUser !== this._dmUser) {
+ this._dmUser.on('User.currentlyActive', this.onPresenceUpdate);
+ this._dmUser.on('User.presence', this.onPresenceUpdate);
+ }
+ }
+
+ public componentWillUnmount() {
+ this.isUnmounted = true;
+ if (this.isWatchingTimeline) this.props.room.off('Room.timeline', this.onRoomTimeline);
+ this.dmUser = null; // clear listeners, if any
+ }
+
+ private onRoomTimeline = (ev: MatrixEvent, room: Room) => {
+ if (this.isUnmounted) return;
+
+ // apparently these can happen?
+ if (!room) return;
+ if (this.props.room.roomId !== room.roomId) return;
+
+ if (ev.getType() === 'm.room.join_rules' || ev.getType() === 'm.room.member') {
+ this.setState({icon: this.calculateIcon()});
+ }
+ };
+
+ private onPresenceUpdate = () => {
+ if (this.isUnmounted) return;
+
+ let newIcon = this.getPresenceIcon();
+ if (newIcon !== this.state.icon) this.setState({icon: newIcon});
+ };
+
+ private getPresenceIcon(): Icon {
+ if (!this.dmUser) return Icon.None;
+
+ let icon = Icon.None;
+
+ const isOnline = this.dmUser.currentlyActive || this.dmUser.presence === 'online';
+ if (isOnline) {
+ icon = Icon.PresenceOnline;
+ } else if (this.dmUser.presence === 'offline') {
+ icon = Icon.PresenceOffline;
+ } else if (this.dmUser.presence === 'unavailable') {
+ icon = Icon.PresenceAway;
+ }
+
+ return icon;
+ }
+
+ private calculateIcon(): Icon {
+ let icon = Icon.None;
+
+ if (this.props.tag === DefaultTagID.DM && this.props.room.getJoinedMemberCount() === 2) {
+ // Track presence, if available
+ if (isPresenceEnabled()) {
+ const otherUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+ if (otherUserId) {
+ this.dmUser = MatrixClientPeg.get().getUser(otherUserId);
+ icon = this.getPresenceIcon();
+ }
+ }
+ } else {
+ // Track publicity
+ icon = this.isPublicRoom ? Icon.Globe : Icon.None;
+ if (!this.isWatchingTimeline) {
+ this.props.room.on('Room.timeline', this.onRoomTimeline);
+ this.isWatchingTimeline = true;
+ }
+ }
+ return icon;
+ }
+
+ public render(): React.ReactElement {
+ if (this.state.icon === Icon.None) return null;
+
+ return ;
+ }
+}
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index f48ee3cd0d..aa512d4365 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -113,7 +113,7 @@ export default class CrossSigningPanel extends React.PureComponent {
_bootstrapSecureSecretStorage = async (forceReset=false) => {
this.setState({ error: null });
try {
- await accessSecretStorage(() => undefined, {forceReset});
+ await accessSecretStorage(() => undefined, forceReset);
} catch (e) {
this.setState({ error: e });
console.error("Error bootstrapping secret storage", e);
@@ -154,13 +154,6 @@ export default class CrossSigningPanel extends React.PureComponent {
errorSection =
@@ -197,10 +201,7 @@ export default class CrossSigningPanel extends React.PureComponent {
// TODO: determine how better to expose this to users in addition to prompts at login/toast
let bootstrapButton;
- if (
- (!enabledForAccount || !crossSigningPublicKeysOnDevice) &&
- homeserverSupportsCrossSigning
- ) {
+ if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
bootstrapButton = (
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index fe575c2819..e935663bbe 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -19,10 +19,8 @@ limitations under the License.
import React from 'react';
import {_t} from "../../../../../languageHandler";
import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
-import * as sdk from "../../../../../index";
import { enumerateThemes } from "../../../../../theme";
import ThemeWatcher from "../../../../../settings/watchers/ThemeWatcher";
-import Field from "../../../elements/Field";
import Slider from "../../../elements/Slider";
import AccessibleButton from "../../../elements/AccessibleButton";
import dis from "../../../../../dispatcher/dispatcher";
@@ -30,31 +28,42 @@ import { FontWatcher } from "../../../../../settings/watchers/FontWatcher";
import { RecheckThemePayload } from '../../../../../dispatcher/payloads/RecheckThemePayload';
import { Action } from '../../../../../dispatcher/actions';
import { IValidationResult, IFieldState } from '../../../elements/Validation';
+import StyledRadioButton from '../../../elements/StyledRadioButton';
+import StyledCheckbox from '../../../elements/StyledCheckbox';
+import SettingsFlag from '../../../elements/SettingsFlag';
+import Field from '../../../elements/Field';
+import EventTilePreview from '../../../elements/EventTilePreview';
interface IProps {
}
interface IThemeState {
- theme: string,
- useSystemTheme: boolean,
+ theme: string;
+ useSystemTheme: boolean;
}
export interface CustomThemeMessage {
- isError: boolean,
- text: string
-};
+ isError: boolean;
+ text: string;
+}
interface IState extends IThemeState {
// String displaying the current selected fontSize.
// Needs to be string for things like '17.' without
// trailing 0s.
- fontSize: string,
- customThemeUrl: string,
- customThemeMessage: CustomThemeMessage,
- useCustomFontSize: boolean,
+ fontSize: string;
+ customThemeUrl: string;
+ customThemeMessage: CustomThemeMessage;
+ useCustomFontSize: boolean;
+ useSystemFont: boolean;
+ systemFont: string;
+ showAdvanced: boolean;
+ useIRCLayout: boolean;
}
+
export default class AppearanceUserSettingsTab extends React.Component {
+ private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
private themeTimer: NodeJS.Timeout;
@@ -67,6 +76,10 @@ export default class AppearanceUserSettingsTab extends React.Component => {
let currentThemes: string[] = SettingsStore.getValue("custom_themes");
@@ -197,11 +210,17 @@ export default class AppearanceUserSettingsTab extends React.Component): void => {
+ const val = e.target.value === "true";
+ this.setState({
+ useIRCLayout: val,
+ });
+
+ SettingsStore.setValue("useIRCLayout", null, SettingLevel.DEVICE, val);
+ };
+
+ private renderThemeSection() {
const themeWatcher = new ThemeWatcher();
let systemThemeSection: JSX.Element;
if (themeWatcher.isSystemThemeSupported()) {
@@ -263,7 +282,7 @@ export default class AppearanceUserSettingsTab extends React.Component
+
{_t("Font size")}
+ this.setState({useCustomFontSize: checked})}
useCheckbox={true}
/>
+
;
}
+ private renderLayoutSection = () => {
+ return
);
diff --git a/src/components/views/terms/InlineTermsAgreement.js b/src/components/views/terms/InlineTermsAgreement.js
index bccd686cd3..55719fe57f 100644
--- a/src/components/views/terms/InlineTermsAgreement.js
+++ b/src/components/views/terms/InlineTermsAgreement.js
@@ -18,6 +18,7 @@ import React from "react";
import PropTypes from "prop-types";
import {_t, pickBestLanguage} from "../../../languageHandler";
import * as sdk from "../../..";
+import {objectClone} from "../../../utils/objects";
export default class InlineTermsAgreement extends React.Component {
static propTypes = {
@@ -56,7 +57,7 @@ export default class InlineTermsAgreement extends React.Component {
}
_togglePolicy = (index) => {
- const policies = JSON.parse(JSON.stringify(this.state.policies)); // deep & cheap clone
+ const policies = objectClone(this.state.policies);
policies[index].checked = !policies[index].checked;
this.setState({policies});
};
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 38e7e31989..cc41e81b33 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -90,7 +90,7 @@ export default class VerificationRequestToast extends React.PureComponent {
ToastStore.sharedInstance().dismissToast(this.props.toastKey);
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 5f7ca1293c..379a0a4451 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -69,4 +69,14 @@ export enum Action {
* Opens the user menu (previously known as the top left menu). No additional payload information required.
*/
ToggleUserMenu = "toggle_user_menu",
+
+ /**
+ * Sets the apps root font size. Should be used with UpdateFontSizePayload
+ */
+ UpdateFontSize = "update_font_size",
+
+ /**
+ * Sets a system font. Should be used with UpdateSystemFontPayload
+ */
+ UpdateSystemFont = "update_system_font",
}
diff --git a/src/dispatcher/payloads/CheckUpdatesPayload.ts b/src/dispatcher/payloads/CheckUpdatesPayload.ts
index 0f0f9a01e5..fa4fb3a538 100644
--- a/src/dispatcher/payloads/CheckUpdatesPayload.ts
+++ b/src/dispatcher/payloads/CheckUpdatesPayload.ts
@@ -19,7 +19,7 @@ import { Action } from "../actions";
import {UpdateCheckStatus} from "../../BasePlatform";
export interface CheckUpdatesPayload extends ActionPayload {
- action: Action.CheckUpdates,
+ action: Action.CheckUpdates;
/**
* The current phase of the manual update check.
diff --git a/src/dispatcher/payloads/OpenToTabPayload.ts b/src/dispatcher/payloads/OpenToTabPayload.ts
index 2877ee053e..7548c342e4 100644
--- a/src/dispatcher/payloads/OpenToTabPayload.ts
+++ b/src/dispatcher/payloads/OpenToTabPayload.ts
@@ -18,7 +18,7 @@ import { ActionPayload } from "../payloads";
import { Action } from "../actions";
export interface OpenToTabPayload extends ActionPayload {
- action: Action.ViewUserSettings | string, // TODO: Add room settings action
+ action: Action.ViewUserSettings | string; // TODO: Add room settings action
/**
* The tab ID to open in the settings view to start, if possible.
diff --git a/src/dispatcher/payloads/RecheckThemePayload.ts b/src/dispatcher/payloads/RecheckThemePayload.ts
index 06f7012049..e9bea612e0 100644
--- a/src/dispatcher/payloads/RecheckThemePayload.ts
+++ b/src/dispatcher/payloads/RecheckThemePayload.ts
@@ -18,7 +18,7 @@ import { ActionPayload } from "../payloads";
import { Action } from "../actions";
export interface RecheckThemePayload extends ActionPayload {
- action: Action.RecheckTheme,
+ action: Action.RecheckTheme;
/**
* Optionally specify the exact theme which is to be loaded.
diff --git a/src/dispatcher/payloads/UpdateFontSizePayload.ts b/src/dispatcher/payloads/UpdateFontSizePayload.ts
new file mode 100644
index 0000000000..6577acd594
--- /dev/null
+++ b/src/dispatcher/payloads/UpdateFontSizePayload.ts
@@ -0,0 +1,27 @@
+/*
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface UpdateFontSizePayload extends ActionPayload {
+ action: Action.UpdateFontSize;
+
+ /**
+ * The font size to set the root to
+ */
+ size: number;
+}
diff --git a/src/dispatcher/payloads/UpdateSystemFontPayload.ts b/src/dispatcher/payloads/UpdateSystemFontPayload.ts
new file mode 100644
index 0000000000..aa59db5aa9
--- /dev/null
+++ b/src/dispatcher/payloads/UpdateSystemFontPayload.ts
@@ -0,0 +1,32 @@
+/*
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface UpdateSystemFontPayload extends ActionPayload {
+ action: Action.UpdateSystemFont;
+
+ /**
+ * Specify whether to use a system font or the stylesheet font
+ */
+ useSystemFont: boolean;
+
+ /**
+ * The system font to use
+ */
+ font: string;
+}
diff --git a/src/dispatcher/payloads/ViewTooltipPayload.ts b/src/dispatcher/payloads/ViewTooltipPayload.ts
index 8778287128..069e3a619a 100644
--- a/src/dispatcher/payloads/ViewTooltipPayload.ts
+++ b/src/dispatcher/payloads/ViewTooltipPayload.ts
@@ -19,7 +19,7 @@ import { Action } from "../actions";
import { Component } from "react";
export interface ViewTooltipPayload extends ActionPayload {
- action: Action.ViewTooltip,
+ action: Action.ViewTooltip;
/*
* The tooltip to render. If it's null the tooltip will not be rendered
@@ -31,5 +31,5 @@ export interface ViewTooltipPayload extends ActionPayload {
* The parent under which to render the tooltip. Can be null to remove
* the parent type.
*/
- parent: null | Element
+ parent: null | Element;
}
\ No newline at end of file
diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts
index ed602d4e24..c2838d0dbb 100644
--- a/src/dispatcher/payloads/ViewUserPayload.ts
+++ b/src/dispatcher/payloads/ViewUserPayload.ts
@@ -19,7 +19,7 @@ import { ActionPayload } from "../payloads";
import { Action } from "../actions";
export interface ViewUserPayload extends ActionPayload {
- action: Action.ViewUser,
+ action: Action.ViewUser;
/**
* The member to view. May be null or falsy to indicate that no member
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index 4d0b8cd03a..7e8f4a3bfc 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -42,6 +42,10 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
if (!parser.isPlainText() || forceHTML) {
return parser.toHTML();
}
+ // ensure removal of escape backslashes in non-Markdown messages
+ if (md.indexOf("\\") > -1) {
+ return parser.toPlaintext();
+ }
}
export function textSerialize(model: EditorModel) {
@@ -62,16 +66,20 @@ export function textSerialize(model: EditorModel) {
}
export function containsEmote(model: EditorModel) {
- return startsWith(model, "/me ");
+ return startsWith(model, "/me ", false);
}
-export function startsWith(model: EditorModel, prefix: string) {
+export function startsWith(model: EditorModel, prefix: string, caseSensitive = true) {
const firstPart = model.parts[0];
// part type will be "plain" while editing,
// and "command" while composing a message.
- return firstPart &&
- (firstPart.type === "plain" || firstPart.type === "command") &&
- firstPart.text.startsWith(prefix);
+ let text = firstPart && firstPart.text;
+ if (!caseSensitive) {
+ prefix = prefix.toLowerCase();
+ text = text.toLowerCase();
+ }
+
+ return firstPart && (firstPart.type === "plain" || firstPart.type === "command") && text.startsWith(prefix);
}
export function stripEmoteCommand(model: EditorModel) {
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c559447757..143e3534c3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1367,7 +1367,7 @@
"Sends the given message coloured as a rainbow": "Sendet die Nachricht in Regenbogenfarben",
"Adds a custom widget by URL to the room": "Fügt ein Benutzer-Widget über eine URL zum Raum hinzu",
"Please supply a https:// or http:// widget URL": "Bitte gib eine https:// oder http:// Widget-URL an",
- "Sends the given emote coloured as a rainbow": "Sended das Emoji in Regenbogenfarben",
+ "Sends the given emote coloured as a rainbow": "Sendet das Emoji in Regenbogenfarben",
"%(senderName)s made no change.": "%(senderName)s hat keine Änderung vorgenommen.",
"%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung zum Raumbeitritt für %(targetDisplayName)s zurückgezogen.",
"Cannot reach homeserver": "Der Heimserver ist nicht erreichbar",
@@ -2242,8 +2242,8 @@
"An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Beim Ändern der Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
"Unable to share email address": "E-Mail Adresse konnte nicht geteilt werden",
"Please enter verification code sent via text.": "Gib den Verifikationscode ein, den du empfangen hast.",
- "Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung die gleichen Zeichen?",
- "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Werden bei %(displayName)s die gleichen Zeichen angezeigt?",
+ "Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung das gleiche Schild?",
+ "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Wird bei %(displayName)s das gleiche Schild angezeigt?",
"Click the link in the email you received to verify and then click continue again.": "Klicke auf den Link in der Bestätigungs-E-Mail, und dann auf Weiter.",
"Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
"Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
@@ -2449,5 +2449,18 @@
"Show %(count)s more|other": "Zeige %(count)s weitere",
"Show %(count)s more|one": "Zeige %(count)s weitere",
"Leave Room": "Verlasse Raum",
- "Room options": "Raumoptionen"
+ "Room options": "Raumoptionen",
+ "Activity": "Aktivität",
+ "A-Z": "A-Z",
+ "Recovery Key": "Wiederherstellungsschlüssel",
+ "This isn't the recovery key for your account": "Das ist nicht der Wiederherstellungsschlüssel für dein Konto",
+ "This isn't a valid recovery key": "Das ist kein gültiger Wiederherstellungsschlüssel",
+ "Looks good!": "Sieht gut aus!",
+ "Use Recovery Key or Passphrase": "Verwende einen Wiederherstellungsschlüssel oder deine Passphrase",
+ "Use Recovery Key": "Verwende einen Wiederherstellungsschlüssel",
+ "Enter your Recovery Key or enter a Recovery Passphrase to continue.": "Gib deinen Wiederherstellungsschlüssel oder eine Wiederherstellungspassphrase ein um fortzufahren.",
+ "Enter your Recovery Key to continue.": "Gib deinen Wiederherstellungsschlüssel ein um fortzufahren.",
+ "Create a Recovery Key": "Erzeuge einen Wiederherstellungsschlüssel",
+ "Upgrade your Recovery Key": "Aktualisiere deinen Wiederherstellungsschlüssel",
+ "Store your Recovery Key": "Speichere deinen Wiederherstellungsschlüssel"
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 396c3f9111..74e747726a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -148,6 +148,7 @@
"Actions": "Actions",
"Advanced": "Advanced",
"Other": "Other",
+ "Command error": "Command error",
"Usage": "Usage",
"Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
"Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
@@ -421,6 +422,7 @@
"Upgrade your Riot": "Upgrade your Riot",
"A new version of Riot is available!": "A new version of Riot is available!",
"You: %(message)s": "You: %(message)s",
+ "Guest": "Guest",
"There was an error joining the room": "There was an error joining the room",
"Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
@@ -432,12 +434,12 @@
"Render simple counters in room header": "Render simple counters in room header",
"Multiple integration managers": "Multiple integration managers",
"Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
- "Use the improved room list (in development - refresh to apply changes)": "Use the improved room list (in development - refresh to apply changes)",
+ "Use the improved room list (will refresh to apply changes)": "Use the improved room list (will refresh to apply changes)",
"Support adding custom themes": "Support adding custom themes",
- "Use IRC layout": "Use IRC layout",
+ "Enable IRC layout option in the appearance tab": "Enable IRC layout option in the appearance tab",
"Show info about bridges in room settings": "Show info about bridges in room settings",
"Font size": "Font size",
- "Custom font size": "Custom font size",
+ "Use custom size": "Use custom size",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
"Use compact timeline layout": "Use compact timeline layout",
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
@@ -459,6 +461,8 @@
"Mirror local video feed": "Mirror local video feed",
"Enable Community Filter Panel": "Enable Community Filter Panel",
"Match system theme": "Match system theme",
+ "Use a system font": "Use a system font",
+ "System font name": "System font name",
"Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
"Send analytics data": "Send analytics data",
"Never send encrypted messages to unverified sessions from this session": "Never send encrypted messages to unverified sessions from this session",
@@ -479,10 +483,10 @@
"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",
- "Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session",
"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",
+ "Use IRC layout": "Use IRC layout",
"Collecting app version information": "Collecting app version information",
"Collecting logs": "Collecting logs",
"Uploading report": "Uploading report",
@@ -770,6 +774,7 @@
"Downloading update...": "Downloading update...",
"New version available. Update now.": "New version available. Update now.",
"Check for update": "Check for update",
+ "Hey you. You're the best!": "Hey you. You're the best!",
"Size must be a number": "Size must be a number",
"Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt",
"Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt",
@@ -779,6 +784,9 @@
"Custom theme URL": "Custom theme URL",
"Add theme": "Add theme",
"Theme": "Theme",
+ "Message layout": "Message layout",
+ "Compact": "Compact",
+ "Modern": "Modern",
"Customise your appearance": "Customise your appearance",
"Appearance Settings only affect this Riot session.": "Appearance Settings only affect this Riot session.",
"Flair": "Flair",
@@ -1023,6 +1031,7 @@
"Encrypted by an unverified session": "Encrypted by an unverified session",
"Unencrypted": "Unencrypted",
"Encrypted by a deleted session": "Encrypted by a deleted session",
+ "The authenticity of this encrypted message can't be guaranteed on this device.": "The authenticity of this encrypted message can't be guaranteed on this device.",
"Please select the destination room for this message": "Please select the destination room for this message",
"Invite only": "Invite only",
"Scroll to most recent messages": "Scroll to most recent messages",
@@ -1170,7 +1179,6 @@
"All Rooms": "All Rooms",
"Search…": "Search…",
"Server error": "Server error",
- "Command error": "Command error",
"Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
"Unknown Command": "Unknown Command",
"Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
@@ -2039,7 +2047,6 @@
"Search failed": "Search failed",
"Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
"No more results": "No more results",
- "Unknown room %(roomId)s": "Unknown room %(roomId)s",
"Room": "Room",
"Failed to reject invite": "Failed to reject invite",
"You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
@@ -2053,7 +2060,6 @@
"Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
"Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
"Failed to load timeline position": "Failed to load timeline position",
- "Guest": "Guest",
"Your profile": "Your profile",
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
@@ -2068,7 +2074,6 @@
"Account settings": "Account settings",
"Could not load user profile": "Could not load user profile",
"Verify this login": "Verify this login",
- "Recovery Key": "Recovery Key",
"Session verified": "Session verified",
"Failed to send email": "Failed to send email",
"The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
@@ -2122,16 +2127,11 @@
"You can now close this window or log in to your new account.": "You can now close this window or log in to your new account.",
"Registration Successful": "Registration Successful",
"Create your account": "Create your account",
- "This isn't the recovery key for your account": "This isn't the recovery key for your account",
- "This isn't a valid recovery key": "This isn't a valid recovery key",
- "Looks good!": "Looks good!",
"Use Recovery Key or Passphrase": "Use Recovery Key or Passphrase",
"Use Recovery Key": "Use Recovery Key",
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.",
"This requires the latest Riot on your other devices:": "This requires the latest Riot on your other devices:",
"or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
- "Enter your Recovery Key or enter a Recovery Passphrase to continue.": "Enter your Recovery Key or enter a Recovery Passphrase to continue.",
- "Enter your Recovery Key to continue.": "Enter your Recovery Key to continue.",
"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
"Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
"Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
@@ -2175,43 +2175,47 @@
"Confirm encryption setup": "Confirm encryption setup",
"Click the button below to confirm setting up encryption.": "Click the button below to confirm setting up encryption.",
"Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
+ "Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
+ "Restore": "Restore",
"You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
- "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.",
- "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.",
- "Download": "Download",
- "Copy": "Copy",
- "Unable to query secret storage status": "Unable to query secret storage status",
- "Retry": "Retry",
- "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.",
- "Create a Recovery Key": "Create a Recovery Key",
- "Upgrade your Recovery Key": "Upgrade your Recovery Key",
- "Store your Recovery Key": "Store your Recovery Key",
- "Unable to set up secret storage": "Unable to set up secret storage",
- "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
- "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
+ "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
+ "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
"Enter a recovery passphrase": "Enter a recovery passphrase",
"Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
+ "Back up encrypted message keys": "Back up encrypted message keys",
"Set up with a recovery key": "Set up with a recovery key",
"That matches!": "That matches!",
"Use a different passphrase?": "Use a different passphrase?",
"That doesn't match.": "That doesn't match.",
"Go back to set it again.": "Go back to set it again.",
- "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
- "Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
+ "Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",
+ "Confirm your recovery passphrase": "Confirm your recovery passphrase",
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.",
"Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
"Your recovery key": "Your recovery key",
+ "Copy": "Copy",
+ "Download": "Download",
"Your recovery key has been copied to your clipboard, paste it to:": "Your recovery key has been copied to your clipboard, paste it to:",
"Your recovery key is in your Downloads folder.": "Your recovery key is in your Downloads folder.",
"Print it and store it somewhere safe": "Print it and store it somewhere safe",
"Save it on a USB key or backup drive": "Save it on a USB key or backup drive",
"Copy it to your personal cloud storage": "Copy it to your personal cloud storage",
+ "Unable to query secret storage status": "Unable to query secret storage status",
+ "Retry": "Retry",
+ "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
+ "Upgrade your encryption": "Upgrade your encryption",
+ "Confirm recovery passphrase": "Confirm recovery passphrase",
+ "Make a copy of your recovery key": "Make a copy of your recovery key",
+ "You're done!": "You're done!",
+ "Unable to set up secret storage": "Unable to set up secret storage",
+ "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
+ "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
+ "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
+ "Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
"Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
"Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
"Set up Secure Message Recovery": "Set up Secure Message Recovery",
"Secure your backup with a recovery passphrase": "Secure your backup with a recovery passphrase",
- "Confirm your recovery passphrase": "Confirm your recovery passphrase",
- "Make a copy of your recovery key": "Make a copy of your recovery key",
"Starting backup...": "Starting backup...",
"Success!": "Success!",
"Create key backup": "Create key backup",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index fa4fe703b6..11012a9045 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2374,7 +2374,7 @@
"Signing In...": "Salutante…",
"If you've joined lots of rooms, this might take a while": "Se vi aliĝis al multaj ĉambroj, tio povas daŭri longe",
"Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Konfirmu vian identecon per kontrolo de ĉi tiu saluto el unu el viaj aliaj salutaĵoj, permesante al ĝi legadon de ĉifritaj mesaĝoj.",
- "This requires the latest Riot on your other devices:": "Ĉi tio bezonas la plej freŝan version de Rion sur viaj aliaj aparatoj:",
+ "This requires the latest Riot on your other devices:": "Ĉi tio bezonas la plej freŝan version de Riot en viaj aliaj aparatoj:",
"or another cross-signing capable Matrix client": "aŭ alian Matrix-klienton kapablan je transiraj subskriboj",
"Use Recovery Passphrase or Key": "Uzi rehavajn pasfrazon aŭ ŝlosilon",
"Great! This recovery passphrase looks strong enough.": "Bonege! Ĉi tiu rehava pasfrazo ŝajnas sufiĉe forta.",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 6b6058d837..8004e5cd88 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -977,10 +977,10 @@
"User %(user_id)s does not exist": "El usuario %(user_id)s no existe",
"User %(user_id)s may or may not exist": "El usuario %(user_id)s podría o no existir",
"Unknown server error": "Error desconocido del servidor",
- "Use a few words, avoid common phrases": "Usa unas pocas palabras, evita frases comunes",
+ "Use a few words, avoid common phrases": "Usa algunas palabras, evita frases comunes",
"No need for symbols, digits, or uppercase letters": "No hacen falta símbolos, números o letrás en mayúscula",
"Avoid repeated words and characters": "Evita repetir palabras y letras",
- "Avoid sequences": "Evita frases",
+ "Avoid sequences": "Evita secuencias",
"Avoid recent years": "Evita años recientes",
"Avoid years that are associated with you": "Evita años que estén asociados contigo",
"Avoid dates and years that are associated with you": "Evita fechas y años que están asociados contigo",
@@ -1176,10 +1176,10 @@
"Incoming Verification Request": "Petición de verificación entrante",
"%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s",
"%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambió el acceso para invitados a %(rule)s",
- "Use a longer keyboard pattern with more turns": "Usa un patrón de tecleo más largo y con más vueltas",
+ "Use a longer keyboard pattern with more turns": "Usa un patrón de tecleo largo con más vueltas",
"Enable Community Filter Panel": "Habilitar el Panel de Filtro de Comunidad",
"Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
- "Your Riot is misconfigured": "Riot tiene un error de configuración",
+ "Your Riot is misconfigured": "Tu Riot está mal configurado",
"Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
"Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
"A conference call could not be started because the integrations server is not available": "No se pudo iniciar la conferencia porque el servidor de integraciones no está disponible",
@@ -1557,7 +1557,7 @@
"Use your account or create a new one to continue.": "Usa tu cuenta existente o crea una nueva para continuar.",
"Create Account": "Crear cuenta",
"Sign In": "Registrarse",
- "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo como un markdown",
+ "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo en markdown",
"Failed to set topic": "No se ha podido establecer el tema",
"Command failed": "El comando falló",
"Could not find user in room": "No pude encontrar el usuario en la sala",
@@ -1747,7 +1747,7 @@
"Can't find this server or its room list": "No puedo encontrar este servidor o su lista de salas",
"All rooms": "Todas las salas",
"Your server": "Tu",
- "Are you sure you want to remove %(serverName)s": "¿Está seguro de querer eliminar %(serverName)s?",
+ "Are you sure you want to remove %(serverName)s": "¿ Está seguro de querer eliminar %(serverName)s?",
"Remove server": "Quitar servidor",
"Matrix": "Matrix",
"Add a new server": "Añadir un nuevo servidor",
@@ -2065,12 +2065,12 @@
"Unable to restore backup": "No se pudo restaurar la copia de seguridad",
"No backup found!": "¡No se encontró una copia de seguridad!",
"Keys restored": "Se restauraron las claves",
- "Failed to decrypt %(failedCount)s sessions!": "¡Error en desencriptar %(failedCount) sesiones!",
+ "Failed to decrypt %(failedCount)s sessions!": "¡Error en descifrar %(failedCount) sesiones!",
"Successfully restored %(sessionCount)s keys": "%(sessionCount)s claves restauradas con éxito",
- "Warning: you should only set up key backup from a trusted computer.": "Advertencia: sólo debes configurar la copia de seguridad de claves desde un ordenador de su confianza.",
+ "Warning: you should only set up key backup from a trusted computer.": "Advertencia: deberías configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
"Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acceda a su historial de mensajes seguros y configure la mensajería segura introduciendo su contraseña de recuperación.",
"If you've forgotten your recovery passphrase you can use your recovery key or set up new recovery options ": "Si has olvidado tu contraseña de recuperación puedes usar tu clave de recuperación o configurar nuevas opciones de recuperación ",
- "Warning: You should only set up key backup from a trusted computer.": "Advertencia: Sólo debes configurar la copia de seguridad de claves desde un ordenador de su confianza.",
+ "Warning: You should only set up key backup from a trusted computer.": "Advertencia: Configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
"Access your secure message history and set up secure messaging by entering your recovery key.": "Accede a tu historial de mensajes seguros y configura la mensajería segura introduciendo tu clave de recuperación.",
"If you've forgotten your recovery key you can ": "Si has olvidado tu clave de recuperación puedes ",
"Resend edit": "Reenviar la edición",
@@ -2189,5 +2189,7 @@
"Identity server URL does not appear to be a valid identity server": "La URL del servidor de identidad no parece ser un servidor de identidad válido",
"General failure": "Error no especificado",
"This homeserver does not support login using email address.": "Este servidor doméstico no admite iniciar sesión con una dirección de correo electrónico.",
- "This account has been deactivated.": "Esta cuenta ha sido desactivada."
+ "This account has been deactivated.": "Esta cuenta ha sido desactivada.",
+ "Room name or address": "Nombre o dirección de la sala",
+ "Address (optional)": "Dirección (opcional)"
}
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 66bdeb551f..70eec98ec5 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -129,7 +129,7 @@
"Matrix rooms": "Matrix'i jututoad",
"Explore Room State": "Uuri jututoa olekut",
"Explore Account Data": "Uuri konto andmeid",
- "Private Chat": "Privaatne vestlus",
+ "Private Chat": "Omavaheline privaatne vestlus",
"Public Chat": "Avalik vestlus",
"Other users can invite you to rooms using your contact details": "Teades sinu kontaktinfot võivad teised kutsuda sind osalema jututubades",
"Add rooms to the community summary": "Lisa jututoad kogukonna ülevaatesse",
@@ -147,7 +147,7 @@
"Indexed rooms:": "Indekseeritud jututoad:",
"Remove": "Eemalda",
"You should remove your personal data from identity server anonymous usage data which helps us improve Riot. This will use a cookie .": "Saada meile anonüümset kasutusteavet , mis võimaldab meil Riot'it täiustada. Selline teave põhineb küpsiste kasutamisel .",
+ "I want to help": "Ma soovin aidata",
+ "No": "Ei",
+ "Restart": "Käivita uuesti",
+ "Upgrade your Riot": "Uuenda oma Riot'it",
+ "A new version of Riot is available!": "Uus Riot'i versioon on saadaval!",
+ "You: %(message)s": "Sina: %(message)s",
+ "There was an error joining the room": "Jututoaga liitumisel tekkis viga",
+ "Sorry, your homeserver is too old to participate in this room.": "Vabandust, sinu koduserver on siin jututoas osalemiseks liiga vana.",
+ "Please contact your homeserver administrator.": "Palun võta ühendust koduserveri haldajaga.",
+ "Failed to join room": "Jututoaga liitumine ei õnnestunud",
+ "Font scaling": "Fontide skaleerimine",
+ "Custom user status messages": "Kasutajate kohandatud olekuteated",
+ "Use IRC layout": "Kasuta IRC-tüüpi paigutust",
+ "Font size": "Fontide suurus",
+ "Custom font size": "Fontide kohandatud suurus",
+ "Enable automatic language detection for syntax highlighting": "Kasuta süntaksi esiletõstmisel automaatset keeletuvastust",
+ "Cross-signing private keys:": "Privaatvõtmed risttunnustamise jaoks:",
+ "Identity Server URL must be HTTPS": "Isikutuvastusserveri URL peab kasutama HTTPS-protokolli",
+ "Not a valid Identity Server (status code %(code)s)": "See ei ole sobilik isikutuvastusserver (staatuskood %(code)s)",
+ "Could not connect to Identity Server": "Ei saanud ühendust isikutuvastusserveriga",
+ "Checking server": "Kontrollin serverit",
+ "Change identity server": "Muuda isikutuvastusserverit",
+ "Disconnect from the identity server 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",
+ "Encrypted by an unverified session": "Cifrada por unha sesión non verificada",
+ "Unencrypted": "Non cifrada",
+ "Encrypted by a deleted session": "Cifrada por unha sesión eliminada",
+ "Invite only": "Só por convite",
+ "Scroll to most recent messages": "Ir ás mensaxes máis recentes",
+ "Close preview": "Pechar vista previa",
+ "Emoji picker": "Selector Emoticona",
+ "Send a reply…": "Responder…",
+ "Send a message…": "Enviar mensaxe…",
+ "The conversation continues here.": "A conversa continúa aquí.",
+ "This room has been replaced and is no longer active.": "Esta sala foi substituída e xa non está activa.",
+ "Bold": "Resaltado",
+ "Italics": "Cursiva",
+ "Code block": "Bloque de código",
+ "No recently visited rooms": "Sen salas recentes visitadas",
+ "People": "Persoas",
+ "Joining room …": "Uníndote a sala…",
+ "Loading …": "Cargando…",
+ "Rejecting invite …": "Rexeitando convite…",
+ "Loading room preview": "Cargando vista previa",
+ "You were kicked from %(roomName)s by %(memberName)s": "Foches expulsada de %(roomName)s por %(memberName)s",
+ "Reason: %(reason)s": "Razón: %(reason)s",
+ "Forget this room": "Esquecer sala",
+ "You were banned from %(roomName)s by %(memberName)s": "Foches bloqueada en %(roomName)s por %(memberName)s",
+ "Something went wrong with your invite to %(roomName)s": "Algo fallou co teu convite para %(roomName)s",
+ "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Un erro (%(errcode)s) foi devolto ao intentar validar o convite. Podes intentar enviarlle esta información a administración da sala.",
+ "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Este convite para %(roomName)s foi enviado a %(email)s que non está asociado coa túa conta",
+ "Link this email with your account in Settings to receive invites directly in Riot.": "Liga este email coa túa conta nos Axustes para recibir convites directamente en Riot.",
+ "This invite to %(roomName)s was sent to %(email)s": "Este convite para %(roomName)s foi enviado a %(email)s",
+ "Use an identity server in Settings to receive invites directly in Riot.": "Usa un servidor de identidade nos Axustes para recibir convites directamente en Riot.",
+ "Share this email in Settings to receive invites directly in Riot.": "Comparte este email en Axustes para recibir convites directamente en Riot.",
+ "Do you want to chat with %(user)s?": "Desexas conversar con %(user)s?",
+ "submit a bug report .": "%(errcode)s foi devolto ao intentar acceder a sala. Se cres que esta mensaxe non é correcta, por favor envía un informe de fallo .",
+ "Never lose encrypted messages": "Non perdas nunca acceso ás mensaxes cifradas",
+ "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensaxes nesta sala están aseguradas con cifrado extremo-a-extremo. Só ti e o correspondente(s) tedes as chaves para ler as mensaxes.",
+ "Securely back up your keys to avoid losing them. Learn more.": "Fai unha copia das chaves para evitar perdelas. Saber máis.",
+ "Not now": "Agora non",
+ "Don't ask me again": "Non preguntarme outra vez",
+ "Sort by": "Orde por",
+ "Activity": "Actividade",
+ "A-Z": "A-Z",
+ "Unread rooms": "Salas non lidas",
+ "Always show first": "Mostrar sempre primeiro",
+ "Show": "Mostrar",
+ "Message preview": "Vista previa da mensaxe",
+ "List options": "Opcións da listaxe",
+ "Add room": "Engadir sala",
+ "Show %(count)s more|other": "Mostrar %(count)s máis",
+ "Show %(count)s more|one": "Mostrar %(count)s máis",
+ "%(count)s unread messages including mentions.|other": "%(count)s mensaxes non lidas incluíndo mencións.",
+ "%(count)s unread messages including mentions.|one": "1 mención non lida.",
+ "%(count)s unread messages.|other": "%(count)s mensaxe non lidas.",
+ "%(count)s unread messages.|one": "1 mensaxe non lida.",
+ "Unread mentions.": "Mencións non lidas.",
+ "Unread messages.": "Mensaxes non lidas.",
+ "Leave Room": "Deixar a Sala",
+ "Room options": "Opcións da Sala",
+ "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ao actualizar a sala pecharás a instancia actual da sala e crearás unha versión mellorada co mesmo nome.",
+ "This room has already been upgraded.": "Esta sala xa foi actualizada.",
+ "This room is running room version reacted with %(content)s ": " reaccionaron con %(content)s ",
+ "reacted with %(shortName)s ": "reaccionaron con %(shortName)s ",
+ "Message deleted": "Mensaxe eliminada",
+ "Message deleted by %(name)s": "Mensaxe eliminada por %(name)s",
+ "This room is a continuation of another conversation.": "Esta sala é continuación doutra conversa.",
+ "Click here to see older messages.": "Preme aquí para ver mensaxes antigas.",
+ "Edited at %(date)s. Click to view edits.": "Editada o %(date)s. Preme para ver edicións.",
+ "edited": "editada",
+ "Can't load this message": "Non se cargou a mensaxe",
+ "Submit logs": "Enviar rexistro",
+ "Failed to load group members": "Fallou a carga dos membros do grupo",
+ "Frequently Used": "Utilizado con frecuencia",
+ "Smileys & People": "Sorrisos e Persoas",
+ "Animals & Nature": "Animais e Natureza",
+ "Food & Drink": "Comida e Bebida",
+ "Activities": "Actividades",
+ "Travel & Places": "Viaxes e Lugares",
+ "Objects": "Obxectos",
+ "Symbols": "Símbolos",
+ "Flags": "Bandeiras",
+ "Categories": "Categorías",
+ "Quick Reactions": "Reaccións rápidas",
+ "Cancel search": "Cancelar busca",
+ "Any of the following data may be shared:": "Calquera do seguinte podería ser compartido:",
+ "Your display name": "Nome mostrado",
+ "Your avatar URL": "URL do avatar",
+ "Your user ID": "ID de usuaria",
+ "Riot URL": "URL Riot",
+ "Room ID": "ID da sala",
+ "Widget ID": "ID do widget",
+ "Using this widget may share data create a new issue on GitHub so that we can investigate this bug.": "Por favor abre un novo informe en GitHub para poder investigar o problema.",
+ "Rotate Left": "Rotar á esquerda",
+ "Rotate counter-clockwise": "Rotar sentido contra-horario",
+ "Rotate Right": "Rotar á dereita",
+ "Rotate clockwise": "Rotar sentido horario",
+ "Language Dropdown": "Selector de idioma",
+ "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s non fixeron cambios %(count)s veces",
+ "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s non fixeron cambios",
+ "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s non fixo cambios %(count)s veces",
+ "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s non fixo cambios",
+ "QR Code": "Código QR",
+ "Room address": "Enderezo da sala",
+ "e.g. my-room": "ex. a-miña-sala",
+ "Some characters not allowed": "Algúns caracteres non permitidos",
+ "Please provide a room address": "Proporciona un enderezo para a sala",
+ "This address is available to use": "Este enderezo está dispoñible",
+ "This address is already in use": "Este enderezo xa se está a utilizar",
+ "Enter a server name": "Escribe un nome de servidor",
+ "Looks good": "Pinta ben",
+ "Can't find this server or its room list": "Non se atopa o servidor ou a súa lista de salas",
+ "All rooms": "Todas as salas",
+ "Your server": "O teu servidor",
+ "Are you sure you want to remove %(serverName)s": "¿Tes a certeza de querer eliminar %(serverName)s",
+ "Remove server": "Eliminar servidor",
+ "Matrix": "Matrix",
+ "Add a new server": "Engadir novo servidor",
+ "Server name": "Nome do servidor",
+ "Add a new server...": "Engadir un novo servidor...",
+ "%(networkName)s rooms": "Salas de %(networkName)s",
+ "That doesn't look like a valid email address": "Non semella un enderezo de email válido",
+ "Use an identity server to invite by email. Use the default (%(defaultIdentityServerName)s) or manage in Settings .": "Usa un servidor de identidade para convidar por email. Usa valor por omisión (%(defaultIdentityServerName)s) ou xestionao en Axustes .",
+ "Use an identity server to invite by email. Manage in Settings .": "Usa un servidor de identidade para convidar por email. Xestionao en Axustes .",
+ "The following users may not exist": "As seguintes usuarias poderían non existir",
+ "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Non se atopou o perfil dos IDs Matrix da lista inferior - ¿Desexas convidalas igualmente?",
+ "Invite anyway and never warn me again": "Convidar igualmente e non avisarme outra vez",
+ "Invite anyway": "Convidar igualmente",
+ "Close dialog": "Pechar diálogo",
+ "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Cóntanos o que fallou ou, mellor aínda, abre un informe en GitHub que describa o problema.",
+ "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Lembra: o teu navegador non está soportado, polo que poderían acontecer situacións non agardadas.",
+ "Before submitting logs, you must create a GitHub issue to describe your problem.": "Antes de enviar os rexistros, deberías abrir un informe en GitHub para describir o problema.",
+ "GitHub issue": "Informe en GitHub",
+ "Notes": "Notas",
+ "Unable to load commit detail: %(msg)s": "Non se cargou o detalle do commit: %(msg)s",
+ "Removing…": "Eliminando…",
+ "Destroy cross-signing keys?": "Destruír chaves de sinatura-cruzada?",
+ "Clear cross-signing keys": "Baleirar chaves de sinatura-cruzada",
+ "Clear all data in this session?": "¿Baleirar todos os datos desta sesión?",
+ "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "O baleirado dos datos da sesión é permanente. As mensaxes cifradas perderánse a menos que as súas chaves estiveren nunha copia de apoio.",
+ "Clear all data": "Eliminar todos os datos",
+ "Please enter a name for the room": "Escribe un nome para a sala",
+ "Set a room address to easily share your room with other people.": "Establece un enderezo para a sala fácil de compartir con outras persoas.",
+ "This room is private, and can only be joined by invitation.": "Esta sala é privada, e só te podes unir a través dun convite.",
+ "You can’t disable this later. Bridges & most bots won’t work yet.": "Podes desactivar esto posteriormente. As pontes e maioría de bots aínda non funcionarán.",
+ "Enable end-to-end encryption": "Activar cifrado extremo-a-extremo",
+ "Create a public room": "Crear sala pública",
+ "Create a private room": "Crear sala privada",
+ "Topic (optional)": "Asunto (optativo)",
+ "Make this room public": "Facer pública esta sala",
+ "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 Riot 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 Riot para facer esto",
+ "You've previously used a newer version of Riot 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 Riot nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e voltar 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.",
+ "Confirm account deactivation": "Confirma a desactivación da conta",
+ "There was a problem communicating with the server. Please try again.": "Houbo un problema ao comunicar co servidor. Inténtao outra vez.",
+ "Server did not require any authentication": "O servidor non require auténticación",
+ "Server did not return valid authentication information.": "O servidor non devolveu información válida de autenticación.",
+ "View Servers in Room": "Ver Servidores na Sala",
+ "Verification Requests": "Solicitudes de Verificación",
+ "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica esta usuaria para marcala como confiable. Ao confiar nas usuarias proporcionache tranquilidade extra cando usas cifrado de extremo-a-extremo.",
+ "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ao verificar esta usuaria marcarás a súa sesión como confiable, e tamén marcará a túa sesión como confiable para elas."
}
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 511dac34ac..ea830bc38e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2494,5 +2494,27 @@
"All settings": "Minden beállítás",
"Archived rooms": "Archivált szobák",
"Feedback": "Visszajelzés",
- "Account settings": "Fiók beállítása"
+ "Account settings": "Fiók beállítása",
+ "Light": "Világos",
+ "Dark": "Sötét",
+ "Customise your appearance": "Szabd személyre a megjelenítést",
+ "Appearance Settings only affect this Riot session.": "A megjelenítési beállítások csak erre a munkamenetre vonatkoznak.",
+ "Activity": "Aktivitás",
+ "A-Z": "A-Z",
+ "Recovery Key": "Visszaállítási Kulcs",
+ "This isn't the recovery key for your account": "Ez nem a fiókod visszaállítási kulcsa",
+ "This isn't a valid recovery key": "Ez nem egy érvényes visszaállítási kulcs",
+ "Looks good!": "Jól néz ki!",
+ "Use Recovery Key or Passphrase": "Használd a visszaállítási kulcsot vagy jelmondatot",
+ "Use Recovery Key": "Használd a Visszaállítási Kulcsot",
+ "Enter your Recovery Key or enter a Recovery Passphrase to continue.": "A továbblépéshez add meg a Visszaállítási kulcsot vagy a Visszaállítási jelmondatot.",
+ "Enter your Recovery Key to continue.": "A továbblépéshez add meg a Visszaállítási Kulcsot.",
+ "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Fejleszd a Visszaállítási kulcsot, hogy a fiók adatokkal tárolhasd a titkosítási kulcsokat és jelszavakat. Szükséged lesz rá hogy hozzáférj az adataidhoz ha elveszted a hozzáférésed ehhez a bejelentkezéshez.",
+ "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "A Visszaállítási kulcsot tárold biztonságos helyen mivel felhasználható a titkosított üzenetekhez és adatokhoz való hozzáféréshez.",
+ "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Készíts Visszaállítási kulcsot, hogy a fiók adatokkal tárolhasd a titkosítási kulcsokat és jelszavakat. Szükséged lesz rá hogy hozzáférj az adataidhoz ha elveszted a hozzáférésed ehhez a bejelentkezéshez.",
+ "Create a Recovery Key": "Visszaállítási kulcs készítése",
+ "Upgrade your Recovery Key": "A Visszaállítási kulcs fejlesztése",
+ "Store your Recovery Key": "Visszaállítási kulcs tárolása",
+ "Use the improved room list (in development - will refresh to apply changes)": "Használd a fejlesztett szoba listát (fejlesztés alatt - a változások a frissítés után aktiválódnak)",
+ "Use the improved room list (will refresh to apply changes)": "Használd a fejlesztett szoba listát (a változások életbe lépéséhez újra fog tölteni)"
}
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 8272dc126b..6f213de237 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2502,5 +2502,25 @@
"Leave Room": "Lascia stanza",
"Room options": "Opzioni stanza",
"Activity": "Attività",
- "A-Z": "A-Z"
+ "A-Z": "A-Z",
+ "Light": "Chiaro",
+ "Dark": "Scuro",
+ "Customise your appearance": "Personalizza l'aspetto",
+ "Appearance Settings only affect this Riot session.": "Le impostazioni dell'aspetto hanno effetto solo in questa sessione di Riot.",
+ "Recovery Key": "Chiave di recupero",
+ "This isn't the recovery key for your account": "Questa non è la chiave di recupero del tuo account",
+ "This isn't a valid recovery key": "Questa non è una chiave di ripristino valida",
+ "Looks good!": "Sembra giusta!",
+ "Use Recovery Key or Passphrase": "Usa la chiave o password di recupero",
+ "Use Recovery Key": "Usa chiave di recupero",
+ "Use the improved room list (in development - will refresh to apply changes)": "Usa l'elenco di stanze migliorato (in sviluppo - verrà ricaricato per applicare le modifiche)",
+ "Enter your Recovery Key or enter a Recovery Passphrase to continue.": "Inserisci la tua chiave di recupero o una password di recupero per continuare.",
+ "Enter your Recovery Key to continue.": "Inserisci la tua chiave di recupero per continuare.",
+ "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Aggiorna la tua chiave di recupero per memorizzare le chiavi di cifratura e i segreti con i dati del tuo account. Se perdi l'accesso a questo login, ti servirà per sbloccare i tuoi dati.",
+ "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Conserva la tua chiave di recupero in un posto sicuro, può essere usata per sbloccare i tuoi messaggi e dati cifrati.",
+ "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Crea un chiave di recupero per memorizzare le chiavi di cifratura e i segreti con i dati del tuo account. Se perdi l'accesso a questo login, ti servirà per sbloccare i tuoi dati.",
+ "Create a Recovery Key": "Crea una chiave di recupero",
+ "Upgrade your Recovery Key": "Aggiorna la chiave di recupero",
+ "Store your Recovery Key": "Salva la chiave di recupero",
+ "Use the improved room list (will refresh to apply changes)": "Usa l'elenco stanze migliorato (verrà ricaricato per applicare le modifiche)"
}
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 07ad4f9ef7..3944aa7489 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1400,5 +1400,36 @@
"Service": "サービス",
"Summary": "概要",
"Document": "ドキュメント",
- "Appearance": "外観"
+ "Appearance": "外観",
+ "Other users may not trust it": "他のユーザーはこのセッションを信頼しない可能性があります",
+ "Show a placeholder for removed messages": "削除されたメッセージの場所にプレースホルダーを表示",
+ "Show join/leave messages (invites/kicks/bans unaffected)": "参加/退出のメッセージを表示 (招待/追放/ブロック には影響しません)",
+ "Prompt before sending invites to potentially invalid matrix IDs": "不正な可能性のある Matrix ID に招待を送るまえに確認を表示",
+ "Order rooms by name": "名前順で部屋を整列",
+ "Show rooms with unread notifications first": "未読通知のある部屋をトップに表示",
+ "Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示",
+ "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示",
+ "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "あなたのアカウントではクロス署名の認証情報がシークレットストレージに保存されていますが、このセッションでは信頼されていません。",
+ "Riot can't securely cache encrypted messages locally while running in a web browser. Use Riot Desktop for encrypted messages to appear in search results.": "Riot はウェブブラウザでは暗号化されたメッセージを安全にキャッシュできません。暗号化されたメッセージを検索結果に表示するには Riot Desktop を利用してください。",
+ "This session is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.": "このセッションではキーをバックアップしていません。ですが、あなたは復元に使用したり今後キーを追加したりできるバックアップを持っています。",
+ "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "このセッションのみにあるキーを失なわないために、セッションをキーバックアップに接続しましょう。",
+ "Connect this session to Key Backup": "このセッションをキーバックアップに接続",
+ "Autocomplete delay (ms)": "自動補完の遅延 (ms)",
+ "Missing media permissions, click the button below to request.": "メディア権限が不足しています、リクエストするには下のボタンを押してください。",
+ "Request media permissions": "メディア権限をリクエスト",
+ "Joining room …": "部屋に参加中...",
+ "Join the discussion": "話し合いに参加",
+ "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s はプレビューできません。部屋に参加しますか？",
+ "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "他のユーザーがあなたのホームサーバー (%(localDomain)s) を通じてこの部屋を見つけられるよう、アドレスを設定しましょう",
+ "Warning: You should only do this on a trusted computer.": "警告: 信頼できるコンピュータでのみこれを実行するべきです。",
+ "Enter recovery key": "リカバリキーを入力",
+ "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "暗号化されたメッセージへアクセスしたりクロス署名認証情報で他のセッションを承認するにはリカバリキーを入力してください。",
+ "If you've forgotten your recovery key you can .": "リカバリキーを忘れた場合はできます。",
+ "Verify this login": "このログインを承認",
+ "Signing In...": "サインインしています...",
+ "If you've joined lots of rooms, this might take a while": "たくさんの部屋に参加している場合は、時間がかかる可能性があります",
+ "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "このログインを他のセッションで承認し、あなたの認証情報を確認すれば、暗号化されたメッセージへアクセスできるようになります。",
+ "This requires the latest Riot on your other devices:": "最新版の Riot が他のあなたのデバイスで実行されている必要があります:",
+ "or another cross-signing capable Matrix client": "もしくはクロス署名に対応した他の Matrix クライアント",
+ "Without completing security on this session, it won’t have access to encrypted messages.": "このセッションでのセキュリティを完了させない限り、暗号化されたメッセージにはアクセスできません。"
}
diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
new file mode 100644
index 0000000000..8d11469afc
--- /dev/null
+++ b/src/i18n/strings/kab.json
@@ -0,0 +1,350 @@
+{
+ "Confirm": "Sentem",
+ "Analytics": "Tiselḍin",
+ "Error": "Tuccḍa",
+ "Dismiss": "Agwi",
+ "OK": "IH",
+ "Permission Required": "Tasiregt tlaq",
+ "Continue": "Kemmel",
+ "Cancel": "Semmet",
+ "Sun": "Ace",
+ "Mon": "Ari",
+ "Tue": "Ara",
+ "Wed": "Aha",
+ "Thu": "Amh",
+ "Fri": "Sem",
+ "Sat": "Sed",
+ "Jan": "Yen",
+ "Feb": "Fuṛ",
+ "Mar": "Meɣ",
+ "Apr": "Yeb",
+ "May": "May",
+ "Jun": "Yun",
+ "Jul": "Yul",
+ "Aug": "Ɣuc",
+ "Sep": "Cte",
+ "Oct": "Tub",
+ "Nov": "Wam",
+ "Dec": "Duj",
+ "PM": "MD",
+ "AM": "FT",
+ "Trust": "Ittkel",
+ "Create Account": "Rnu amiḍan",
+ "Sign In": "Kcem",
+ "Default": "Amezwer",
+ "Moderator": "Aseɣyad",
+ "Admin": "Anedbal",
+ "You need to be logged in.": "Tesriḍ ad teqqneḍ.",
+ "Messages": "Iznan",
+ "Actions": "Tigawin",
+ "Advanced": "Talqayt",
+ "Other": "Nniḍen",
+ "Usage": "Aseqdec",
+ "Thank you!": "Tanemmirt!",
+ "Reason": "Taɣẓint",
+ "Someone": "Albaɛḍ",
+ "Light": "Aceɛlal",
+ "Dark": "Aberkan",
+ "Done": "Immed",
+ "Add another word or two. Uncommon words are better.": "Rnu awal-nniḍen neɣ sin. Awalen imexḍa ad lhun.",
+ "No": "Uhu",
+ "Review": "Senqed",
+ "Later": "Ticki",
+ "Notifications": "Ilɣa",
+ "Close": "Mdel",
+ "Warning": "Asmigel",
+ "Ok": "Ih",
+ "Set password": "Sbadu awal uffir",
+ "Upgrade": "Leqqem",
+ "Verify": "Senqed",
+ "What's New": "D acu-t umaynut",
+ "Update": "Leqqem",
+ "Restart": "Ales tanekra",
+ "Font size": "Tuɣzi n tsefsit",
+ "Custom font size": "Tiddi n tsefsit yugnen",
+ "Decline": "Agwi",
+ "Accept": "Qbel",
+ "or": "neɣ",
+ "Start": "Bdu",
+ "Cat": "Amcic",
+ "Lion": "Izem",
+ "Rabbit": "Awtul",
+ "Turtle": "Afekrun",
+ "Tree": "Aseklu",
+ "Clock": "Tamrint",
+ "Book": "Adlis",
+ "Lock": "Sekkeṛ",
+ "Key": "Tasarut",
+ "Telephone": "Tiliγri",
+ "Flag": "Anay",
+ "Bicycle": "Azlalam",
+ "Ball": "Balles",
+ "Anchor": "Tamdeyt",
+ "Headphones": "Casque",
+ "Folder": "Akaram",
+ "Upload": "Sali",
+ "Remove": "Sfeḍ",
+ "Show less": "Sken-d drus",
+ "Show more": "Sken-d ugar",
+ "Warning!": "Ɣur-k!",
+ "Current password": "Awal uffir amiran",
+ "Password": "Awal uffir",
+ "New Password": "Awal uffir amaynut",
+ "Confirm password": "Sentem awal uffir",
+ "Change Password": "Snifel Awal Uffir",
+ "not found": "ulac-it",
+ "Authentication": "Asesteb",
+ "ID": "ID",
+ "Manage": "Sefrek",
+ "Enable": "Rmed",
+ "Keywords": "Awalen tisura",
+ "Clear notifications": "Sfeḍ ilɣuyen",
+ "Off": "Insa",
+ "Display Name": "Mefffer isem",
+ "Save": "Sekles",
+ "Disconnect": "Yeffeɣ",
+ "Go back": "Uɣal ɣer deffir",
+ "Change": "Changer",
+ "Theme": "Asentel",
+ "Success": "Yedda",
+ "Profile": "Amaɣnu",
+ "Account": "Amiḍan",
+ "General": "Amatu",
+ "Legal": "Usḍif",
+ "Credits": "Asenmer",
+ "Chat with Riot Bot": "Asqerdec akked Riot Bot",
+ "FAQ": "Isteqsiyen FAQ",
+ "Keyboard Shortcuts": "Inegzumen n unasiw",
+ "Versions": "Ileqman",
+ "None": "Ula yiwen",
+ "Unsubscribe": "Se désabonner",
+ "Ignore": "Ttu",
+ "Subscribe": "Jerred",
+ "Preferences": "Tiwelhiwin",
+ "Composer": "Editeur",
+ "Timeline": "Amazray",
+ "Microphone": "Asawaḍ",
+ "Camera": "Takamiṛatt",
+ "Sounds": "Imeslan",
+ "Reset": "Ales awennez",
+ "Browse": "Snirem",
+ "Default role": "Tamlilt tamzwert",
+ "Permissions": "Tisirag",
+ "Anyone": "Yal yiwen",
+ "Encryption": "Awgelhen",
+ "Complete": "Yemmed",
+ "Share": "Bḍu",
+ "Verification code": "Tangalt n usenqed",
+ "Add": "Rnu",
+ "Email Address": "Tansa imayl",
+ "Phone Number": "Uṭṭun n tiliɣri",
+ "Upload file": "Azen afaylu",
+ "Bold": "Azuran",
+ "Strikethrough": "Jerreḍ",
+ "Quote": "Citation",
+ "Loading...": "Yessalay-ed…",
+ "Idle": "Idle",
+ "Unknown": "D arussin",
+ "Settings": "Iɣewwaren",
+ "Search": "Nadi",
+ "Favourites": "Ismenyifen",
+ "People": "Imdanen",
+ "Sign Up": "Jerred",
+ "Reject": "Aggi",
+ "Not now": "Mačči tura",
+ "Sort by": "Smizzwer s",
+ "Activity": "Armud",
+ "A-Z": "A-Z",
+ "Show": "Sken",
+ "Options": "Tinefrunin",
+ "Server error": "Tuccḍa n uqeddac",
+ "Members": "Imedrawen",
+ "Files": "Ifuyla",
+ "Trusted": "De confiance",
+ "Invite": "Nced…",
+ "Unmute": "Susem",
+ "Mute": "Kkes imesli",
+ "Are you sure?": "Tebɣiḍ ?",
+ "Security": "Taɣellist",
+ "Yes": "Ih",
+ "Verified": "Verified",
+ "Got it": "Awi-t",
+ "Sunday": "Acer",
+ "Monday": "Arim",
+ "Tuesday": "Aram",
+ "Wednesday": "Ahad",
+ "Thursday": "Amhad",
+ "Friday": "Sem",
+ "Saturday": "Sed",
+ "Today": "Ass-a",
+ "Yesterday": "Iḍelli",
+ "View Source": "Sken aɣbalu",
+ "Reply": "Err",
+ "Edit": "Ẓreg",
+ "Attachment": "Attachement",
+ "Error decrypting attachment": "Tuccḍa deg uzmak n ufaylu yeddan",
+ "Show all": "Sken akk",
+ "Message deleted": "Izen yettwakkes",
+ "Copied!": "Yettusukken!",
+ "edited": "yeẓreg",
+ "Food & Drink": "Učči aked tissit",
+ "Objects": "Tiɣawsiwin",
+ "Symbols": "Izamulen",
+ "Flags": "Anayen",
+ "Categories": "Taggayin",
+ "More options": "Ugar n textirin",
+ "Join": "Semlil",
+ "No results": "Ulac igmad",
+ "collapse": "sneḍfes",
+ "Rotate counter-clockwise": "Zzi di tnila tanemgalt n tsegnatin n temrilt",
+ "Rotate clockwise": "Zzi di tnila n tsegnatin n temrilt",
+ "Add User": "Rnu aseqdac",
+ "Server name": "Isem n uqeddac",
+ "email address": "tansa imayl",
+ "Close dialog": "Mdel tanaka n usdiwen",
+ "Notes": "Tamawt",
+ "Unavailable": "Ulac-it",
+ "Changelog": "Aɣmis n ibeddilen",
+ "Removing…": "Tukksa…",
+ "Confirm Removal": "Serggeg tukksa",
+ "Example": "Amedya",
+ "example": "amedya",
+ "Create": "Snulfu-d",
+ "Name": "Isem",
+ "Sign out": "Ffeɣ",
+ "Back": "Retour",
+ "Send": "Azen",
+ "Suggestions": "Isumar",
+ "Go": "Ddu",
+ "Session name": "Nom de session",
+ "Send report": "Azen aneqqis",
+ "Refresh": "Sismeḍ",
+ "Email address": "Tansa email",
+ "Skip": "Zgel",
+ "Username not available": "Ulac isem n useqdac",
+ "Checking...": "Asenqed...",
+ "Username available": "Yella yisem n useqdac",
+ "Terms of Service": "Tiwtilin n useqdec",
+ "Service": "Ameẓlu",
+ "Summary": "Agzul",
+ "Document": "isemli",
+ "Next": "Ar zdat",
+ "Upload files": "Azen ifuyla",
+ "Appearance": "Udem",
+ "Allow": "Sireg",
+ "Deny": "Agwi",
+ "Custom": "Personnalisé",
+ "Source URL": "URL aγbalu",
+ "Notification settings": "Iɣewwaṛen n yilɣa",
+ "Leave": "Ffeɣ",
+ "Set status": "Sbadu addad",
+ "Hide": "Ffer",
+ "Home": "Agejdan",
+ "Sign in": "Qqen",
+ "Help": "Tallelt",
+ "Reload": "Smiren",
+ "powered by Matrix": "s lmendad n Matrix",
+ "Custom Server Options": "Iɣewwaren n uqeddac udmawan",
+ "Code": "Tangalt",
+ "Submit": "Azen",
+ "Email": "Imayl",
+ "Username": "Isem n useqdac",
+ "Phone": "Tiliɣri",
+ "Passwords don't match": "Awal uffiren ur menṭaḍen ara",
+ "Email (optional)": "Imayl (Afrayan)",
+ "Register": "Jerred",
+ "Free": "Ilelli",
+ "Failed to upload image": "Ur yezmir ad yessali tugna",
+ "Description": "Aseglem",
+ "Explore": "Snirem",
+ "Filter": "Imsizdeg",
+ "Explore rooms": "Snirem tixxamin",
+ "Unknown error": "Erreur inconnue",
+ "Logout": "Tufɣa",
+ "Preview": "Timeẓriwt",
+ "View": "Ɣeṛ",
+ "Guest": "Inebgi",
+ "Your profile": "Amaɣnu-ik",
+ "Feedback": "Tikti",
+ "Your password has been reset.": "Awal n uɛeddi inek yules awennez.",
+ "Syncing...": "Amtawi",
+ "Create account": "Rnu amiḍan",
+ "Create your account": "Rnu amiḍan-ik",
+ "Go Back": "Précédent",
+ "Commands": "Tiludna",
+ "Users": "Iseqdacen",
+ "Export": "Sifeḍ",
+ "Import": "Kter",
+ "Restore": "Err-d",
+ "Copy": "Nγel",
+ "Download": "Sider",
+ "Retry": "Ɛreḍ tikkelt nniḍen",
+ "Starting backup...": "Asenker n uḥraz...",
+ "Success!": "Akka d rrbeḥ !",
+ "Disable": "Désactiver",
+ "Navigation": "Tunigin",
+ "Calls": "Appels",
+ "Alt": "Alt",
+ "Shift": "Shift",
+ "New line": "Izirig amaynut",
+ "Upload a file": "Sali-d afaylu",
+ "Page Up": "Asebter afellay",
+ "Page Down": "Asebter adday",
+ "Esc": "Senser",
+ "Enter": "Anekcum",
+ "Space": "Tallunt",
+ "End": "Taggara",
+ "This email address is already in use": "Tansa-agi n yimayl tettuseqdac yakan",
+ "This phone number is already in use": "Uṭṭun-agi n tilifun yettuseqddac yakan",
+ "Your Riot is misconfigured": "Riot inek(inem) ur ittusbadu ara",
+ "Please install Chrome , Firefox , or Safari for the best experience.": "Ma ulac aɣilif, sebded Chrome , Firefox , neɣSafari i tirmit igerrzen.",
+ "I understand the risks and wish to continue": "Gziɣ ayen ara d-yeḍrun maca bɣiɣ ad kemmleɣ",
+ "Use Single Sign On to continue": "Seqdec anekcum asuf akken ad tkemmleḍ",
+ "Confirm adding this email address by using Single Sign On to prove your identity.": "Sentem timerna n tansa-a n yimayl s useqdec n unekcum asuf i ubeggen n timagit-in(im).",
+ "Single Sign On": "Anekcum asuf",
+ "Confirm adding email": "Sentem timerna n yimayl",
+ "Click the button below to confirm adding this email address.": "Sit ɣef tqeffalt yellan ddaw i usentem n tmerna n tansa-a n yimayl.",
+ "Add Email Address": "Rnu tansa n yimayl",
+ "Failed to verify email address: make sure you clicked the link in the email": "Asenqed n tansa n yimayl ur yeddi ara: wali ma yella tsateḍ ɣef useɣwen yellan deg yimayl",
+ "Confirm adding this phone number by using Single Sign On to prove your identity.": "Sentem timerna n wuṭṭun n tilifun s useqdec n unekcum asuf i ubeggen n timagit-ik(im).",
+ "Confirm adding phone number": "Sentem timerna n wuṭṭun n tilifun",
+ "Click the button below to confirm adding this phone number.": "Sit ɣef tqeffalt yellan ddaw i usentem n tmerna n wuṭṭun-a n tilifun.",
+ "Add Phone Number": "Rnu uṭṭun n tilifun",
+ "The platform you're on": "Tiɣerɣert ideg telliḍ akka tura",
+ "The version of Riot": "Lqem n Riot",
+ "Whether or not you're logged in (we don't record your username)": "Ma teqqneḍ neɣ uhu (isem-ik(im) n useqdac ur yettwasekles ara)",
+ "Your language of choice": "Tutlayt i tferneḍ",
+ "Which officially provided instance you are using, if any": "Tummant i d-yettunefken tunṣibt ara tesseqdace, ma yella tella",
+ "Your homeserver's URL": "URL n uqeddac-ik(im) agejdan",
+ "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
+ "Every page you use in the app": "Isebtar akk i tesseqdaceḍ deg usnas",
+ "e.g. ": "e.g. ",
+ "Your user agent": "Ameggi-ik(im) aseqdac",
+ "Your device resolution": "Afray n yiben-ik(im)",
+ "Jump to oldest unread message": "Uɣal alamma d izen aqdim ur nettwaɣra ara",
+ "Jump to room search": "Ɛeddi ɣer unadi n texxamt",
+ "Navigate up/down in the room list": "Inig s afellay/adday deg tebdert n texxamin",
+ "Select room from the room list": "Fren taxxamt seg tebdert n texxamin",
+ "Collapse room list section": "Fneẓ tigemi n tebdert n texxamin",
+ "Expand room list section": "Snerni tigezmi n tebdert n texxamin",
+ "Clear room list filter field": "Kkes urti n usizdeg n tebdert n texxamin",
+ "Previous/next unread room or DM": "Taxxamt neɣ izen uzrid ur yettwaɣra send/seld",
+ "Previous/next room or DM": "Taxxamt neɣ izen usrid send/seld",
+ "Toggle the top left menu": "Sken/ffer umuɣ aεlayan azelmaḍ",
+ "Close dialog or context menu": "Mdel umuɣ n udiwenni neɣ n ugbur",
+ "Activate selected button": "Rmed taqeffalt i d-yettwafernen",
+ "Toggle right panel": "Sken/ffer agalis ayeffus",
+ "Toggle this dialog": "Sken/ffer adiwanni-a",
+ "Move autocomplete selection up/down": "Err tafrant n tacart tawurmant afellay/adday",
+ "Cancel autocomplete": "Sefsex tacaṛt tawurmant",
+ "Toggle Bold": "Err-it d azuran",
+ "Toggle Italics": "Err-it ɣer uknan",
+ "Toggle Quote": "Err-it ɣer yizen aneẓli",
+ "Navigate recent messages to edit": "Nadi iznan imaynuten i usiẓreg",
+ "Jump to start/end of the composer": "Ṛuḥ ɣer tazwara/taggara n yimsuddes",
+ "Navigate composer history": "Nadi deg uzray n yimsuddes",
+ "Cancel replying to a message": "Sefsex tiririt ɣef yizen",
+ "Toggle microphone mute": "Rmed/sens tanusi n usawaḍ",
+ "Toggle video on/off": "Rmed/sens tavidyut",
+ "Scroll up/down in the timeline": "Drurem gar afellay/addday n tesnakudt"
+}
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index fe4fbf12ee..e815a2e6c3 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1354,5 +1354,135 @@
"Jump to read receipt": "Hopp til lesekvitteringen",
"Mention": "Nevn",
"Community Name": "Samfunnets navn",
- "Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen"
+ "Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen",
+ "If you cancel now, you won't complete verifying your other session.": "Hvis du avbryter nå, vil du ikke ha fullført verifiseringen av den andre økten din.",
+ "Room name or address": "Rommets navn eller adresse",
+ "sent an image.": "sendte et bilde.",
+ "Light": "Lys",
+ "Dark": "Mørk",
+ "Verify your other session using one of the options below.": "Verifiser den andre økten din med en av metodene nedenfor.",
+ "User %(user_id)s does not exist": "Brukeren %(user_id)s eksisterer ikke",
+ "Use a few words, avoid common phrases": "Bruk noen få ord, unngå vanlig fraser",
+ "I want to help": "Jeg vil hjelpe til",
+ "Ok": "OK",
+ "Set password": "Bestem passord",
+ "Encryption upgrade available": "Krypteringsoppdatering tilgjengelig",
+ "Verify the new login accessing your account: %(name)s": "Verifiser den nye påloggingen som vil ha tilgang til kontoen din: %(name)s",
+ "Restart": "Start på nytt",
+ "You: %(message)s": "Du: %(message)s",
+ "Font scaling": "Skrifttypeskalering",
+ "Use IRC layout": "Bruk IRC-oppsett",
+ "Font size": "Skriftstørrelse",
+ "Custom font size": "Tilpasset skriftstørrelse",
+ "You've successfully verified this user.": "Du har vellykket verifisert denne brukeren.",
+ "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Venter på at den andre økten din, %(deviceName)s (%(deviceId)s), skal verifisere …",
+ "Waiting for your other session to verify…": "Venter på at den andre økten din skal verifisere …",
+ "Santa": "Julenisse",
+ "Delete %(count)s sessions|other": "Slett %(count)s økter",
+ "Delete %(count)s sessions|one": "Slett %(count)s økt",
+ "Backup version: ": "Sikkerhetskopiversjon: ",
+ "wait and try again later": "vent og prøv igjen senere",
+ "Size must be a number": "Størrelsen må være et nummer",
+ "Customise your appearance": "Tilpass utseendet du bruker",
+ "Labs": "Laboratoriet",
+ "eg: @bot:* or example.org": "f.eks.: @bot:* eller example.org",
+ "To link to this room, please add an address.": "For å lenke til dette rommet, vennligst legg til en adresse.",
+ "Remove %(phone)s?": "Vil du fjerne %(phone)s?",
+ "Online for %(duration)s": "På nett i %(duration)s",
+ "Favourites": "Favoritter",
+ "Create room": "Opprett et rom",
+ "People": "Folk",
+ "Sort by": "Sorter etter",
+ "Activity": "Aktivitet",
+ "A-Z": "A-Å",
+ "Unread rooms": "Uleste rom",
+ "Always show first": "Alltid vis først",
+ "Show": "Vis",
+ "Message preview": "Meldingsforhåndsvisning",
+ "Leave Room": "Forlat rommet",
+ "This room has no local addresses": "Dette rommet har ikke noen lokale adresser",
+ "Waiting for you to accept on your other session…": "Venter på at du aksepterer på den andre økten din …",
+ "Remove recent messages by %(user)s": "Fjern nylige meldinger fra %(user)s",
+ "Remove %(count)s messages|other": "Slett %(count)s meldinger",
+ "Remove %(count)s messages|one": "Slett 1 melding",
+ "Almost there! Is your other session showing the same shield?": "Nesten fremme! Viser den andre økten din det samme skjoldet?",
+ "You've successfully verified your device!": "Du har vellykket verifisert enheten din!",
+ "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du har vellykket verifisert %(deviceName)s (%(deviceId)s)!",
+ "You've successfully verified %(displayName)s!": "Du har vellykket verifisert %(displayName)s!",
+ "You cancelled verification on your other session.": "Du avbrøt verifiseringen på den andre økten din.",
+ "You sent a verification request": "Du sendte en verifiseringsforespørsel",
+ "Error decrypting video": "Feil under dekryptering av video",
+ "Message deleted": "Meldingen ble slettet",
+ "Message deleted by %(name)s": "Meldingen ble slettet av %(name)s",
+ "Click here to see older messages.": "Klikk for å se eldre meldinger.",
+ "Add an Integration": "Legg til en integrering",
+ "Can't load this message": "Klarte ikke å laste inn denne meldingen",
+ "Categories": "Kategorier",
+ "Popout widget": "Utsprettsmodul",
+ "QR Code": "QR-kode",
+ "Room address": "Rommets adresse",
+ "This address is available to use": "Denne adressen er allerede i bruk",
+ "ex. @bob:example.com": "f.eks. @bob:example.com",
+ "Failed to send logs: ": "Mislyktes i å sende loggbøker: ",
+ "Incompatible Database": "Inkompatibel database",
+ "Event Content": "Hendelsesinnhold",
+ "Verification Requests": "Verifiseringsforespørsler",
+ "Integrations are disabled": "Integreringer er skrudd av",
+ "Integrations not allowed": "Integreringer er ikke tillatt",
+ "Confirm to continue": "Bekreft for å fortsette",
+ "Clear cache and resync": "Tøm mellomlageret og synkroniser på nytt",
+ "Manually export keys": "Eksporter nøkler manuelt",
+ "Use this session to verify your new one, granting it access to encrypted messages:": "Bruk denne økten til å verifisere din nye økt, som vil gi den tilgang til krypterte meldinger:",
+ "If you didn’t sign in to this session, your account may be compromised.": "Dersom det ikke var du som logget deg på økten, kan kontoen din ha blitt kompromittert.",
+ "Automatically invite users": "Inviter brukere automatisk",
+ "Verification Pending": "Avventer verifisering",
+ "Username invalid: %(errMessage)s": "Brukernavnet er ugyldig: %(errMessage)s",
+ "An error occurred: %(error_string)s": "En feil oppstod: %(error_string)s",
+ "Share Room": "Del rommet",
+ "Share User": "Del brukeren",
+ "Upload %(count)s other files|other": "Last opp %(count)s andre filer",
+ "Upload %(count)s other files|one": "Last opp %(count)s annen fil",
+ "Appearance": "Utseende",
+ "Verify other session": "Verifiser en annen økt",
+ "Keys restored": "Nøklene ble gjenopprettet",
+ "Address (optional)": "Adresse (valgfritt)",
+ "Reject invitation": "Avslå invitasjonen",
+ "Resend edit": "Send redigeringen på nytt",
+ "Resend removal": "Send slettingen på nytt",
+ "Start authentication": "Begynn autentisering",
+ "The email field must not be blank.": "E-postfeltet kan ikke stå tomt.",
+ "The username field must not be blank.": "Brukernavnfeltet kan ikke stå tomt.",
+ "The phone number field must not be blank.": "Telefonnummerfeltet kan ikke stå tomt.",
+ "The password field must not be blank.": "Passordfeltet kan ikke stå tomt.",
+ "Couldn't load page": "Klarte ikke å laste inn siden",
+ "Add to summary": "Legg til i oppsummeringen",
+ "Unable to accept invite": "Klarte ikke å akseptere invitasjonen",
+ "Unable to join community": "Klarte ikke å bli med i samfunnet",
+ "Unable to leave community": "Klarte ikke å forlate samfunnet",
+ "You are an administrator of this community": "Du er en administrator i dette samfunnet",
+ "You are a member of this community": "Du er et medlem av dette samfunnet",
+ "Failed to load %(groupId)s": "Klarte ikke å laste inn %(groupId)s",
+ "Liberate your communication": "Frigjør kommunikasjonen din",
+ "Explore Public Rooms": "Utforsk offentlige rom",
+ "Create a Group Chat": "Opprett en gruppechat",
+ "Review terms and conditions": "Gå gjennom betingelser og vilkår",
+ "delete the address.": "slette adressen.",
+ "%(count)s of your messages have not been sent.|one": "Meldingen din ble ikke sendt.",
+ "Jump to first invite.": "Hopp til den første invitasjonen.",
+ "You seem to be uploading files, are you sure you want to quit?": "Du ser til å laste opp filer, er du sikker på at du vil avslutte?",
+ "Switch to light mode": "Bytt til lys modus",
+ "Switch to dark mode": "Bytt til mørk modus",
+ "Switch theme": "Bytt tema",
+ "All settings": "Alle innstillinger",
+ "Archived rooms": "Arkiverte rom",
+ "Feedback": "Tilbakemelding",
+ "Account settings": "Kontoinnstillinger",
+ "Emoji Autocomplete": "Auto-fullfør emojier",
+ "Confirm encryption setup": "Bekreft krypteringsoppsett",
+ "Create key backup": "Opprett nøkkelsikkerhetskopi",
+ "Set up Secure Messages": "Sett opp sikre meldinger",
+ "Toggle Bold": "Veksle fet",
+ "Toggle Italics": "Veksle kursiv",
+ "Toggle Quote": "Veksle siteringsformat",
+ "Upload a file": "Last opp en fil"
}
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 69909e942e..e0565ec3dd 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -2211,12 +2211,18 @@
"Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten? Dit is onomkeerbaar.",
"Confirm account deactivation": "Bevestig accountsluiting",
"Room name or address": "Gespreksnaam of -adres",
- "Joins room with given address": "Treedt tot het gesprek met het opgegeven adres toe",
+ "Joins room with given address": "Neem aan het gesprek met dat adres deel",
"Unrecognised room address:": "Gespreksadres niet herkend:",
"Help us improve Riot": "Help ons Riot nog beter te maken",
"Send anonymous usage data which helps us improve Riot. This will use a cookie .": "Stuur anonieme gebruiksinformatie waarmee we Riot kunnen verbeteren. Dit plaatst een cookie .",
"I want to help": "Ik wil helpen",
"Your homeserver has exceeded its user limit.": "Uw thuisserver heeft het maximaal aantal gebruikers overschreden.",
"Your homeserver has exceeded one of its resource limits.": "Uw thuisserver heeft een van zijn limieten overschreden.",
- "Ok": "Oké"
+ "Ok": "Oké",
+ "sent an image.": "heeft een plaatje gestuurd.",
+ "Light": "Helder",
+ "Dark": "Donker",
+ "Set password": "Stel wachtwoord in",
+ "To return to your account in future you need to set a password": "Zonder wachtwoord kunt u later niet tot uw account terugkeren",
+ "Restart": "Herstarten"
}
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 30dd5b828d..4b98bdbe2a 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -157,7 +157,7 @@
"Emoji": "Emoji",
"Enable automatic language detection for syntax highlighting": "Włącz automatyczne rozpoznawanie języka dla podświetlania składni",
"Enable Notifications": "Włącz powiadomienia",
- "%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
+ "%(senderName)s ended the call.": "%(senderName)s zakończył(a) połączenie.",
"End-to-end encryption information": "Informacje o szyfrowaniu end-to-end",
"Enter passphrase": "Wpisz frazę",
"Error decrypting attachment": "Błąd odszyfrowywania załącznika",
@@ -230,8 +230,8 @@
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
"%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
"%(senderName)s made future room history visible to all room members.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
- "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla kazdego.",
- "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
+ "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla każdego.",
+ "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
"Manage Integrations": "Zarządzaj integracjami",
"Missing room_id in request": "Brakujące room_id w żądaniu",
"Missing user_id in request": "Brakujące user_id w żądaniu",
@@ -291,7 +291,7 @@
"Send anyway": "Wyślij mimo to",
"Send Reset Email": "Wyślij e-mail resetujący hasło",
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
- "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
+ "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał(a) zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
"Server error": "Błąd serwera",
"Server may be unavailable, overloaded, or search timed out :(": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
"Server may be unavailable, overloaded, or you hit a bug.": "Serwer może być niedostępny, przeciążony, lub trafiłeś na błąd.",
@@ -363,7 +363,7 @@
"You do not have permission to do that in this room.": "Nie masz pozwolenia na wykonanie tej akcji w tym pokoju.",
"You cannot place a call with yourself.": "Nie możesz wykonać połączenia do siebie.",
"You cannot place VoIP calls in this browser.": "Nie możesz przeprowadzić rozmowy głosowej VoIP w tej przeglądarce.",
- "You do not have permission to post to this room": "Nie jesteś uprawniony do pisania w tym pokoju",
+ "You do not have permission to post to this room": "Nie masz uprawnień do pisania w tym pokoju",
"You have disabled URL previews by default.": "Masz domyślnie wyłączone podglądy linków.",
"You have no visible notifications": "Nie masz widocznych powiadomień",
"You must register to use this functionality": "Musisz się zarejestrować aby móc używać tej funkcji",
@@ -915,7 +915,7 @@
"Common names and surnames are easy to guess": "Popularne imiona i nazwiska są łatwe do odgadnięcia",
"You do not have permission to invite people to this room.": "Nie masz uprawnień do zapraszania ludzi do tego pokoju.",
"User %(user_id)s does not exist": "Użytkownik %(user_id)s nie istnieje",
- "Unknown server error": "Nieznany bład serwera",
+ "Unknown server error": "Nieznany błąd serwera",
"%(oneUser)sleft %(count)s times|one": "%(oneUser)swyszedł(-ła)",
"%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sdołączył(a) i wyszedł(-ła) %(count)s razy",
"%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sdołączył(a) i wyszedł(-ła)",
@@ -930,7 +930,7 @@
"%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)szmienił(a) swój awatar %(count)s razy",
"%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)szmienił(a) swój awatar",
"%(items)s and %(count)s others|other": "%(items)s i %(count)s innych",
- "%(items)s and %(count)s others|one": "%(items)s i jeden inny",
+ "%(items)s and %(count)s others|one": "%(items)s i jedna inna osoba",
"%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)szmieniło swój awatar",
"%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)szmieniło swój awatar %(count)s razy",
"%(oneUser)schanged their name %(count)s times|one": "%(oneUser)szmienił(a) swoją nazwę",
@@ -1102,7 +1102,7 @@
"Gift": "Prezent",
"Hammer": "Młotek",
"Group & filter rooms by custom tags (refresh to apply changes)": "Grupuj i filtruj pokoje według niestandardowych znaczników (odśwież, aby zastosować zmiany)",
- "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Poprzedza ¯\\_(ツ)_/¯ do wiadomości tekstowej",
+ "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Dodaje ¯\\_(ツ)_/¯ na początku wiadomości tekstowej",
"Upgrades a room to a new version": "Aktualizuje pokój do nowej wersji",
"Changes your display nickname in the current room only": "Zmienia Twój wyświetlany pseudonim tylko dla bieżącego pokoju",
"Sets the room name": "Ustawia nazwę pokoju",
@@ -1175,7 +1175,7 @@
"%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(groups)s w tym pokoju.",
"%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s dezaktywował Flair dla %(groups)s w tym pokoju.",
"%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(newGroups)s i dezaktywował Flair dla %(oldGroups)s w tym pokoju.",
- "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał zaproszednie dla %(targetDisplayName)s aby dołączył do pokoju.",
+ "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał(a) zaproszenie dla %(targetDisplayName)s aby dołączył do pokoju.",
"%(names)s and %(count)s others are typing …|one": "%(names)s i jedna osoba pisze…",
"Cannot reach homeserver": "Błąd połączenia z serwerem domowym",
"Ensure you have a stable internet connection, or get in touch with the server admin": "Upewnij się, że posiadasz stabilne połączenie internetowe lub skontaktuj się z administratorem serwera",
@@ -1605,5 +1605,9 @@
"WARNING: Session already verified, but keys do NOT MATCH!": "OSTRZEŻENIE: Sesja już zweryfikowana, ale klucze do siebie NIE PASUJĄ!",
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "OSTRZEŻENIE: WERYFIKACJA KLUCZY NIE POWIODŁA SIĘ! Klucz podpisujący dla %(userId)s oraz sesji %(deviceId)s to \"%(fprint)s\", nie pasuje on do podanego klucza \"%(fingerprint)s\". To może oznaczać że Twoja komunikacja jest przechwytywana!",
"Displays information about a user": "Pokazuje informacje na temat użytkownika",
- "Send a bug report with logs": "Wyślij raport błędu z logami"
+ "Send a bug report with logs": "Wyślij raport błędu z logami",
+ "Use Single Sign On to continue": "Użyj pojedynczego logowania, aby kontynuować",
+ "Confirm adding this email address by using Single Sign On to prove your identity.": "Potwierdź dodanie tego adresu e-mail przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość.",
+ "Single Sign On": "Pojedyncze logowanie",
+ "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potwierdź dodanie tego numeru telefonu przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość."
}
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index be9c6bfdd4..cd5a320062 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -52,7 +52,7 @@
"Invites user with given id to current room": "Приглашает пользователя с заданным ID в текущую комнату",
"Sign in with": "Войти с помощью",
"Joins room with given alias": "Входит в комнату с заданным псевдонимом",
- "Kicks user with given id": "Выкидывает пользователя с заданным ID",
+ "Kicks user with given id": "Выгоняет пользователя с заданным ID",
"Labs": "Лаборатория",
"Leave room": "Покинуть комнату",
"Logout": "Выйти",
@@ -97,13 +97,13 @@
"Who can read history?": "Кто может читать историю?",
"You do not have permission to post to this room": "Вы не можете писать в эту комнату",
"You have no visible notifications": "Нет видимых уведомлений",
- "%(targetName)s accepted an invitation.": "%(targetName)s принимает приглашение.",
- "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принимает приглашение от %(displayName)s.",
+ "%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
+ "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
"Active call": "Активный вызов",
"%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
"%(senderName)s banned %(targetName)s.": "%(senderName)s забанил(а) %(targetName)s.",
"Call Timeout": "Нет ответа",
- "%(senderName)s changed their profile picture.": "%(senderName)s изменяет свой аватар.",
+ "%(senderName)s changed their profile picture.": "%(senderName)s изменил свой аватар.",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s изменил(а) уровни прав %(powerLevelDiffText)s.",
"%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s изменил(а) название комнаты на %(roomName)s.",
"%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
@@ -115,8 +115,8 @@
"Failure to create room": "Не удалось создать комнату",
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
"click to reveal": "нажмите для открытия",
- "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
- "%(targetName)s joined the room.": "%(targetName)s входит в комнату.",
+ "%(senderName)s invited %(targetName)s.": "%(senderName)s пригласил %(targetName)s.",
+ "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
"%(targetName)s left the room.": "%(targetName)s покидает комнату.",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
@@ -223,9 +223,9 @@
"Reason": "Причина",
"%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
"Reject invitation": "Отклонить приглашение",
- "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удаляет своё отображаемое имя (%(oldDisplayName)s).",
- "%(senderName)s removed their profile picture.": "%(senderName)s удаляет свой аватар.",
- "%(senderName)s requested a VoIP conference.": "%(senderName)s хочет начать конференц-звонок.",
+ "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил своё отображаемое имя (%(oldDisplayName)s).",
+ "%(senderName)s removed their profile picture.": "%(senderName)s удалил свой аватар.",
+ "%(senderName)s requested a VoIP conference.": "%(senderName)s запросил конференц-звонок.",
"Riot does not have permission to send you notifications - please check your browser settings": "У Riot нет разрешения на отправку уведомлений — проверьте настройки браузера",
"Riot was not given permission to send notifications - please try again": "Riot не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
"riot-web version:": "версия riot-web:",
@@ -302,8 +302,8 @@
"Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
"Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
"Session ID": "ID сессии",
- "%(senderName)s set a profile picture.": "%(senderName)s устанавливает себе аватар.",
- "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s меняет отображаемое имя на %(displayName)s.",
+ "%(senderName)s set a profile picture.": "%(senderName)s установил себе аватар.",
+ "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил отображаемое имя на %(displayName)s.",
"Signed Out": "Выполнен выход",
"This room is not accessible by remote Matrix servers": "Это комната недоступна из других серверов Matrix",
"Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
@@ -696,7 +696,7 @@
"This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
"Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
"In reply to ": "В ответ на ",
- "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s меняет отображаемое имя на %(displayName)s.",
+ "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил отображаемое имя на %(displayName)s.",
"Failed to set direct chat tag": "Не удалось установить тег прямого чата",
"Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
"Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
@@ -977,7 +977,7 @@
"Render simple counters in room header": "Отображать простые счетчики в заголовке комнаты",
"Enable Emoji suggestions while typing": "Включить предложения смайликов при наборе",
"Show a placeholder for removed messages": "Показывать плашки вместо удалённых сообщений",
- "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, кики и баны)",
+ "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, выгоны и баны)",
"Show avatar changes": "Показывать изменения аватара",
"Show display name changes": "Показывать изменения отображаемого имени",
"Show a reminder to enable Secure Message Recovery in encrypted rooms": "Напоминать включить Безопасное Восстановление Сообщений в зашифрованных комнатах",
@@ -1276,7 +1276,7 @@
"Join the conversation with an account": "Присоединиться к разговору с учётной записью",
"Sign Up": "Зарегистрироваться",
"Sign In": "Войти",
- "You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны %(memberName)s из %(roomName)s",
+ "You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны из %(roomName)s пользователем %(memberName)s",
"Reason: %(reason)s": "Причина: %(reason)s",
"Forget this room": "Забыть эту комнату",
"Re-join": "Пере-присоединение",
@@ -2122,7 +2122,7 @@
"Enable cross-signing to verify per-user instead of per-session": "Разрешить кросс-подпись для подтверждения пользователей вместо отдельных сессий",
"Keep recovery passphrase in memory for this session": "Сохранить пароль восстановления в памяти для этой сессии",
"Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Отдельно подтверждать каждую сессию пользователя как доверенную, не доверяя кросс-подписанным устройствам.",
- "Securely cache encrypted messages locally for them to appear in search results, using ": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска с помощью ",
+ "Securely cache encrypted messages locally for them to appear in search results, using ": "Кэшировать шифрованные сообщения локально, чтобы они выводились в результатах поиска, используя: ",
" to store messages from ": " чтобы сохранить сообщения от ",
"Securely cache encrypted messages locally for them to appear in search results.": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
"Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with search components added .": "Отсутствуют некоторые необходимые компоненты для Riot, чтобы безопасно кэшировать шифрованные сообщения локально. Если вы хотите попробовать эту возможность, соберите самостоятельно Riot Desktop с добавлением поисковых компонентов .",
@@ -2144,5 +2144,7 @@
"%(role)s in %(roomName)s": "%(role)sв %(roomName)s",
"Start verification again from their profile.": "Начните подтверждение заново в профиле пользователя.",
"Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователя в его профиле.",
- "Send a Direct Message": "Отправить сообщение"
+ "Send a Direct Message": "Отправить сообщение",
+ "Light": "Светлая",
+ "Dark": "Темная"
}
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index ed66bbb362..1f8f2ba48c 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2496,5 +2496,26 @@
"Show %(count)s more|other": "Shfaq %(count)s të tjera",
"Show %(count)s more|one": "Shfaq %(count)s tjetër",
"Leave Room": "Dil Nga Dhoma",
- "Room options": "Mundësi dhome"
+ "Room options": "Mundësi dhome",
+ "Light": "E çelët",
+ "Dark": "E errët",
+ "Use the improved room list (in development - will refresh to apply changes)": "Përdorni listën e përmirësuar të dhomave (në zhvillim - që të aplikohen ndryshimet, duhet rifreskuar)",
+ "Customise your appearance": "Përshtatni dukjen tuaj",
+ "Appearance Settings only affect this Riot session.": "Rregullimet e Dukjes prekin vetëm këtë sesion Riot.",
+ "Activity": "Veprimtari",
+ "A-Z": "A-Z",
+ "Recovery Key": "Kyç Rimarrjesh",
+ "This isn't the recovery key for your account": "Ky s’është kyçi i rimarrjeve për llogarinë tuaj",
+ "This isn't a valid recovery key": "Ky s’është kyç rimarrjesh i vlefshëm",
+ "Looks good!": "Mirë duket!",
+ "Use Recovery Key or Passphrase": "Përdorni Kyç ose Frazëkalim Rimarrjesh",
+ "Use Recovery Key": "Përdorni Kyç Rimarrjesh",
+ "Enter your Recovery Key or enter a Recovery Passphrase to continue.": "Që të vazhdohet, jepni Kyçin tuaj të Rimarrjeve ose jepni një Frazëkalim Rimarrjesh.",
+ "Enter your Recovery Key to continue.": "Që të vazhdohet, jepni Kyçin tuaj të Rimarrjeve.",
+ "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "Që të depozitoni kyçe & të fshehta fshehtëzimi me të dhënat e llogarisë tuaj, përmirësoni Kyçin tuaj të Rimarrjeve. Nëse humbni këto kredenciale hyrjesh, do t’ju duhet të shkyçni të dhënat tuaja.",
+ "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "Ruajeni diku të parrezik Kyçin tuaj të Rimarrjeve, mund të përdoret për të shkyçur mesazhet & të dhënat tuaja të fshehtëzuara.",
+ "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "Krijoni një Kyç Rimarrjesh që të depozitoni kyçe & të fshehta fshehtëzimi me të dhënat e llogarisë tuaj. Nëse humbni këto kredenciale, do t’ju duhet të shkyçni të dhënat tuaja.",
+ "Create a Recovery Key": "Krijoni një Kyç Rimarrjesh",
+ "Upgrade your Recovery Key": "Përmirësoni Kyçin tuaj të Rimarrjeve",
+ "Store your Recovery Key": "Depozitoni Kyçin tuaj të Rimarrjeve"
}
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 481167a645..7eedfce238 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1494,5 +1494,9 @@
"Cannot reach homeserver": "不可连接到主服务器",
"Ensure you have a stable internet connection, or get in touch with the server admin": "确保您的网络连接稳定，或与服务器管理员联系",
"Ask your Riot admin to check your config for incorrect or duplicate entries.": "跟您的Riot管理员确认您的配置不正确或重复的条目。",
- "Cannot reach identity server": "不可连接到身份服务器"
+ "Cannot reach identity server": "不可连接到身份服务器",
+ "Room name or address": "房间名称或地址",
+ "Joins room with given address": "使用给定地址加入房间",
+ "Verify this login": "验证此登录名",
+ "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "通过从其他会话之一验证此登录名并授予其访问加密信息的权限来确认您的身份"
}
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 65f90f2c13..c89c049ae5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2507,5 +2507,25 @@
"sent an image.": "傳送圖片。",
"You: %(message)s": "您：%(message)s",
"Activity": "活動",
- "A-Z": "A-Z"
+ "A-Z": "A-Z",
+ "Light": "淺色",
+ "Dark": "暗色",
+ "Customise your appearance": "自訂您的外觀",
+ "Appearance Settings only affect this Riot session.": "外觀設定僅會影響此 Riot 工作階段。",
+ "Recovery Key": "復原金鑰",
+ "This isn't the recovery key for your account": "這不是您帳號的復原金鑰",
+ "This isn't a valid recovery key": "這不是有效的復原金鑰",
+ "Looks good!": "看起來不錯！",
+ "Use Recovery Key or Passphrase": "使用復原金鑰或通關密語",
+ "Use Recovery Key": "使用復原金鑰",
+ "Enter your Recovery Key or enter a Recovery Passphrase to continue.": "輸入您的復原金鑰或輸入復原通關密語以繼續。",
+ "Enter your Recovery Key to continue.": "輸入您的復原金鑰以繼續。",
+ "Upgrade your Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you'll need it to unlock your data.": "升級您的復原金鑰以儲存加密金鑰與您的帳號資料。如果您失去對此登入階段的存取權，您必須用它來解鎖您的資料。",
+ "Store your Recovery Key somewhere safe, it can be used to unlock your encrypted messages & data.": "將復原金鑰存放在安全的地方，它可以用於解鎖您的已加密訊息與資料。",
+ "Create a Recovery Key to store encryption keys & secrets with your account data. If you lose access to this login you’ll need it to unlock your data.": "建立您的復原金鑰以儲存加密金鑰與您的帳號資料。如果您失去對此登入階段的存取權，您必須用它來解鎖您的資料。",
+ "Create a Recovery Key": "建立復原金鑰",
+ "Upgrade your Recovery Key": "升級您的復原金鑰",
+ "Store your Recovery Key": "儲存您的復原金鑰",
+ "Use the improved room list (in development - will refresh to apply changes)": "使用改進的聊天室清單（開發中 ── 將會重新整理以套用變更）",
+ "Use the improved room list (will refresh to apply changes)": "使用改進的聊天室清單（將會重新整理以套用變更）"
}
diff --git a/src/indexing/BaseEventIndexManager.ts b/src/indexing/BaseEventIndexManager.ts
index c40d1300ea..be7b89be37 100644
--- a/src/indexing/BaseEventIndexManager.ts
+++ b/src/indexing/BaseEventIndexManager.ts
@@ -134,6 +134,19 @@ export default abstract class BaseEventIndexManager {
throw new Error("Unimplemented");
}
+ /**
+ * Check if the room with the given id is already indexed.
+ *
+ * @param {string} roomId The ID of the room which we want to check if it
+ * has been already indexed.
+ *
+ * @return {Promise} Returns true if the index contains events for
+ * the given room, false otherwise.
+ */
+ isRoomIndexed(roomId: string): Promise {
+ throw new Error("Unimplemented");
+ }
+
/**
* Get statistical information of the index.
*
@@ -144,6 +157,29 @@ export default abstract class BaseEventIndexManager {
throw new Error("Unimplemented");
}
+
+ /**
+ * Get the user version of the database.
+ * @return {Promise} A promise that will resolve to the user stored
+ * version number.
+ */
+ async getUserVersion(): Promise {
+ throw new Error("Unimplemented");
+ }
+
+ /**
+ * Set the user stored version to the given version number.
+ *
+ * @param {number} version The new version that should be stored in the
+ * database.
+ *
+ * @return {Promise} A promise that will resolve once the new version
+ * is stored.
+ */
+ async setUserVersion(version: number): Promise {
+ throw new Error("Unimplemented");
+ }
+
/**
* Commit the previously queued up events to the index.
*
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index d4e8ab0117..1dc31869c9 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -42,9 +42,6 @@ export default class EventIndex extends EventEmitter {
async init() {
const indexManager = PlatformPeg.get().getEventIndexingManager();
- await indexManager.initEventIndex();
- console.log("EventIndex: Successfully initialized the event index");
-
this.crawlerCheckpoints = await indexManager.loadCheckpoints();
console.log("EventIndex: Loaded checkpoints", this.crawlerCheckpoints);
@@ -62,6 +59,7 @@ export default class EventIndex extends EventEmitter {
client.on('Event.decrypted', this.onEventDecrypted);
client.on('Room.timelineReset', this.onTimelineReset);
client.on('Room.redaction', this.onRedaction);
+ client.on('RoomState.events', this.onRoomStateEvent);
}
/**
@@ -76,6 +74,7 @@ export default class EventIndex extends EventEmitter {
client.removeListener('Event.decrypted', this.onEventDecrypted);
client.removeListener('Room.timelineReset', this.onTimelineReset);
client.removeListener('Room.redaction', this.onRedaction);
+ client.removeListener('RoomState.events', this.onRoomStateEvent);
}
/**
@@ -194,6 +193,15 @@ export default class EventIndex extends EventEmitter {
}
}
+ onRoomStateEvent = async (ev, state) => {
+ if (!MatrixClientPeg.get().isRoomEncrypted(state.roomId)) return;
+
+ if (ev.getType() === "m.room.encryption" && !await this.isRoomIndexed(state.roomId)) {
+ console.log("EventIndex: Adding a checkpoint for a newly encrypted room", state.roomId);
+ this.addRoomCheckpoint(state.roomId, true);
+ }
+ }
+
/*
* The Event.decrypted listener.
*
@@ -234,26 +242,12 @@ export default class EventIndex extends EventEmitter {
*/
onTimelineReset = async (room, timelineSet, resetAllTimelines) => {
if (room === null) return;
-
- const indexManager = PlatformPeg.get().getEventIndexingManager();
if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
- const timeline = room.getLiveTimeline();
- const token = timeline.getPaginationToken("b");
+ console.log("EventIndex: Adding a checkpoint because of a limited timeline",
+ room.roomId);
- const backwardsCheckpoint = {
- roomId: room.roomId,
- token: token,
- fullCrawl: false,
- direction: "b",
- };
-
- console.log("EventIndex: Added checkpoint because of a limited timeline",
- backwardsCheckpoint);
-
- await indexManager.addCrawlerCheckpoint(backwardsCheckpoint);
-
- this.crawlerCheckpoints.push(backwardsCheckpoint);
+ this.addRoomCheckpoint(room.roomId, false);
}
/**
@@ -334,7 +328,7 @@ export default class EventIndex extends EventEmitter {
avatar_url: ev.sender.getMxcAvatarUrl(),
};
- indexManager.addEventToIndex(e, profile);
+ await indexManager.addEventToIndex(e, profile);
}
/**
@@ -345,6 +339,51 @@ export default class EventIndex extends EventEmitter {
this.emit("changedCheckpoint", this.currentRoom());
}
+ async addEventsFromLiveTimeline(timeline) {
+ const events = timeline.getEvents();
+
+ for (let i = 0; i < events.length; i++) {
+ const ev = events[i];
+ await this.addLiveEventToIndex(ev);
+ }
+ }
+
+ async addRoomCheckpoint(roomId, fullCrawl = false) {
+ const indexManager = PlatformPeg.get().getEventIndexingManager();
+ const client = MatrixClientPeg.get();
+ const room = client.getRoom(roomId);
+
+ if (!room) return;
+
+ const timeline = room.getLiveTimeline();
+ const token = timeline.getPaginationToken("b");
+
+ if (!token) {
+ // The room doesn't contain any tokens, meaning the live timeline
+ // contains all the events, add those to the index.
+ await this.addEventsFromLiveTimeline(timeline);
+ return;
+ }
+
+ const checkpoint = {
+ roomId: room.roomId,
+ token: token,
+ fullCrawl: fullCrawl,
+ direction: "b",
+ };
+
+ console.log("EventIndex: Adding checkpoint", checkpoint);
+
+ try {
+ await indexManager.addCrawlerCheckpoint(checkpoint);
+ } catch (e) {
+ console.log("EventIndex: Error adding new checkpoint for room",
+ room.roomId, checkpoint, e);
+ }
+
+ this.crawlerCheckpoints.push(checkpoint);
+ }
+
/**
* The main crawler loop.
*
@@ -833,6 +872,20 @@ export default class EventIndex extends EventEmitter {
return indexManager.getStats();
}
+ /**
+ * Check if the room with the given id is already indexed.
+ *
+ * @param {string} roomId The ID of the room which we want to check if it
+ * has been already indexed.
+ *
+ * @return {Promise} Returns true if the index contains events for
+ * the given room, false otherwise.
+ */
+ async isRoomIndexed(roomId) {
+ const indexManager = PlatformPeg.get().getEventIndexingManager();
+ return indexManager.isRoomIndexed(roomId);
+ }
+
/**
* Get the room that we are currently crawling.
*
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index ae4c14dafd..20e05f985d 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -23,6 +23,8 @@ import PlatformPeg from "../PlatformPeg";
import EventIndex from "../indexing/EventIndex";
import SettingsStore, {SettingLevel} from '../settings/SettingsStore';
+const INDEX_VERSION = 1;
+
class EventIndexPeg {
constructor() {
this.index = null;
@@ -66,8 +68,25 @@ class EventIndexPeg {
*/
async initEventIndex() {
const index = new EventIndex();
+ const indexManager = PlatformPeg.get().getEventIndexingManager();
try {
+ await indexManager.initEventIndex();
+
+ const userVersion = await indexManager.getUserVersion();
+ const eventIndexIsEmpty = await indexManager.isEventIndexEmpty();
+
+ if (eventIndexIsEmpty) {
+ await indexManager.setUserVersion(INDEX_VERSION);
+ } else if (userVersion === 0 && !eventIndexIsEmpty) {
+ await indexManager.closeEventIndex();
+ await this.deleteEventIndex();
+
+ await indexManager.initEventIndex();
+ await indexManager.setUserVersion(INDEX_VERSION);
+ }
+
+ console.log("EventIndex: Successfully initialized the event index");
await index.init();
} catch (e) {
console.log("EventIndex: Error initializing the event index", e);
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index fad932fa4b..eb882b2d18 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -30,6 +30,8 @@ import PushToMatrixClientController from './controllers/PushToMatrixClientContro
import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
import FontSizeController from './controllers/FontSizeController';
+import SystemFontController from './controllers/SystemFontController';
+import UseSystemFontController from './controllers/UseSystemFontController';
// These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -140,9 +142,10 @@ export const SETTINGS = {
},
"feature_new_room_list": {
isFeature: true,
- displayName: _td("Use the improved room list (in development - refresh to apply changes)"),
+ displayName: _td("Use the improved room list (will refresh to apply changes)"),
supportedLevels: LEVELS_FEATURE,
default: false,
+ controller: new ReloadOnChangeController(),
},
"feature_custom_themes": {
isFeature: true,
@@ -152,7 +155,7 @@ export const SETTINGS = {
},
"feature_irc_ui": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
- displayName: _td('Use IRC layout'),
+ displayName: _td('Enable IRC layout option in the appearance tab'),
default: false,
isFeature: true,
},
@@ -177,7 +180,7 @@ export const SETTINGS = {
controller: new FontSizeController(),
},
"useCustomFontSize": {
- displayName: _td("Custom font size"),
+ displayName: _td("Use custom size"),
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: false,
},
@@ -187,6 +190,11 @@ export const SETTINGS = {
default: true,
invertedSettingName: 'MessageComposerInput.dontSuggestEmoji',
},
+ // TODO: Wire up appropriately to UI (FTUE notifications)
+ "Notifications.alwaysShowBadgeCounts": {
+ supportedLevels: ['account'],
+ default: false,
+ },
"useCompactLayout": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Use compact timeline layout'),
@@ -313,6 +321,18 @@ export const SETTINGS = {
default: true,
displayName: _td("Match system theme"),
},
+ "useSystemFont": {
+ supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+ default: false,
+ displayName: _td("Use a system font"),
+ controller: new UseSystemFontController(),
+ },
+ "systemFont": {
+ supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+ default: "",
+ displayName: _td("System font name"),
+ controller: new SystemFontController(),
+ },
"webRtcAllowPeerToPeer": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
displayName: _td('Allow Peer-to-Peer for 1:1 calls'),
@@ -520,11 +540,6 @@ export const SETTINGS = {
displayName: _td("Enable message search in encrypted rooms"),
default: true,
},
- "keepSecretStoragePassphraseForSession": {
- supportedLevels: ['device', 'config'],
- displayName: _td("Keep recovery passphrase in memory for this session"),
- default: false,
- },
"crawlerSleepTime": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
displayName: _td("How fast should messages be downloaded."),
@@ -549,4 +564,9 @@ export const SETTINGS = {
displayName: _td("IRC display name width"),
default: 80,
},
+ "useIRCLayout": {
+ supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+ displayName: _td("Use IRC layout"),
+ default: false,
+ },
};
diff --git a/src/settings/WatchManager.js b/src/settings/WatchManager.js
index 472b13966f..3f54ca929e 100644
--- a/src/settings/WatchManager.js
+++ b/src/settings/WatchManager.js
@@ -51,8 +51,17 @@ export class WatchManager {
const roomWatchers = this._watchers[settingName];
const callbacks = [];
- if (inRoomId !== null && roomWatchers[inRoomId]) callbacks.push(...roomWatchers[inRoomId]);
- if (roomWatchers[null]) callbacks.push(...roomWatchers[null]);
+ if (inRoomId !== null && roomWatchers[inRoomId]) {
+ callbacks.push(...roomWatchers[inRoomId]);
+ }
+
+ if (!inRoomId) {
+ // Fire updates to all the individual room watchers too, as they probably
+ // care about the change higher up.
+ callbacks.push(...Object.values(roomWatchers).reduce((r, a) => [...r, ...a], []));
+ } else if (roomWatchers[null]) {
+ callbacks.push(...roomWatchers[null]);
+ }
for (const callback of callbacks) {
callback(inRoomId, atLevel, newValueAtLevel);
diff --git a/src/settings/controllers/FontSizeController.js b/src/settings/controllers/FontSizeController.ts
similarity index 80%
rename from src/settings/controllers/FontSizeController.js
rename to src/settings/controllers/FontSizeController.ts
index 3ef01ab99b..6440fd32fe 100644
--- a/src/settings/controllers/FontSizeController.js
+++ b/src/settings/controllers/FontSizeController.ts
@@ -16,6 +16,8 @@ limitations under the License.
import SettingController from "./SettingController";
import dis from "../../dispatcher/dispatcher";
+import { UpdateFontSizePayload } from "../../dispatcher/payloads/UpdateFontSizePayload";
+import { Action } from "../../dispatcher/actions";
export default class FontSizeController extends SettingController {
constructor() {
@@ -24,8 +26,8 @@ export default class FontSizeController extends SettingController {
onChange(level, roomId, newValue) {
// Dispatch font size change so that everything open responds to the change.
- dis.dispatch({
- action: "update-font-size",
+ dis.dispatch({
+ action: Action.UpdateFontSize,
size: newValue,
});
}
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index f74dc22e84..e38a5bded1 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -20,18 +20,20 @@ import {MatrixClientPeg} from '../../MatrixClientPeg';
// XXX: This feels wrong.
import {PushProcessor} from "matrix-js-sdk/src/pushprocessor";
-function isMasterRuleEnabled() {
+// .m.rule.master being enabled means all events match that push rule
+// default action on this rule is dont_notify, but it could be something else
+function isPushNotifyDisabled() {
// Return the value of the master push rule as a default
const processor = new PushProcessor(MatrixClientPeg.get());
const masterRule = processor.getPushRuleById(".m.rule.master");
if (!masterRule) {
console.warn("No master push rule! Notifications are disabled for this user.");
- return false;
+ return true;
}
- // Why enabled == false means "enabled" is beyond me.
- return !masterRule.enabled;
+ // If the rule is enabled then check it does not notify on everything
+ return masterRule.enabled && !masterRule.actions.includes("notify");
}
function getNotifier() {
@@ -45,7 +47,7 @@ export class NotificationsEnabledController extends SettingController {
if (!getNotifier().isPossible()) return false;
if (calculatedValue === null || calculatedAtLevel === "default") {
- return !isMasterRuleEnabled();
+ return !isPushNotifyDisabled();
}
return calculatedValue;
@@ -63,7 +65,7 @@ export class NotificationBodyEnabledController extends SettingController {
if (!getNotifier().isPossible()) return false;
if (calculatedValue === null) {
- return !isMasterRuleEnabled();
+ return !isPushNotifyDisabled();
}
return calculatedValue;
diff --git a/src/settings/controllers/SystemFontController.ts b/src/settings/controllers/SystemFontController.ts
new file mode 100644
index 0000000000..4f591efc17
--- /dev/null
+++ b/src/settings/controllers/SystemFontController.ts
@@ -0,0 +1,36 @@
+/*
+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 SettingController from "./SettingController";
+import SettingsStore from "../SettingsStore";
+import dis from "../../dispatcher/dispatcher";
+import { UpdateSystemFontPayload } from "../../dispatcher/payloads/UpdateSystemFontPayload";
+import { Action } from "../../dispatcher/actions";
+
+export default class SystemFontController extends SettingController {
+ constructor() {
+ super();
+ }
+
+ onChange(level, roomId, newValue) {
+ // Dispatch font size change so that everything open responds to the change.
+ dis.dispatch({
+ action: Action.UpdateSystemFont,
+ useSystemFont: SettingsStore.getValue("useSystemFont"),
+ font: newValue,
+ });
+ }
+}
diff --git a/src/settings/controllers/UseSystemFontController.ts b/src/settings/controllers/UseSystemFontController.ts
new file mode 100644
index 0000000000..d598b25962
--- /dev/null
+++ b/src/settings/controllers/UseSystemFontController.ts
@@ -0,0 +1,36 @@
+/*
+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 SettingController from "./SettingController";
+import SettingsStore from "../SettingsStore";
+import dis from "../../dispatcher/dispatcher";
+import { UpdateSystemFontPayload } from "../../dispatcher/payloads/UpdateSystemFontPayload";
+import { Action } from "../../dispatcher/actions";
+
+export default class UseSystemFontController extends SettingController {
+ constructor() {
+ super();
+ }
+
+ onChange(level, roomId, newValue) {
+ // Dispatch font size change so that everything open responds to the change.
+ dis.dispatch({
+ action: Action.UpdateSystemFont,
+ useSystemFont: newValue,
+ font: SettingsStore.getValue("systemFont"),
+ });
+ }
+}
diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js
index fea2e92c62..732ce6c550 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.js
@@ -18,6 +18,7 @@ limitations under the License.
import {MatrixClientPeg} from '../../MatrixClientPeg';
import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
import {SettingLevel} from "../SettingsStore";
+import {objectClone, objectKeyChanges} from "../../utils/objects";
const BREADCRUMBS_LEGACY_EVENT_TYPE = "im.vector.riot.breadcrumb_rooms";
const BREADCRUMBS_EVENT_TYPE = "im.vector.setting.breadcrumbs";
@@ -45,7 +46,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
newClient.on("accountData", this._onAccountData);
}
- _onAccountData(event) {
+ _onAccountData(event, prevEvent) {
if (event.getType() === "org.matrix.preview_urls") {
let val = event.getContent()['disable'];
if (typeof(val) !== "boolean") {
@@ -56,8 +57,10 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
this._watchers.notifyUpdate("urlPreviewsEnabled", null, SettingLevel.ACCOUNT, val);
} else if (event.getType() === "im.vector.web.settings") {
- // We can't really discern what changed, so trigger updates for everything
- for (const settingName of Object.keys(event.getContent())) {
+ // Figure out what changed and fire those updates
+ const prevContent = prevEvent ? prevEvent.getContent() : {};
+ const changedSettings = objectKeyChanges(prevContent, event.getContent());
+ for (const settingName of changedSettings) {
const val = event.getContent()[settingName];
this._watchers.notifyUpdate(settingName, null, SettingLevel.ACCOUNT, val);
}
@@ -159,7 +162,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
const event = cli.getAccountData(eventType);
if (!event || !event.getContent()) return null;
- return event.getContent();
+ return objectClone(event.getContent()); // clone to prevent mutation
}
_notifyBreadcrumbsUpdate(event) {
diff --git a/src/settings/handlers/MatrixClientBackedSettingsHandler.js b/src/settings/handlers/MatrixClientBackedSettingsHandler.js
index effe7ae9a7..63725b4dff 100644
--- a/src/settings/handlers/MatrixClientBackedSettingsHandler.js
+++ b/src/settings/handlers/MatrixClientBackedSettingsHandler.js
@@ -42,6 +42,10 @@ export default class MatrixClientBackedSettingsHandler extends SettingsHandler {
MatrixClientBackedSettingsHandler._instances.push(this);
}
+ get client() {
+ return MatrixClientBackedSettingsHandler._matrixClient;
+ }
+
initMatrixClient() {
console.warn("initMatrixClient not overridden");
}
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 1e9d3f7bed..b2af81779b 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -18,6 +18,7 @@ limitations under the License.
import {MatrixClientPeg} from '../../MatrixClientPeg';
import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
import {SettingLevel} from "../SettingsStore";
+import {objectClone, objectKeyChanges} from "../../utils/objects";
const ALLOWED_WIDGETS_EVENT_TYPE = "im.vector.setting.allowed_widgets";
@@ -40,7 +41,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
newClient.on("Room.accountData", this._onAccountData);
}
- _onAccountData(event, room) {
+ _onAccountData(event, room, prevEvent) {
const roomId = room.roomId;
if (event.getType() === "org.matrix.room.preview_urls") {
@@ -55,8 +56,10 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
} else if (event.getType() === "org.matrix.room.color_scheme") {
this._watchers.notifyUpdate("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
} else if (event.getType() === "im.vector.web.settings") {
- // We can't really discern what changed, so trigger updates for everything
- for (const settingName of Object.keys(event.getContent())) {
+ // Figure out what changed and fire those updates
+ const prevContent = prevEvent ? prevEvent.getContent() : {};
+ const changedSettings = objectKeyChanges(prevContent, event.getContent());
+ for (const settingName of changedSettings) {
const val = event.getContent()[settingName];
this._watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_ACCOUNT, val);
}
@@ -134,6 +137,6 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
const event = room.getAccountData(eventType);
if (!event || !event.getContent()) return null;
- return event.getContent();
+ return objectClone(event.getContent()); // clone to prevent mutation
}
}
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
index 6407818450..d8e775742c 100644
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ b/src/settings/handlers/RoomSettingsHandler.js
@@ -18,6 +18,7 @@ limitations under the License.
import {MatrixClientPeg} from '../../MatrixClientPeg';
import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
import {SettingLevel} from "../SettingsStore";
+import {objectClone, objectKeyChanges} from "../../utils/objects";
/**
* Gets and sets settings at the "room" level.
@@ -38,8 +39,15 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
newClient.on("RoomState.events", this._onEvent);
}
- _onEvent(event) {
+ _onEvent(event, state, prevEvent) {
const roomId = event.getRoomId();
+ const room = this.client.getRoom(roomId);
+
+ // Note: the tests often fire setting updates that don't have rooms in the store, so
+ // we fail softly here. We shouldn't assume that the state being fired is current
+ // state, but we also don't need to explode just because we didn't find a room.
+ if (!room) console.warn(`Unknown room caused setting update: ${roomId}`);
+ if (room && state !== room.currentState) return; // ignore state updates which are not current
if (event.getType() === "org.matrix.room.preview_urls") {
let val = event.getContent()['disable'];
@@ -51,8 +59,10 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
this._watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM, val);
} else if (event.getType() === "im.vector.web.settings") {
- // We can't really discern what changed, so trigger updates for everything
- for (const settingName of Object.keys(event.getContent())) {
+ // Figure out what changed and fire those updates
+ const prevContent = prevEvent ? prevEvent.getContent() : {};
+ const changedSettings = objectKeyChanges(prevContent, event.getContent());
+ for (const settingName of changedSettings) {
this._watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM, event.getContent()[settingName]);
}
}
@@ -107,6 +117,6 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
const event = room.currentState.getStateEvents(eventType, "");
if (!event || !event.getContent()) return null;
- return event.getContent();
+ return objectClone(event.getContent()); // clone to prevent mutation
}
}
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index 5527284cd0..9af5156704 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -18,6 +18,8 @@ import dis from '../../dispatcher/dispatcher';
import SettingsStore, {SettingLevel} from '../SettingsStore';
import IWatcher from "./Watcher";
import { toPx } from '../../utils/units';
+import { Action } from '../../dispatcher/actions';
+import { UpdateSystemFontPayload } from '../../dispatcher/payloads/UpdateSystemFontPayload';
export class FontWatcher implements IWatcher {
public static readonly MIN_SIZE = 8;
@@ -33,6 +35,10 @@ export class FontWatcher implements IWatcher {
public start() {
this.setRootFontSize(SettingsStore.getValue("baseFontSize"));
+ this.setSystemFont({
+ useSystemFont: SettingsStore.getValue("useSystemFont"),
+ font: SettingsStore.getValue("systemFont"),
+ });
this.dispatcherRef = dis.register(this.onAction);
}
@@ -41,8 +47,10 @@ export class FontWatcher implements IWatcher {
}
private onAction = (payload) => {
- if (payload.action === 'update-font-size') {
+ if (payload.action === Action.UpdateFontSize) {
this.setRootFontSize(payload.size);
+ } else if (payload.action === Action.UpdateSystemFont) {
+ this.setSystemFont(payload);
}
};
@@ -54,4 +62,8 @@ export class FontWatcher implements IWatcher {
}
(document.querySelector(":root")).style.fontSize = toPx(fontSize);
};
+
+ private setSystemFont = ({useSystemFont, font}) => {
+ document.body.style.fontFamily = useSystemFont ? font : "";
+ };
}
diff --git a/src/settings/watchers/Watcher.ts b/src/settings/watchers/Watcher.ts
index a9f6f3f2c8..94a14faa27 100644
--- a/src/settings/watchers/Watcher.ts
+++ b/src/settings/watchers/Watcher.ts
@@ -15,6 +15,6 @@ limitations under the License.
*/
export default interface IWatcher {
- start(): void
- stop(): void
+ start(): void;
+ stop(): void;
}
\ No newline at end of file
diff --git a/src/stores/MessagePreviewStore.ts b/src/stores/MessagePreviewStore.ts
index 64d65a72f3..9e225d1709 100644
--- a/src/stores/MessagePreviewStore.ts
+++ b/src/stores/MessagePreviewStore.ts
@@ -78,9 +78,8 @@ export class MessagePreviewStore extends AsyncStoreWithClient {
}
private generatePreview(room: Room) {
- const timeline = room.getLiveTimeline();
- if (!timeline) return; // usually only happens in tests
- const events = timeline.getEvents();
+ const events = room.timeline;
+ if (!events) return; // should only happen in tests
for (let i = events.length - 1; i >= 0; i--) {
if (i === events.length - MAX_EVENTS_BACKWARDS) return; // limit reached
diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
new file mode 100644
index 0000000000..45d8829e30
--- /dev/null
+++ b/src/stores/OwnProfileStore.ts
@@ -0,0 +1,122 @@
+/*
+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 { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { User } from "matrix-js-sdk/src/models/user";
+import { throttle } from "lodash";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { _t } from "../languageHandler";
+
+interface IState {
+ displayName?: string;
+ avatarUrl?: string;
+}
+
+export class OwnProfileStore extends AsyncStoreWithClient {
+ private static internalInstance = new OwnProfileStore();
+
+ private monitoredUser: User;
+
+ private constructor() {
+ super(defaultDispatcher, {});
+ }
+
+ public static get instance(): OwnProfileStore {
+ return OwnProfileStore.internalInstance;
+ }
+
+ /**
+ * Gets the display name for the user, or null if not present.
+ */
+ public get displayName(): string {
+ if (!this.matrixClient) return this.state.displayName || null;
+
+ if (this.matrixClient.isGuest()) {
+ return _t("Guest");
+ } else if (this.state.displayName) {
+ return this.state.displayName;
+ } else {
+ return this.matrixClient.getUserId();
+ }
+ }
+
+ /**
+ * Gets the MXC URI of the user's avatar, or null if not present.
+ */
+ public get avatarMxc(): string {
+ return this.state.avatarUrl || null;
+ }
+
+ /**
+ * Gets the user's avatar as an HTTP URL of the given size. If the user's
+ * avatar is not present, this returns null.
+ * @param size The size of the avatar
+ * @returns The HTTP URL of the user's avatar
+ */
+ public getHttpAvatarUrl(size: number): string {
+ if (!this.avatarMxc) return null;
+ return this.matrixClient.mxcUrlToHttp(this.avatarMxc, size, size);
+ }
+
+ protected async onNotReady() {
+ if (this.monitoredUser) {
+ this.monitoredUser.removeListener("User.displayName", this.onProfileUpdate);
+ this.monitoredUser.removeListener("User.avatarUrl", this.onProfileUpdate);
+ }
+ if (this.matrixClient) {
+ this.matrixClient.removeListener("RoomState.events", this.onStateEvents);
+ }
+ await this.reset({});
+ }
+
+ protected async onReady() {
+ const myUserId = this.matrixClient.getUserId();
+ this.monitoredUser = this.matrixClient.getUser(myUserId);
+ if (this.monitoredUser) {
+ this.monitoredUser.on("User.displayName", this.onProfileUpdate);
+ this.monitoredUser.on("User.avatarUrl", this.onProfileUpdate);
+ }
+
+ // We also have to listen for membership events for ourselves as the above User events
+ // are fired only with presence, which matrix.org (and many others) has disabled.
+ this.matrixClient.on("RoomState.events", this.onStateEvents);
+
+ await this.onProfileUpdate(); // trigger an initial update
+ }
+
+ protected async onAction(payload: ActionPayload) {
+ // we don't actually do anything here
+ }
+
+ private onProfileUpdate = async () => {
+ // We specifically do not use the User object we stored for profile info as it
+ // could easily be wrong (such as per-room instead of global profile).
+ const profileInfo = await this.matrixClient.getProfileInfo(this.matrixClient.getUserId());
+ await this.updateState({displayName: profileInfo.displayname, avatarUrl: profileInfo.avatar_url});
+ };
+
+ // TSLint wants this to be a member, but we don't want that.
+ // tslint:disable-next-line
+ private onStateEvents = throttle(async (ev: MatrixEvent) => {
+ const myUserId = MatrixClientPeg.get().getUserId();
+ if (ev.getType() === 'm.room.member' && ev.getSender() === myUserId && ev.getStateKey() === myUserId) {
+ await this.onProfileUpdate();
+ }
+ }, 200, {trailing: true, leading: true});
+}
diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index cc64e24a03..63b8c428eb 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -20,11 +20,10 @@ import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManage
import { PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
export const PHASE_INTRO = 0;
-export const PHASE_RECOVERY_KEY = 1;
-export const PHASE_BUSY = 2;
-export const PHASE_DONE = 3; //final done stage, but still showing UX
-export const PHASE_CONFIRM_SKIP = 4;
-export const PHASE_FINISHED = 5; //UX can be closed
+export const PHASE_BUSY = 1;
+export const PHASE_DONE = 2; //final done stage, but still showing UX
+export const PHASE_CONFIRM_SKIP = 3;
+export const PHASE_FINISHED = 4; //UX can be closed
export class SetupEncryptionStore extends EventEmitter {
static sharedInstance() {
@@ -46,8 +45,17 @@ export class SetupEncryptionStore extends EventEmitter {
// Descriptor of the key that the secrets we want are encrypted with
this.keyInfo = null;
- MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
- MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+ const cli = MatrixClientPeg.get();
+ cli.on("crypto.verification.request", this.onVerificationRequest);
+ cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+
+ const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId());
+ if (requestsInProgress.length) {
+ // If there are multiple, we take the most recent. Equally if the user sends another request from
+ // another device after this screen has been shown, we'll switch to the new one, so this
+ // generally doesn't support multiple requests.
+ this._setActiveVerificationRequest(requestsInProgress[requestsInProgress.length - 1]);
+ }
this.fetchKeyInfo();
}
@@ -68,7 +76,7 @@ export class SetupEncryptionStore extends EventEmitter {
async fetchKeyInfo() {
const keys = await MatrixClientPeg.get().isSecretStored('m.cross_signing.master', false);
- if (Object.keys(keys).length === 0) {
+ if (keys === null || Object.keys(keys).length === 0) {
this.keyId = null;
this.keyInfo = null;
} else {
@@ -81,34 +89,7 @@ export class SetupEncryptionStore extends EventEmitter {
this.emit("update");
}
- async startKeyReset() {
- try {
- await accessSecretStorage(() => {}, {forceReset: true});
- // If the keys are reset, the trust status event will fire and we'll change state
- } catch (e) {
- // dialog was cancelled - stay on the current screen
- }
- }
-
- async useRecoveryKey() {
- this.phase = PHASE_RECOVERY_KEY;
- this.emit("update");
- }
-
- cancelUseRecoveryKey() {
- this.phase = PHASE_INTRO;
- this.emit("update");
- }
-
- async setupWithRecoveryKey(recoveryKey) {
- this.startTrustCheck({[this.keyId]: recoveryKey});
- }
-
async usePassPhrase() {
- this.startTrustCheck();
- }
-
- async startTrustCheck(withKeys) {
this.phase = PHASE_BUSY;
this.emit("update");
const cli = MatrixClientPeg.get();
@@ -135,9 +116,6 @@ export class SetupEncryptionStore extends EventEmitter {
// to advance before this.
await cli.restoreKeyBackupWithSecretStorage(backupInfo);
}
- }, {
- withKeys,
- passphraseOnly: true,
}).catch(reject);
} catch (e) {
console.error(e);
@@ -168,16 +146,8 @@ export class SetupEncryptionStore extends EventEmitter {
}
}
- onVerificationRequest = async (request) => {
- if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
-
- if (this.verificationRequest) {
- this.verificationRequest.off("change", this.onVerificationRequestChange);
- }
- this.verificationRequest = request;
- await request.accept();
- request.on("change", this.onVerificationRequestChange);
- this.emit("update");
+ onVerificationRequest = (request) => {
+ this._setActiveVerificationRequest(request);
}
onVerificationRequestChange = async () => {
@@ -218,4 +188,16 @@ export class SetupEncryptionStore extends EventEmitter {
// async - ask other clients for keys, if necessary
MatrixClientPeg.get()._crypto.cancelAndResendAllOutgoingKeyRequests();
}
+
+ async _setActiveVerificationRequest(request) {
+ if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
+
+ if (this.verificationRequest) {
+ this.verificationRequest.off("change", this.onVerificationRequestChange);
+ }
+ this.verificationRequest = request;
+ await request.accept();
+ request.on("change", this.onVerificationRequestChange);
+ this.emit("update");
+ }
}
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index af9d6801a3..ebc7b95854 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -21,11 +21,13 @@ const TILE_HEIGHT_PX = 44;
interface ISerializedListLayout {
numTiles: number;
showPreviews: boolean;
+ collapsed: boolean;
}
export class ListLayout {
private _n = 0;
private _previews = false;
+ private _collapsed = false;
constructor(public readonly tagId: TagID) {
const serialized = localStorage.getItem(this.key);
@@ -34,9 +36,19 @@ export class ListLayout {
const parsed = JSON.parse(serialized);
this._n = parsed.numTiles;
this._previews = parsed.showPreviews;
+ this._collapsed = parsed.collapsed;
}
}
+ public get isCollapsed(): boolean {
+ return this._collapsed;
+ }
+
+ public set isCollapsed(v: boolean) {
+ this._collapsed = v;
+ this.save();
+ }
+
public get showPreviews(): boolean {
return this._previews;
}
@@ -80,8 +92,12 @@ export class ListLayout {
return this.tilesToPixels(Math.min(maxTiles, n)) + padding;
}
- public tilesToPixelsWithPadding(n: number, padding: number): number {
- return this.tilesToPixels(n) + padding;
+ public tilesWithPadding(n: number, paddingPx: number): number {
+ return this.pixelsToTiles(this.tilesToPixelsWithPadding(n, paddingPx));
+ }
+
+ public tilesToPixelsWithPadding(n: number, paddingPx: number): number {
+ return this.tilesToPixels(n) + paddingPx;
}
public tilesToPixels(n: number): number {
@@ -100,6 +116,7 @@ export class ListLayout {
return {
numTiles: this.visibleTiles,
showPreviews: this.showPreviews,
+ collapsed: this.isCollapsed,
};
}
}
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 1c4e66c4b0..99eee82d4e 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -158,12 +158,12 @@ export class RoomListStore2 extends AsyncStore {
// First see if the receipt event is for our own user. If it was, trigger
// a room update (we probably read the room on a different device).
if (readReceiptChangeIsFor(payload.event, this.matrixClient)) {
- console.log(`[RoomListDebug] Got own read receipt in ${payload.event.roomId}`);
- const room = this.matrixClient.getRoom(payload.event.roomId);
+ const room = payload.room;
if (!room) {
- console.warn(`Own read receipt was in unknown room ${payload.event.roomId}`);
+ console.warn(`Own read receipt was in unknown room ${room.roomId}`);
return;
}
+ console.log(`[RoomListDebug] Got own read receipt in ${room.roomId}`);
await this.handleRoomUpdate(room, RoomUpdateCause.ReadReceipt);
return;
}
@@ -181,6 +181,12 @@ export class RoomListStore2 extends AsyncStore {
const room = this.matrixClient.getRoom(roomId);
const tryUpdate = async (updatedRoom: Room) => {
console.log(`[RoomListDebug] Live timeline event ${eventPayload.event.getId()} in ${updatedRoom.roomId}`);
+ if (eventPayload.event.getType() === 'm.room.tombstone' && eventPayload.event.getStateKey() === '') {
+ console.log(`[RoomListDebug] Got tombstone event - regenerating room list`);
+ // TODO: We could probably be smarter about this
+ await this.regenerateAllLists();
+ return; // don't pass the update down - we will have already handled it in the regen
+ }
await this.handleRoomUpdate(updatedRoom, RoomUpdateCause.Timeline);
};
if (!room) {
@@ -334,7 +340,7 @@ export class RoomListStore2 extends AsyncStore {
}
await this.algorithm.populateTags(sorts, orders);
- await this.algorithm.setKnownRooms(this.matrixClient.getRooms());
+ await this.algorithm.setKnownRooms(this.matrixClient.getVisibleRooms());
this.initialListsGenerated = true;
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index a89167095d..5f7a7bd2ef 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -127,7 +127,7 @@ export class Algorithm extends EventEmitter {
const algorithm = getListAlgorithmInstance(order, tagId, this.sortAlgorithms[tagId]);
this.algorithms[tagId] = algorithm;
- await algorithm.setRooms(this._cachedRooms[tagId])
+ await algorithm.setRooms(this._cachedRooms[tagId]);
this._cachedRooms[tagId] = algorithm.orderedRooms;
this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
@@ -170,12 +170,16 @@ export class Algorithm extends EventEmitter {
// When we do have a room though, we expect to be able to find it
const tag = this.roomIdsToTags[val.roomId][0];
if (!tag) throw new Error(`${val.roomId} does not belong to a tag and cannot be sticky`);
- let position = this.cachedRooms[tag].indexOf(val);
+
+ // We specifically do NOT use the ordered rooms set as it contains the sticky room, which
+ // means we'll be off by 1 when the user is switching rooms. This leads to visual jumping
+ // when the user is moving south in the list (not north, because of math).
+ let position = this.getOrderedRoomsWithoutSticky()[tag].indexOf(val);
if (position < 0) throw new Error(`${val.roomId} does not appear to be known and cannot be sticky`);
// 🐉 Here be dragons.
// Before we can go through with lying to the underlying algorithm about a room
- // we need to ensure that when we do we're ready for the innevitable sticky room
+ // we need to ensure that when we do we're ready for the inevitable sticky room
// update we'll receive. To prepare for that, we first remove the sticky room and
// recalculate the state ourselves so that when the underlying algorithm calls for
// the same thing it no-ops. After we're done calling the algorithm, we'll issue
@@ -208,6 +212,12 @@ export class Algorithm extends EventEmitter {
position: position,
tag: tag,
};
+
+ // We update the filtered rooms just in case, as otherwise users will end up visiting
+ // a room while filtering and it'll disappear. We don't update the filter earlier in
+ // this function simply because we don't have to.
+ this.recalculateFilteredRoomsForTag(tag);
+ if (lastStickyRoom && lastStickyRoom.tag !== tag) this.recalculateFilteredRoomsForTag(lastStickyRoom.tag);
this.recalculateStickyRoom();
// Finally, trigger an update
@@ -231,9 +241,7 @@ export class Algorithm extends EventEmitter {
// We optimize our lookups by trying to reduce sample size as much as possible
// to the rooms we know will be deduped by the Set.
const rooms = this.cachedRooms[tagId].map(r => r); // cheap clone
- if (this._stickyRoom && this._stickyRoom.tag === tagId && this._stickyRoom.room) {
- rooms.push(this._stickyRoom.room);
- }
+ this.tryInsertStickyRoomToFilterSet(rooms, tagId);
let remainingRooms = rooms.map(r => r);
let allowedRoomsInThisTag = [];
let lastFilterPriority = orderedFilters[0].relativePriority;
@@ -263,6 +271,7 @@ export class Algorithm extends EventEmitter {
this.emit(LIST_UPDATED_EVENT);
}
+ // TODO: Remove or use.
protected addPossiblyFilteredRoomsToTag(tagId: TagID, added: Room[]): void {
const filters = this.allowedByFilter.keys();
for (const room of added) {
@@ -281,7 +290,8 @@ export class Algorithm extends EventEmitter {
protected recalculateFilteredRoomsForTag(tagId: TagID): void {
console.log(`Recalculating filtered rooms for ${tagId}`);
delete this.filteredRooms[tagId];
- const rooms = this.cachedRooms[tagId];
+ const rooms = this.cachedRooms[tagId].map(r => r); // cheap clone
+ this.tryInsertStickyRoomToFilterSet(rooms, tagId);
const filteredRooms = rooms.filter(r => this.allowedRoomsByFilters.has(r));
if (filteredRooms.length > 0) {
this.filteredRooms[tagId] = filteredRooms;
@@ -289,6 +299,17 @@ export class Algorithm extends EventEmitter {
console.log(`[DEBUG] ${filteredRooms.length}/${rooms.length} rooms filtered into ${tagId}`);
}
+ protected tryInsertStickyRoomToFilterSet(rooms: Room[], tagId: TagID) {
+ if (!this._stickyRoom || !this._stickyRoom.room || this._stickyRoom.tag !== tagId) return;
+
+ const position = this._stickyRoom.position;
+ if (position >= rooms.length) {
+ rooms.push(this._stickyRoom.room);
+ } else {
+ rooms.splice(position, 0, this._stickyRoom.room);
+ }
+ }
+
/**
* Recalculate the sticky room position. If this is being called in relation to
* a specific tag being updated, it should be given to this function to optimize
@@ -377,6 +398,20 @@ export class Algorithm extends EventEmitter {
return this.filteredRooms;
}
+ /**
+ * This returns the same as getOrderedRooms(), but without the sticky room
+ * map as it causes issues for sticky room handling (see sticky room handling
+ * for more information).
+ * @returns {ITagMap} The cached list of rooms, ordered,
+ * for each tag. May be empty, but never null/undefined.
+ */
+ private getOrderedRoomsWithoutSticky(): ITagMap {
+ if (!this.hasFilters) {
+ return this.cachedRooms;
+ }
+ return this.filteredRooms;
+ }
+
/**
* Seeds the Algorithm with a set of rooms. The algorithm will discard all
* previously known information and instead use these rooms instead.
@@ -508,16 +543,14 @@ export class Algorithm extends EventEmitter {
return true;
}
- if (cause === RoomUpdateCause.NewRoom) {
- // TODO: Be smarter and insert rather than regen the planet.
- await this.setKnownRooms([room, ...this.rooms]);
- return true;
- }
-
- if (cause === RoomUpdateCause.RoomRemoved) {
- // TODO: Be smarter and splice rather than regen the planet.
- await this.setKnownRooms(this.rooms.filter(r => r !== room));
- return true;
+ // If the update is for a room change which might be the sticky room, prevent it. We
+ // need to make sure that the causes (NewRoom and RoomRemoved) are still triggered though
+ // as the sticky room relies on this.
+ if (cause !== RoomUpdateCause.NewRoom && cause !== RoomUpdateCause.RoomRemoved) {
+ if (this.stickyRoom === room) {
+ console.warn(`[RoomListDebug] Received ${cause} update for sticky room ${room.roomId} - ignoring`);
+ return false;
+ }
}
let tags = this.roomIdsToTags[room.roomId];
@@ -541,5 +574,5 @@ export class Algorithm extends EventEmitter {
}
return true;
- };
+ }
}
diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index 325aaf19e6..15fa00c302 100644
--- a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -87,7 +87,7 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
public constructor(tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
super(tagId, initialSortingAlgorithm);
- console.log("Constructed an ImportanceAlgorithm");
+ console.log(`[RoomListDebug] Constructed an ImportanceAlgorithm for ${tagId}`);
}
// noinspection JSMethodCanBeStatic
@@ -151,8 +151,36 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
}
}
+ private async handleSplice(room: Room, cause: RoomUpdateCause): Promise {
+ if (cause === RoomUpdateCause.NewRoom) {
+ const category = this.getRoomCategory(room);
+ this.alterCategoryPositionBy(category, 1, this.indices);
+ this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
+ } else if (cause === RoomUpdateCause.RoomRemoved) {
+ const roomIdx = this.getRoomIndex(room);
+ if (roomIdx === -1) return false; // no change
+ const oldCategory = this.getCategoryFromIndices(roomIdx, this.indices);
+ this.alterCategoryPositionBy(oldCategory, -1, this.indices);
+ this.cachedOrderedRooms.splice(roomIdx, 1); // remove the room
+ } else {
+ throw new Error(`Unhandled splice: ${cause}`);
+ }
+ }
+
+ private getRoomIndex(room: Room): number {
+ let roomIdx = this.cachedOrderedRooms.indexOf(room);
+ if (roomIdx === -1) { // can only happen if the js-sdk's store goes sideways.
+ console.warn(`Degrading performance to find missing room in "${this.tagId}": ${room.roomId}`);
+ roomIdx = this.cachedOrderedRooms.findIndex(r => r.roomId === room.roomId);
+ }
+ return roomIdx;
+ }
+
public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise {
- // TODO: Handle NewRoom and RoomRemoved
+ if (cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved) {
+ return this.handleSplice(room, cause);
+ }
+
if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
throw new Error(`Unsupported update cause: ${cause}`);
}
@@ -162,11 +190,7 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
return; // Nothing to do here.
}
- let roomIdx = this.cachedOrderedRooms.indexOf(room);
- if (roomIdx === -1) { // can only happen if the js-sdk's store goes sideways.
- console.warn(`Degrading performance to find missing room in "${this.tagId}": ${room.roomId}`);
- roomIdx = this.cachedOrderedRooms.findIndex(r => r.roomId === room.roomId);
- }
+ const roomIdx = this.getRoomIndex(room);
if (roomIdx === -1) {
throw new Error(`Room ${room.roomId} has no index in ${this.tagId}`);
}
@@ -188,12 +212,18 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
// room from the array.
}
- // The room received an update, so take out the slice and sort it. This should be relatively
- // quick because the room is inserted at the top of the category, and most popular sorting
- // algorithms will deal with trying to keep the active room at the top/start of the category.
- // For the few algorithms that will have to move the thing quite far (alphabetic with a Z room
- // for example), the list should already be sorted well enough that it can rip through the
- // array and slot the changed room in quickly.
+ // Sort the category now that we've dumped the room in
+ await this.sortCategory(category);
+
+ return true; // change made
+ }
+
+ private async sortCategory(category: Category) {
+ // This should be relatively quick because the room is usually inserted at the top of the
+ // category, and most popular sorting algorithms will deal with trying to keep the active
+ // room at the top/start of the category. For the few algorithms that will have to move the
+ // thing quite far (alphabetic with a Z room for example), the list should already be sorted
+ // well enough that it can rip through the array and slot the changed room in quickly.
const nextCategoryStartIdx = category === CATEGORY_ORDER[CATEGORY_ORDER.length - 1]
? Number.MAX_SAFE_INTEGER
: this.indices[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
@@ -202,8 +232,6 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
const unsortedSlice = this.cachedOrderedRooms.splice(startIdx, numSort);
const sorted = await sortRoomsWithAlgorithm(unsortedSlice, this.tagId, this.sortingAlgorithm);
this.cachedOrderedRooms.splice(startIdx, 0, ...sorted);
-
- return true; // change made
}
// noinspection JSMethodCanBeStatic
@@ -230,14 +258,29 @@ export class ImportanceAlgorithm extends OrderingAlgorithm {
// We also need to update subsequent categories as they'll all shift by nRooms, so we
// loop over the order to achieve that.
- for (let i = CATEGORY_ORDER.indexOf(fromCategory) + 1; i < CATEGORY_ORDER.length; i++) {
- const nextCategory = CATEGORY_ORDER[i];
- indices[nextCategory] -= nRooms;
- }
+ this.alterCategoryPositionBy(fromCategory, -nRooms, indices);
+ this.alterCategoryPositionBy(toCategory, +nRooms, indices);
+ }
- for (let i = CATEGORY_ORDER.indexOf(toCategory) + 1; i < CATEGORY_ORDER.length; i++) {
- const nextCategory = CATEGORY_ORDER[i];
- indices[nextCategory] += nRooms;
+ private alterCategoryPositionBy(category: Category, n: number, indices: ICategoryIndex) {
+ // Note: when we alter a category's index, we actually have to modify the ones following
+ // the target and not the target itself.
+
+ // XXX: If this ever actually gets more than one room passed to it, it'll need more index
+ // handling. For instance, if 45 rooms are removed from the middle of a 50 room list, the
+ // index for the categories will be way off.
+
+ const nextOrderIndex = CATEGORY_ORDER.indexOf(category) + 1;
+ if (n > 0) {
+ for (let i = nextOrderIndex; i < CATEGORY_ORDER.length; i++) {
+ const nextCategory = CATEGORY_ORDER[i];
+ indices[nextCategory] += Math.abs(n);
+ }
+ } else if (n < 0) {
+ for (let i = nextOrderIndex; i < CATEGORY_ORDER.length; i++) {
+ const nextCategory = CATEGORY_ORDER[i];
+ indices[nextCategory] -= Math.abs(n);
+ }
}
// Do a quick check to see if we've completely broken the index
diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
index cce7372986..96a3f58d2c 100644
--- a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -28,7 +28,7 @@ export class NaturalAlgorithm extends OrderingAlgorithm {
public constructor(tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
super(tagId, initialSortingAlgorithm);
- console.log("Constructed a NaturalAlgorithm");
+ console.log(`[RoomListDebug] Constructed a NaturalAlgorithm for ${tagId}`);
}
public async setRooms(rooms: Room[]): Promise {
@@ -36,11 +36,19 @@ export class NaturalAlgorithm extends OrderingAlgorithm {
}
public async handleRoomUpdate(room, cause): Promise {
- // TODO: Handle NewRoom and RoomRemoved
- if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
+ const isSplice = cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved;
+ const isInPlace = cause === RoomUpdateCause.Timeline || cause === RoomUpdateCause.ReadReceipt;
+ if (!isSplice && !isInPlace) {
throw new Error(`Unsupported update cause: ${cause}`);
}
+ if (cause === RoomUpdateCause.NewRoom) {
+ this.cachedOrderedRooms.push(room);
+ } else if (cause === RoomUpdateCause.RoomRemoved) {
+ const idx = this.cachedOrderedRooms.indexOf(room);
+ if (idx >= 0) this.cachedOrderedRooms.splice(idx, 1);
+ }
+
// TODO: Optimize this to avoid useless operations
// For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
this.cachedOrderedRooms = await sortRoomsWithAlgorithm(this.cachedOrderedRooms, this.tagId, this.sortingAlgorithm);
diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
index 263e8a4cd4..f581e30630 100644
--- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
@@ -67,6 +67,5 @@ export abstract class OrderingAlgorithm {
* @param cause The cause of the update.
* @returns True if the update requires the Algorithm to update the presentation layers.
*/
- // XXX: TODO: We assume this will only ever be a position update and NOT a NewRoom or RemoveRoom change!!
public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise;
}
diff --git a/src/stores/room-list/filters/NameFilterCondition.ts b/src/stores/room-list/filters/NameFilterCondition.ts
index 7b6ed76e79..4ac5b68596 100644
--- a/src/stores/room-list/filters/NameFilterCondition.ts
+++ b/src/stores/room-list/filters/NameFilterCondition.ts
@@ -56,6 +56,14 @@ export class NameFilterCondition extends EventEmitter implements IFilterConditio
return true;
}
}
- return room.name && removeHiddenChars(room.name).toLowerCase().includes(lcFilter);
+
+ if (!room.name) return false; // should realisitically not happen: the js-sdk always calculates a name
+
+ // Note: we have to match the filter with the removeHiddenChars() room name because the
+ // function strips spaces and other characters (M becomes RN for example, in lowercase).
+ // We also doubly convert to lowercase to work around oddities of the library.
+ const noSecretsFilter = removeHiddenChars(lcFilter).toLowerCase();
+ const noSecretsName = removeHiddenChars(room.name.toLowerCase()).toLowerCase();
+ return noSecretsName.includes(noSecretsFilter);
}
}
diff --git a/src/theme.js b/src/theme.js
index 22cfd8b076..c79e466933 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -35,11 +35,67 @@ export function enumerateThemes() {
return Object.assign({}, customThemeNames, BUILTIN_THEMES);
}
+function clearCustomTheme() {
+ // remove all css variables, we assume these are there because of the custom theme
+ const inlineStyleProps = Object.values(document.body.style);
+ for (const prop of inlineStyleProps) {
+ if (prop.startsWith("--")) {
+ document.body.style.removeProperty(prop);
+ }
+ }
+ const customFontFaceStyle = document.querySelector("head > style[title='custom-theme-font-faces']");
+ if (customFontFaceStyle) {
+ customFontFaceStyle.remove();
+ }
+}
+
+const allowedFontFaceProps = [
+ "font-display",
+ "font-family",
+ "font-stretch",
+ "font-style",
+ "font-weight",
+ "font-variant",
+ "font-feature-settings",
+ "font-variation-settings",
+ "src",
+ "unicode-range",
+];
+
+function generateCustomFontFaceCSS(faces) {
+ return faces.map(face => {
+ const src = face.src && face.src.map(srcElement => {
+ let format;
+ if (srcElement.format) {
+ format = `format("${srcElement.format}")`;
+ }
+ if (srcElement.url) {
+ return `url("${srcElement.url}") ${format}`;
+ } else if (srcElement.local) {
+ return `local("${srcElement.local}") ${format}`;
+ }
+ return "";
+ }).join(", ");
+ const props = Object.keys(face).filter(prop => allowedFontFaceProps.includes(prop));
+ const body = props.map(prop => {
+ let value;
+ if (prop === "src") {
+ value = src;
+ } else if (prop === "font-family") {
+ value = `"${face[prop]}"`;
+ } else {
+ value = face[prop];
+ }
+ return `${prop}: ${value}`;
+ }).join(";");
+ return `@font-face {${body}}`;
+ }).join("\n");
+}
function setCustomThemeVars(customTheme) {
const {style} = document.body;
- function setCSSVariable(name, hexColor, doPct = true) {
+ function setCSSColorVariable(name, hexColor, doPct = true) {
style.setProperty(`--${name}`, hexColor);
if (doPct) {
// uses #rrggbbaa to define the color with alpha values at 0%, 15% and 50%
@@ -53,13 +109,30 @@ function setCustomThemeVars(customTheme) {
for (const [name, value] of Object.entries(customTheme.colors)) {
if (Array.isArray(value)) {
for (let i = 0; i < value.length; i += 1) {
- setCSSVariable(`${name}_${i}`, value[i], false);
+ setCSSColorVariable(`${name}_${i}`, value[i], false);
}
} else {
- setCSSVariable(name, value);
+ setCSSColorVariable(name, value);
}
}
}
+ if (customTheme.fonts) {
+ const {fonts} = customTheme;
+ if (fonts.faces) {
+ const css = generateCustomFontFaceCSS(fonts.faces);
+ const style = document.createElement("style");
+ style.setAttribute("title", "custom-theme-font-faces");
+ style.setAttribute("type", "text/css");
+ style.appendChild(document.createTextNode(css));
+ document.head.appendChild(style);
+ }
+ if (fonts.general) {
+ style.setProperty("--font-family", fonts.general);
+ }
+ if (fonts.monospace) {
+ style.setProperty("--font-family-monospace", fonts.monospace);
+ }
+ }
}
export function getCustomTheme(themeName) {
@@ -88,6 +161,7 @@ export async function setTheme(theme) {
const themeWatcher = new ThemeWatcher();
theme = themeWatcher.getEffectiveTheme();
}
+ clearCustomTheme();
let stylesheetName = theme;
if (theme.startsWith("custom-")) {
const customTheme = getCustomTheme(theme.substr(7));
@@ -136,7 +210,7 @@ export async function setTheme(theme) {
if (a == styleElements[stylesheetName]) return;
a.disabled = true;
});
- const bodyStyles = global.getComputedStyle(document.getElementsByTagName("body")[0]);
+ const bodyStyles = global.getComputedStyle(document.body);
if (bodyStyles.backgroundColor) {
document.querySelector('meta[name="theme-color"]').content = bodyStyles.backgroundColor;
}
diff --git a/src/utils/FormattingUtils.ts b/src/utils/FormattingUtils.ts
index 21b50da4ca..f82500de71 100644
--- a/src/utils/FormattingUtils.ts
+++ b/src/utils/FormattingUtils.ts
@@ -36,7 +36,7 @@ export function formatCount(count: number): string {
*/
export function formatCountLong(count: number): string {
const formatter = new Intl.NumberFormat();
- return formatter.format(count)
+ return formatter.format(count);
}
/**
diff --git a/src/utils/ResizeNotifier.js b/src/utils/ResizeNotifier.js
index d65bc4bd07..f726a43e08 100644
--- a/src/utils/ResizeNotifier.js
+++ b/src/utils/ResizeNotifier.js
@@ -15,9 +15,13 @@ limitations under the License.
*/
/**
- * Fires when the middle panel has been resized.
+ * Fires when the middle panel has been resized (throttled).
* @event module:utils~ResizeNotifier#"middlePanelResized"
*/
+/**
+ * Fires when the middle panel has been resized by a pixel.
+ * @event module:utils~ResizeNotifier#"middlePanelResizedNoisy"
+ */
import { EventEmitter } from "events";
import { throttle } from "lodash";
@@ -29,15 +33,24 @@ export default class ResizeNotifier extends EventEmitter {
this._throttledMiddlePanel = throttle(() => this.emit("middlePanelResized"), 200);
}
+ _noisyMiddlePanel() {
+ this.emit("middlePanelResizedNoisy");
+ }
+
+ _updateMiddlePanel() {
+ this._throttledMiddlePanel();
+ this._noisyMiddlePanel();
+ }
+
// can be called in quick succession
notifyLeftHandleResized() {
// don't emit event for own region
- this._throttledMiddlePanel();
+ this._updateMiddlePanel();
}
// can be called in quick succession
notifyRightHandleResized() {
- this._throttledMiddlePanel();
+ this._updateMiddlePanel();
}
// can be called in quick succession
@@ -48,7 +61,7 @@ export default class ResizeNotifier extends EventEmitter {
// taller than the available space
this.emit("leftPanelResized");
- this._throttledMiddlePanel();
+ this._updateMiddlePanel();
}
}
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index adaa961a00..3f8cf06815 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -10,7 +10,7 @@ interface Client {
getStoredDevicesForUser: (userId: string) => [{ deviceId: string }];
checkDeviceTrust: (userId: string, deviceId: string) => {
isVerified: () => boolean
- }
+ };
}
interface Room {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index b48ec481ba..f7f4be202b 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -31,6 +31,7 @@ import {IntegrationManagers} from "../integrations/IntegrationManagers";
import {Capability} from "../widgets/WidgetApi";
import {Room} from "matrix-js-sdk/src/models/room";
import {WidgetType} from "../widgets/WidgetType";
+import {objectClone} from "./objects";
export default class WidgetUtils {
/* Returns true if user is able to send state events to modify widgets in this room
@@ -222,7 +223,7 @@ export default class WidgetUtils {
const client = MatrixClientPeg.get();
// Get the current widgets and clone them before we modify them, otherwise
// we'll modify the content of the old event.
- const userWidgets = JSON.parse(JSON.stringify(WidgetUtils.getUserWidgets()));
+ const userWidgets = objectClone(WidgetUtils.getUserWidgets());
// Delete existing widget with ID
try {
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index fea376afcd..8175d89464 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -46,6 +46,28 @@ export function arrayDiff(a: T[], b: T[]): { added: T[], removed: T[] } {
};
}
+/**
+ * Returns the union of two arrays.
+ * @param a The first array. Must be defined.
+ * @param b The second array. Must be defined.
+ * @returns The union of the arrays.
+ */
+export function arrayUnion(a: T[], b: T[]): T[] {
+ return a.filter(i => b.includes(i));
+}
+
+/**
+ * Merges arrays, deduping contents using a Set.
+ * @param a The arrays to merge.
+ * @returns The merged array.
+ */
+export function arrayMerge(...a: T[][]): T[] {
+ return Array.from(a.reduce((c, v) => {
+ v.forEach(i => c.add(i));
+ return c;
+ }, new Set()));
+}
+
/**
* Helper functions to perform LINQ-like queries on arrays.
*/
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
new file mode 100644
index 0000000000..14fa928ce2
--- /dev/null
+++ b/src/utils/objects.ts
@@ -0,0 +1,60 @@
+/*
+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 { arrayDiff, arrayMerge, arrayUnion } from "./arrays";
+
+/**
+ * Determines the keys added, changed, and removed between two objects.
+ * For changes, simple triple equal comparisons are done, not in-depth
+ * tree checking.
+ * @param a The first object. Must be defined.
+ * @param b The second object. Must be defined.
+ * @returns The difference between the keys of each object.
+ */
+export function objectDiff(a: any, b: any): { changed: string[], added: string[], removed: string[] } {
+ const aKeys = Object.keys(a);
+ const bKeys = Object.keys(b);
+ const keyDiff = arrayDiff(aKeys, bKeys);
+ const possibleChanges = arrayUnion(aKeys, bKeys);
+ const changes = possibleChanges.filter(k => a[k] !== b[k]);
+
+ return {changed: changes, added: keyDiff.added, removed: keyDiff.removed};
+}
+
+/**
+ * Gets all the key changes (added, removed, or value difference) between
+ * two objects. Triple equals is used to compare values, not in-depth tree
+ * checking.
+ * @param a The first object. Must be defined.
+ * @param b The second object. Must be defined.
+ * @returns The keys which have been added, removed, or changed between the
+ * two objects.
+ */
+export function objectKeyChanges(a: any, b: any): string[] {
+ const diff = objectDiff(a, b);
+ return arrayMerge(diff.removed, diff.added, diff.changed);
+}
+
+/**
+ * Clones an object by running it through JSON parsing. Note that this
+ * will destroy any complicated object types which do not translate to
+ * JSON.
+ * @param obj The object to clone.
+ * @returns The cloned object
+ */
+export function objectClone(obj: any): any {
+ return JSON.parse(JSON.stringify(obj));
+}
diff --git a/src/utils/presence.ts b/src/utils/presence.ts
new file mode 100644
index 0000000000..f2c208265e
--- /dev/null
+++ b/src/utils/presence.ts
@@ -0,0 +1,26 @@
+/*
+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 { MatrixClientPeg } from "../MatrixClientPeg";
+import SdkConfig from "../SdkConfig";
+
+export function isPresenceEnabled() {
+ const hsUrl = MatrixClientPeg.get().baseUrl;
+ const urls = SdkConfig.get()['enable_presence_by_hs_url'];
+ if (!urls) return true;
+ if (urls[hsUrl] || urls[hsUrl] === undefined) return true;
+ return false;
+}
diff --git a/src/utils/units.ts b/src/utils/units.ts
index 54dd6b0523..03775f4c21 100644
--- a/src/utils/units.ts
+++ b/src/utils/units.ts
@@ -19,7 +19,7 @@ limitations under the License.
// converts a pixel value to rem.
export function toRem(pixelValue: number): string {
- return pixelValue / 15 + "rem";
+ return pixelValue / 10 + "rem";
}
export function toPx(pixelValue: number): string {
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index 795c6648ef..d5f2f2258e 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -19,6 +19,7 @@ limitations under the License.
import { randomString } from "matrix-js-sdk/src/randomstring";
import { EventEmitter } from "events";
+import { objectClone } from "../utils/objects";
export enum Capability {
Screenshot = "m.capability.screenshot",
@@ -140,7 +141,7 @@ export class WidgetApi extends EventEmitter {
private replyToRequest(payload: ToWidgetRequest, reply: any) {
if (!window.parent) return;
- const request = JSON.parse(JSON.stringify(payload));
+ const request = objectClone(payload);
request.response = reply;
window.parent.postMessage(request, this.origin);
diff --git a/test/autocomplete/QueryMatcher-test.js b/test/autocomplete/QueryMatcher-test.js
index 03f28eb984..2d0e10563b 100644
--- a/test/autocomplete/QueryMatcher-test.js
+++ b/test/autocomplete/QueryMatcher-test.js
@@ -81,7 +81,34 @@ describe('QueryMatcher', function() {
expect(reverseResults[1].name).toBe('Victoria');
});
- it('Returns results with search string in same place in insertion order', function() {
+ it('Returns results with search string in same place according to key index', function() {
+ const objects = [
+ { name: "a", first: "hit", second: "miss", third: "miss" },
+ { name: "b", first: "miss", second: "hit", third: "miss" },
+ { name: "c", first: "miss", second: "miss", third: "hit" },
+ ];
+ const qm = new QueryMatcher(objects, {keys: ["second", "first", "third"]});
+ const results = qm.match('hit');
+
+ expect(results.length).toBe(3);
+ expect(results[0].name).toBe('b');
+ expect(results[1].name).toBe('a');
+ expect(results[2].name).toBe('c');
+
+
+ qm.setObjects(objects.slice().reverse());
+
+ const reverseResults = qm.match('hit');
+
+ // should still be in the same order: key index
+ // takes precedence over input order
+ expect(reverseResults.length).toBe(3);
+ expect(reverseResults[0].name).toBe('b');
+ expect(reverseResults[1].name).toBe('a');
+ expect(reverseResults[2].name).toBe('c');
+ });
+
+ it('Returns results with search string in same place and key in same place in insertion order', function() {
const qm = new QueryMatcher(OBJECTS, {keys: ["name"]});
const results = qm.match('Mel');
@@ -132,9 +159,9 @@ describe('QueryMatcher', function() {
const results = qm.match('Emma');
expect(results.length).toBe(3);
- expect(results[0].name).toBe('Mel B');
- expect(results[1].name).toBe('Mel C');
- expect(results[2].name).toBe('Emma');
+ expect(results[0].name).toBe('Emma');
+ expect(results[1].name).toBe('Mel B');
+ expect(results[2].name).toBe('Mel C');
});
it('Matches words only by default', function() {
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index bd26ae91bb..f0d577ea21 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -61,4 +61,16 @@ describe('editor/serialize', function() {
const html = htmlSerializeIfNeeded(model, {});
expect(html).toBe("Displayname]");
});
+ it('escaped markdown should not retain backslashes', function() {
+ const pc = createPartCreator();
+ const model = new EditorModel([pc.plain('\\*hello\\* world')]);
+ const html = htmlSerializeIfNeeded(model, {});
+ expect(html).toBe('*hello* world');
+ });
+ it('escaped markdown should convert HTML entities', function() {
+ const pc = createPartCreator();
+ const model = new EditorModel([pc.plain('\\*hello\\* world < hey world!')]);
+ const html = htmlSerializeIfNeeded(model, {});
+ expect(html).toBe('*hello* world < hey world!');
+ });
});
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index 2859aadbda..aa9f6b7efa 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -79,7 +79,20 @@ module.exports = async function signup(session, username, password, homeserver)
const acceptButton = await session.query('.mx_InteractiveAuthEntryComponents_termsSubmit');
await acceptButton.click();
- const xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
+ //plow through cross-signing setup by entering arbitrary details
+ //TODO: It's probably important for the tests to know the passphrase
+ const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
+ let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
+ await session.replaceInputText(passphraseField, xsigningPassphrase);
+ await session.delay(1000); // give it a second to analyze our passphrase for security
+ let xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
+ await xsignContButton.click();
+
+ //repeat passphrase entry
+ passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
+ await session.replaceInputText(passphraseField, xsigningPassphrase);
+ await session.delay(1000); // give it a second to analyze our passphrase for security
+ xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
await xsignContButton.click();
//ignore the recovery key
@@ -88,11 +101,13 @@ module.exports = async function signup(session, username, password, homeserver)
await copyButton.click();
//acknowledge that we copied the recovery key to a safe place
- const copyContinueButton = await session.query(
- '.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary',
- );
+ const copyContinueButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
await copyContinueButton.click();
+ //acknowledge that we're done cross-signing setup and our keys are safe
+ const doneOkButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
+ await doneOkButton.click();
+
//wait for registration to finish so the hash gets set
//onhashchange better?
diff --git a/tslint.json b/tslint.json
index fc234117fc..fd99d9d228 100644
--- a/tslint.json
+++ b/tslint.json
@@ -46,7 +46,9 @@
"quotemark": false,
"radix": true,
"semicolon": [
- "always"
+ true,
+ "always",
+ "strict-bound-class-methods"
],
"triple-equals": [],
"typedef-whitespace": [
diff --git a/yarn.lock b/yarn.lock
index d2d53692b5..c20658f014 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5821,8 +5821,8 @@ mathml-tag-names@^2.0.1:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "6.2.2"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c194e81637fb07fe6ad67cda33be0d5d4c10115"
+ version "7.0.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f683f4544aa5da150836b01c754062809119fa97"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"
{error.toString()}
;
}
- // Whether the various keys exist on your account (but not necessarily
- // on this device).
- const enabledForAccount = (
- crossSigningPrivateKeysInStorage &&
- secretStorageKeyInAccount
- );
-
let summarisedStatus;
if (homeserverSupportsCrossSigning === undefined) {
const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
@@ -184,8 +177,19 @@ export default class CrossSigningPanel extends React.PureComponent {
)};
}
+ const keysExistAnywhere = (
+ secretStorageKeyInAccount ||
+ crossSigningPrivateKeysInStorage ||
+ crossSigningPublicKeysOnDevice
+ );
+ const keysExistEverywhere = (
+ secretStorageKeyInAccount &&
+ crossSigningPrivateKeysInStorage &&
+ crossSigningPublicKeysOnDevice
+ );
+
let resetButton;
- if (enabledForAccount) {
+ if (keysExistAnywhere) {
resetButton = (
Aa
Aa
+ {_t("Message layout")}
+
+
;
+ };
+
+ private renderAdvancedSection() {
+ const toggle =
+
+
+
+ {_t("Compact")}
+
+
+
+
+
+ {_t("Modern")}
+
+
+ this.setState({showAdvanced: !this.state.showAdvanced})}
+ >
+ {this.state.showAdvanced ? "Hide advanced" : "Show advanced"}
+
;
+
+ let advanced: React.ReactNode;
+
+ if (this.state.showAdvanced) {
+ advanced =
+ this.setState({useSystemFont: checked})}
+ />
+ {
+ this.setState({
+ systemFont: value.target.value,
+ });
+
+ SettingsStore.setValue("systemFont", null, SettingLevel.DEVICE, value.target.value);
+ }}
+ tooltipContent="Set the name of a font installed on your system & Riot will attempt to use it."
+ forceTooltipVisible={true}
+ disabled={!this.state.useSystemFont}
+ value={this.state.systemFont}
+ />
+
;
+ }
+ return
+ {toggle}
+ {advanced}
+
;
+ }
+
render() {
return (
@@ -323,6 +430,8 @@ export default class AppearanceUserSettingsTab extends React.Component
{this.renderThemeSection()}
{SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null}
+ {SettingsStore.isFeatureEnabled("feature_irc_ui") ? this.renderLayoutSection() : null}
+ {this.renderAdvancedSection()}
);
}
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 3e69107159..9724b9934f 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -66,7 +66,6 @@ export default class LabsUserSettingsTab extends React.Component {
// to start it with a slash.": "Truco: Comeza a mensaxe con // para comezar cun trazo.",
+ "Send as message": "Enviar como mensaxe",
+ "Failed to connect to integration manager": "Fallou a conexión co xestor de integracións",
+ "Add some now": "Engade algún agora",
+ "Failed to revoke invite": "Fallo ao revogar o convite",
+ "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Non se revogou o convite. O servidor podería estar experimentando un problema temporal ou non tes permisos suficientes para revogar o convite.",
+ "Revoke invite": "Revogar convite",
+ "Invited by %(sender)s": "Convidada por %(sender)s",
+ "Mark all as read": "Marcar todo como lido",
+ "Error updating main address": "Fallo ao actualizar o enderezo principal",
+ "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao actualizar o enderezo principal da sala. Podería non estar autorizado polo servidor ou ser un fallo temporal.",
+ "Error creating address": "Fallo ao crear o enderezo",
+ "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao crear ese enderezo. Podería non estar autorizado polo servidor ou ser un fallo temporal.",
+ "You don't have permission to delete the address.": "Non tes permiso para eliminar o enderezo.",
+ "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Houbo un erro ao eliminar o enderezo. Podería non existir ou ser un fallo temporal.",
+ "Error removing address": "Erro ao eliminar o enderezo",
+ "Main address": "Enderezo principal",
+ "Local address": "Enderezo local",
+ "Published Addresses": "Enderezos publicados",
+ "Other published addresses:": "Outros enderezos publicados:",
+ "No other published addresses yet, add one below": "Aínda non hai outros enderezos publicados, engade un embaixo",
+ "New published address (e.g. #alias:server)": "Novo enderezo publicado (ex. #alias:servidor)",
+ "Local Addresses": "Enderezos locais",
+ "Room Name": "Nome da sala",
+ "Room Topic": "Asunto da sala",
+ "Room avatar": "Avatar da sala",
+ "Waiting for you to accept on your other session…": "Agardando a que aceptes na túa outra sesión…",
+ "Waiting for %(displayName)s to accept…": "Agardando a que %(displayName)s acepte…",
+ "Accepting…": "Aceptando…",
+ "Start Verification": "Comezar a Verificación",
+ "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "As túas mensaxes están seguras e só ti e o correspondente tedes as únicas chaves que as desbloquean.",
+ "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Nas salas cifradas, as túas mensaxes están seguras e só ti e o correspondente tedes as únicas chaves que as desbloquean.",
+ "Verify User": "Verificar Usuaria",
+ "For extra security, verify this user by checking a one-time code on both of your devices.": "Para maior seguridade, verifica esta usuaria comprobando o código temporal en dous dos teus dispositivos.",
+ "Your messages are not secure": "As túas mensaxes non están aseguradas",
+ "One of the following may be compromised:": "Un dos seguintes podería estar comprometido:",
+ "Your homeserver": "O teu servidor",
+ "The homeserver the user you’re verifying is connected to": "O servidor ao que a usuaria que estás a verificar está conectada",
+ "Yours, or the other users’ internet connection": "A túa, ou a conexión a internet da outra usuaria",
+ "Yours, or the other users’ session": "A túa, ou a sesión da outra usuaria",
+ "Trusted": "Confiable",
+ "Not trusted": "Non confiable",
+ "%(count)s verified sessions|other": "%(count)s sesións verificadas",
+ "Use the improved room list (in development - will refresh to apply changes)": "Usar a lista de salas mellorada (desenvolvemento - actualizar para aplicar)",
+ "%(count)s verified sessions|one": "1 sesión verificada",
+ "Hide verified sessions": "Agochar sesións verificadas",
+ "%(count)s sessions|other": "%(count)s sesións",
+ "%(count)s sessions|one": "%(count)s sesión",
+ "Hide sessions": "Agochar sesións",
+ "Direct message": "Mensaxe directa",
+ "No recent messages by %(user)s found": "Non se atoparon mensaxes recentes de %(user)s",
+ "Try scrolling up in the timeline to see if there are any earlier ones.": "Desprázate na cronoloxía para ver se hai algúns máis recentes.",
+ "Remove recent messages by %(user)s": "Eliminar mensaxes recentes de %(user)s",
+ "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Vas eliminar %(count)s mensaxes de %(user)s. Esto non ten volta, ¿desexas continuar?",
+ "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Vas eliminar unha mensaxe de %(user)s. Esto non ten volta, ¿desexas continuar?",
+ "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Podería demorar un tempo se é un número grande de mensaxes. Non actualices o cliente mentras tanto.",
+ "Remove %(count)s messages|other": "Eliminar %(count)s mensaxes",
+ "Remove %(count)s messages|one": "Eliminar 1 mensaxe",
+ "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?",
+ "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.",
+ "Security": "Seguridade",
+ "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "A sesión que intentas verificar non soporta a verificación por código QR ou por emoticonas, que é o que soporta Riot. Inténtao cun cliente diferente.",
+ "Verify by scanning": "Verificar escaneando",
+ "Ask %(displayName)s to scan your code:": "Pídelle a %(displayName)s que escanee o teu código:",
+ "If you can't scan the code above, verify by comparing unique emoji.": "Se non podes escanear o código superior, verifica comparando as emoticonas.",
+ "Verify by comparing unique emoji.": "Verficación por comparación de emoticonas.",
+ "Verify by emoji": "Verificar por emoticonas",
+ "Almost there! Is your other session showing the same shield?": "Case feito! ¿Podes ver as mesmas na túa outra sesión?",
+ "Almost there! Is %(displayName)s showing the same shield?": "Case feito! ¿está %(displayName)s mostrando as mesmas emoticonas?",
+ "Yes": "Si",
+ "Verify all users in a room to ensure it's secure.": "Verificar todas as usuarias da sala para asegurar que é segura.",
+ "Use the improved room list (will refresh to apply changes)": "Usa a lista de salas mellorada (actualizará para aplicar)",
+ "Strikethrough": "Sobrescrito",
+ "In encrypted rooms, verify all users to ensure it’s secure.": "En salas cifradas, verifica todas as usuarias para asegurar que é segura.",
+ "You've successfully verified your device!": "Verificaches correctamente o teu dispositivo!",
+ "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Verificaches correctamente %(deviceName)s (%(deviceId)s)!",
+ "You've successfully verified %(displayName)s!": "Verificaches correctamente a %(displayName)s!",
+ "Verified": "Verficiado",
+ "Got it": "Vale",
+ "Start verification again from the notification.": "Inicia o proceso de novo desde a notificación.",
+ "Start verification again from their profile.": "Inicia a verificación outra vez desde o seu perfil.",
+ "Verification timed out.": "Verificación caducada.",
+ "You cancelled verification on your other session.": "Cancelaches a verificación na túa outra sesión.",
+ "%(displayName)s cancelled verification.": "%(displayName)s cancelou a verificación.",
+ "You cancelled verification.": "Cancelaches a verificación.",
+ "Verification cancelled": "Verificación cancelada",
+ "Compare emoji": "Comparar emoticonas",
+ "Encryption enabled": "Cifrado activado",
+ "Encryption not enabled": "Cifrado desactivado",
+ "The encryption used by this room isn't supported.": "O cifrado desta sala non está soportado.",
+ "React": "Reacciona",
+ "Message Actions": "Accións da mensaxe",
+ "Show image": "Mostrar imaxe",
+ "You have ignored this user, so their message is hidden. Show anyways.": "Estás a ignorar a esta usuaria, polo que a imaxe está agochada. Mostrar igualmente.",
+ "You verified %(name)s": "Verificaches a %(name)s",
+ "You cancelled verifying %(name)s": "Cancelaches a verificación de %(name)s",
+ "%(name)s cancelled verifying": "%(name)s cancelou a verificación",
+ "You accepted": "Aceptaches",
+ "%(name)s accepted": "%(name)s aceptou",
+ "You declined": "Declinaches",
+ "You cancelled": "Cancelaches",
+ "%(name)s declined": "%(name)s declinou",
+ "%(name)s cancelled": "%(name)s cancelou",
+ "Accepting …": "Aceptando…",
+ "Declining …": "Declinando…",
+ "%(name)s wants to verify": "%(name)s desexa verificar",
+ "You sent a verification request": "Enviaches unha solicitude de verificación",
+ "Show all": "Mostrar todo",
+ "Reactions": "Reaccións",
+ "