diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 5af2063c84..07a12d70a8 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -185,9 +185,8 @@ export default class MImageBody extends React.Component {
// So either we need to support custom timeline widths here, or reimpose the cap, otherwise the
// thumbnail resolution will be unnecessarily reduced.
// custom timeline widths seems preferable.
- const pixelRatio = window.devicePixelRatio;
- const thumbWidth = Math.round(800 * pixelRatio);
- const thumbHeight = Math.round(600 * pixelRatio);
+ const thumbWidth = 800;
+ const thumbHeight = 600;
const content = this.props.mxEvent.getContent();
const media = mediaFromContent(content);
@@ -218,7 +217,7 @@ export default class MImageBody extends React.Component {
const info = content.info;
if (
this._isGif() ||
- pixelRatio === 1.0 ||
+ window.devicePixelRatio === 1.0 ||
(!info || !info.w || !info.h || !info.size)
) {
return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 5a6e7d87b7..b2f7f8a692 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -29,6 +29,8 @@ import RoomContext from "../../../contexts/RoomContext";
import Toolbar from "../../../accessibility/Toolbar";
import {RovingAccessibleTooltipButton, useRovingTabIndex} from "../../../accessibility/RovingTabIndex";
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {canCancel} from "../context_menus/MessageContextMenu";
+import Resend from "../../../Resend";
const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -169,45 +171,118 @@ export default class MessageActionBar extends React.PureComponent {
});
};
- render() {
- let reactButton;
- let replyButton;
- let editButton;
+ /**
+ * Runs a given fn on the set of possible events to test. The first event
+ * that passes the checkFn will have fn executed on it. Both functions take
+ * a MatrixEvent object. If no particular conditions are needed, checkFn can
+ * be null/undefined. If no functions pass the checkFn, no action will be
+ * taken.
+ * @param {Function} fn The execution function.
+ * @param {Function} checkFn The test function.
+ */
+ runActionOnFailedEv(fn, checkFn) {
+ if (!checkFn) checkFn = () => true;
- if (isContentActionable(this.props.mxEvent)) {
- if (this.context.canReact) {
- reactButton = (
-
- );
- }
- if (this.context.canReply) {
- replyButton =
;
+ const mxEvent = this.props.mxEvent;
+ const editEvent = mxEvent.replacingEvent();
+ const redactEvent = mxEvent.localRedactionEvent();
+ const tryOrder = [redactEvent, editEvent, mxEvent];
+ for (const ev of tryOrder) {
+ if (ev && checkFn(ev)) {
+ fn(ev);
+ break;
}
}
+ }
+
+ onResendClick = (ev) => {
+ this.runActionOnFailedEv((tarEv) => Resend.resend(tarEv));
+ };
+
+ onCancelClick = (ev) => {
+ this.runActionOnFailedEv(
+ (tarEv) => Resend.removeFromQueue(tarEv),
+ (testEv) => canCancel(testEv.status),
+ );
+ };
+
+ render() {
+ const toolbarOpts = [];
if (canEditContent(this.props.mxEvent)) {
- editButton =
;
+ key="edit"
+ />);
}
- // aria-live=off to not have this read out automatically as navigating around timeline, gets repetitive.
- return
- {reactButton}
- {replyButton}
- {editButton}
- ;
+
+ // We show a different toolbar for failed events, so detect that first.
+ const mxEvent = this.props.mxEvent;
+ const editStatus = mxEvent.replacingEvent() && mxEvent.replacingEvent().status;
+ const redactStatus = mxEvent.localRedactionEvent() && mxEvent.localRedactionEvent().status;
+ const allowCancel = canCancel(mxEvent.status) || canCancel(editStatus) || canCancel(redactStatus);
+ const isFailed = [mxEvent.status, editStatus, redactStatus].includes("not_sent");
+ if (allowCancel && isFailed) {
+ // The resend button needs to appear ahead of the edit button, so insert to the
+ // start of the opts
+ toolbarOpts.splice(0, 0, );
+
+ // The delete button should appear last, so we can just drop it at the end
+ toolbarOpts.push(cancelSendingButton);
+ } else {
+ if (isContentActionable(this.props.mxEvent)) {
+ // Like the resend button, the react and reply buttons need to appear before the edit.
+ // The only catch is we do the reply button first so that we can make sure the react
+ // button is the very first button without having to do length checks for `splice()`.
+ if (this.context.canReply) {
+ toolbarOpts.splice(0, 0, );
+ }
+ if (this.context.canReact) {
+ toolbarOpts.splice(0, 0, );
+ }
+ }
+
+ if (allowCancel) {
+ toolbarOpts.push(cancelSendingButton);
+ }
+
+ // The menu button should be last, so dump it there.
+ toolbarOpts.push(
+ key="menu"
+ />);
+ }
+
+ // aria-live=off to not have this read out automatically as navigating around timeline, gets repetitive.
+ return
+ {toolbarOpts}
;
}
}
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index f6fb83c064..fb07d3fdff 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -40,6 +40,8 @@ import {WIDGET_LAYOUT_EVENT_TYPE} from "../../../stores/widgets/WidgetLayoutStor
import {objectHasDiff} from "../../../utils/objects";
import {replaceableComponent} from "../../../utils/replaceableComponent";
import Tooltip from "../elements/Tooltip";
+import {StaticNotificationState} from "../../../stores/notifications/StaticNotificationState";
+import NotificationBadge from "./NotificationBadge";
const eventTileTypes = {
[EventType.RoomMessage]: 'messages.MessageEvent',
@@ -838,7 +840,6 @@ export default class EventTile extends React.Component {
mx_EventTile_12hr: this.props.isTwelveHour,
// Note: we keep the `sending` state class for tests, not for our styles
mx_EventTile_sending: !isEditing && isSending,
- mx_EventTile_notSent: this.props.eventSendStatus === 'not_sent',
mx_EventTile_highlight: this.props.tileShape === 'notif' ? false : this.shouldHighlight(),
mx_EventTile_selected: this.props.isSelectedEvent,
mx_EventTile_continuation: this.props.tileShape ? '' : this.props.continuation,
@@ -1253,11 +1254,19 @@ class SentReceipt extends React.PureComponent;
+ }
+
let tooltip = null;
if (this.state.hover) {
let label = _t("Sending your message...");
@@ -1265,6 +1274,8 @@ class SentReceipt extends React.PureComponent
+ {nonCssBadge}
{tooltip}
;
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 36a52e260d..4b843bfc29 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -30,7 +30,7 @@ interface IProps {
* If true, the badge will show a count if at all possible. This is typically
* used to override the user's preference for things like room sublists.
*/
- forceCount: boolean;
+ forceCount?: boolean;
/**
* The room ID, if any, the badge represents.
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index e4e638fc67..a155e1b5cd 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -1,7 +1,5 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 Vector Creations Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2018, 2020, 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -37,7 +35,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
import GroupAvatar from "../avatars/GroupAvatar";
import ExtraTile from "./ExtraTile";
import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
-import { NotificationColor } from "../../../stores/notifications/NotificationColor";
import { Action } from "../../../dispatcher/actions";
import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
@@ -492,7 +489,7 @@ export default class RoomList extends React.PureComponent {
isSelected={false}
displayName={g.name}
avatar={avatar}
- notificationState={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+ notificationState={StaticNotificationState.RED_EXCLAMATION}
onClick={openGroup}
key={`temporaryGroupTile_${g.groupId}`}
/>
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index b2a07d7e06..8521992fa1 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -1,8 +1,6 @@
/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2017, 2019-2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,6 +17,7 @@ limitations under the License.
import React, { createRef } from "react";
import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import classNames from "classnames";
import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
@@ -51,7 +50,9 @@ import IconizedContextMenu, {
IconizedContextMenuRadio,
} from "../context_menus/IconizedContextMenu";
import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/CommunityPrototypeStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { getUnsentMessages } from "../../structures/RoomStatusBar";
+import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
interface IProps {
room: Room;
@@ -67,6 +68,7 @@ interface IState {
notificationsMenuPosition: PartialDOMRect;
generalMenuPosition: PartialDOMRect;
messagePreview?: string;
+ hasUnsentEvents: boolean;
}
const messagePreviewId = (roomId: string) => `mx_RoomTile_messagePreview_${roomId}`;
@@ -93,6 +95,7 @@ export default class RoomTile extends React.PureComponent {
selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
notificationsMenuPosition: null,
generalMenuPosition: null,
+ hasUnsentEvents: this.countUnsentEvents() > 0,
// generatePreview() will return nothing if the user has previews disabled
messagePreview: this.generatePreview(),
@@ -101,6 +104,10 @@ export default class RoomTile extends React.PureComponent {
this.roomProps = EchoChamber.forRoom(this.props.room);
}
+ private countUnsentEvents(): number {
+ return getUnsentMessages(this.props.room).length;
+ }
+
private onRoomNameUpdate = (room) => {
this.forceUpdate();
}
@@ -109,6 +116,11 @@ export default class RoomTile extends React.PureComponent {
this.forceUpdate(); // notification state changed - update
};
+ private onLocalEchoUpdated = (ev: MatrixEvent, room: Room) => {
+ if (!room?.roomId === this.props.room.roomId) return;
+ this.setState({hasUnsentEvents: this.countUnsentEvents() > 0});
+ };
+
private onRoomPropertyUpdate = (property: CachedRoomKey) => {
if (property === CachedRoomKey.NotificationVolume) this.onNotificationUpdate();
// else ignore - not important for this tile
@@ -167,6 +179,7 @@ export default class RoomTile extends React.PureComponent {
CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
this.onCommunityUpdate,
);
+ MatrixClientPeg.get().on("Room.localEchoUpdated", this.onLocalEchoUpdated);
}
public componentWillUnmount() {
@@ -191,6 +204,7 @@ export default class RoomTile extends React.PureComponent {
CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
this.onCommunityUpdate,
);
+ MatrixClientPeg.get()?.removeListener("Room.localEchoUpdated", this.onLocalEchoUpdated);
}
private onAction = (payload: ActionPayload) => {
@@ -554,17 +568,30 @@ export default class RoomTile extends React.PureComponent {
/>;
let badge: React.ReactNode;
- if (!this.props.isMinimized && this.notificationState) {
+ if (!this.props.isMinimized) {
// aria-hidden because we summarise the unread count/highlight status in a manual aria-label below
- badge = (
-
-
-
- );
+ if (this.state.hasUnsentEvents) {
+ // hardcode the badge to a danger state when there's unsent messages
+ badge = (
+
+
+
+ );
+ } else if (this.notificationState) {
+ badge = (
+
+
+
+ );
+ }
}
let messagePreview = null;
diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index b651e40a3b..f9d957b60c 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -96,6 +96,9 @@ export class Media {
*/
public getThumbnailHttp(width: number, height: number, mode: ResizeMethod = "scale"): string | null | undefined {
if (!this.hasThumbnail) return null;
+ // scale using the device pixel ratio to keep images clear
+ width = Math.floor(width * window.devicePixelRatio);
+ height = Math.floor(height * window.devicePixelRatio);
return this.client.mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
}
@@ -107,6 +110,9 @@ export class Media {
* @returns {string} The HTTP URL which points to the thumbnail.
*/
public getThumbnailOfSourceHttp(width: number, height: number, mode: ResizeMethod = "scale"): string {
+ // scale using the device pixel ratio to keep images clear
+ width = Math.floor(width * window.devicePixelRatio);
+ height = Math.floor(height * window.devicePixelRatio);
return this.client.mxcUrlToHttp(this.srcMxc, width, height, mode);
}
@@ -117,6 +123,7 @@ export class Media {
* @returns {string} An HTTP URL for the thumbnail.
*/
public getSquareThumbnailHttp(dim: number): string {
+ dim = Math.floor(dim * window.devicePixelRatio); // scale using the device pixel ratio to keep images clear
if (this.hasThumbnail) {
return this.getThumbnailHttp(dim, dim, 'crop');
}
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index ccd90da3e2..e3ca36e606 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -341,11 +341,7 @@ class RoomPillPart extends PillPart {
setAvatar(node: HTMLElement) {
let initialLetter = "";
- let avatarUrl = Avatar.avatarUrlForRoom(
- this.room,
- 16 * window.devicePixelRatio,
- 16 * window.devicePixelRatio,
- "crop");
+ let avatarUrl = Avatar.avatarUrlForRoom(this.room, 16, 16, "crop");
if (!avatarUrl) {
initialLetter = Avatar.getInitialLetter(this.room ? this.room.name : this.resourceId);
avatarUrl = Avatar.defaultAvatarUrlForString(this.room ? this.room.roomId : this.resourceId);
@@ -383,11 +379,7 @@ class UserPillPart extends PillPart {
}
const name = this.member.name || this.member.userId;
const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this.member.userId);
- const avatarUrl = Avatar.avatarUrlForMember(
- this.member,
- 16 * window.devicePixelRatio,
- 16 * window.devicePixelRatio,
- "crop");
+ const avatarUrl = Avatar.avatarUrlForMember(this.member, 16, 16, "crop");
let initialLetter = "";
if (avatarUrl === defaultAvatarUrl) {
initialLetter = Avatar.getInitialLetter(name);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f1b700540f..f547f20a0c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -658,7 +658,6 @@
"No homeserver URL provided": "No homeserver URL provided",
"Unexpected error resolving homeserver configuration": "Unexpected error resolving homeserver configuration",
"Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration",
- "The message you are trying to send is too large.": "The message you are trying to send is too large.",
"This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.",
"This homeserver has been blocked by its administrator.": "This homeserver has been blocked by its administrator.",
"This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.",
@@ -1453,6 +1452,7 @@
"Sending your message...": "Sending your message...",
"Encrypting your message...": "Encrypting your message...",
"Your message was sent": "Your message was sent",
+ "Failed to send": "Failed to send",
"Please select the destination room for this message": "Please select the destination room for this message",
"Scroll to most recent messages": "Scroll to most recent messages",
"Close preview": "Close preview",
@@ -1811,8 +1811,9 @@
"The encryption used by this room isn't supported.": "The encryption used by this room isn't supported.",
"Error decrypting audio": "Error decrypting audio",
"React": "React",
- "Reply": "Reply",
"Edit": "Edit",
+ "Retry": "Retry",
+ "Reply": "Reply",
"Message Actions": "Message Actions",
"Attachment": "Attachment",
"Error decrypting attachment": "Error decrypting attachment",
@@ -1923,10 +1924,10 @@
"%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
"%(count)s people you know have already joined|other": "%(count)s people you know have already joined",
"%(count)s people you know have already joined|one": "%(count)s person you know has already joined",
- "Rotate Right": "Rotate Right",
- "Rotate Left": "Rotate Left",
"Zoom out": "Zoom out",
"Zoom in": "Zoom in",
+ "Rotate Right": "Rotate Right",
+ "Rotate Left": "Rotate Left",
"Download": "Download",
"Information": "Information",
"View message": "View message",
@@ -2397,7 +2398,6 @@
"Confirm encryption setup": "Confirm encryption setup",
"Click the button below to confirm setting up encryption.": "Click the button below to confirm setting up encryption.",
"Unable to set up keys": "Unable to set up keys",
- "Retry": "Retry",
"Restoring keys from backup": "Restoring keys from backup",
"Fetching keys from server...": "Fetching keys from server...",
"%(completed)s of %(total)s keys restored": "%(completed)s of %(total)s keys restored",
@@ -2426,10 +2426,7 @@
"Reject invitation": "Reject invitation",
"Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
"Unable to reject invite": "Unable to reject invite",
- "Resend edit": "Resend edit",
"Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
- "Resend removal": "Resend removal",
- "Cancel Sending": "Cancel Sending",
"Forward Message": "Forward Message",
"Pin Message": "Pin Message",
"Unhide Preview": "Unhide Preview",
@@ -2617,10 +2614,11 @@
"Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please contact your service administrator to continue using the service.",
"Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.",
"Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please contact your service administrator to continue using the service.",
- "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
- "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
- "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Resend all or cancel all now. You can also select individual messages to resend or cancel.",
- "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Resend message or cancel message now.",
+ "Some of your messages have not been sent": "Some of your messages have not been sent",
+ "Delete all": "Delete all",
+ "Retry all": "Retry all",
+ "Sending": "Sending",
+ "You can select all or individual messages to retry or delete": "You can select all or individual messages to retry or delete",
"Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
"Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
"You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index f80a5f01c3..ec6227e45e 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -560,7 +560,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
if (!room || payload.context_switch) break;
if (room.isSpaceRoom()) {
- this.setActiveSpace(room);
+ // Don't context switch when navigating to the space room
+ // as it will cause you to end up in the wrong room
+ this.setActiveSpace(room, false);
} else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(room.roomId)) {
let parent = this.getCanonicalParent(room.roomId);
if (!parent) {
diff --git a/src/stores/notifications/StaticNotificationState.ts b/src/stores/notifications/StaticNotificationState.ts
index 0392ed3716..b18aa78e0f 100644
--- a/src/stores/notifications/StaticNotificationState.ts
+++ b/src/stores/notifications/StaticNotificationState.ts
@@ -18,6 +18,8 @@ import { NotificationColor } from "./NotificationColor";
import { NotificationState } from "./NotificationState";
export class StaticNotificationState extends NotificationState {
+ public static readonly RED_EXCLAMATION = StaticNotificationState.forSymbol("!", NotificationColor.Red);
+
constructor(symbol: string, count: number, color: NotificationColor) {
super();
this._symbol = symbol;
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
index 388bb061e3..f212b1f9d9 100644
--- a/src/stores/room-list/filters/VisibilityProvider.ts
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -37,7 +37,11 @@ export class VisibilityProvider {
await VoipUserMapper.sharedInstance().onNewInvitedRoom(room);
}
- public isRoomVisible(room: Room): boolean {
+ public isRoomVisible(room?: Room): boolean {
+ if (!room) {
+ return false;
+ }
+
if (
CallHandler.sharedInstance().getSupportsVirtualRooms() &&
VoipUserMapper.sharedInstance().isVirtualRoom(room)
diff --git a/src/stores/room-list/previews/MessageEventPreview.ts b/src/stores/room-list/previews/MessageEventPreview.ts
index deed7dcf2c..b900afc13f 100644
--- a/src/stores/room-list/previews/MessageEventPreview.ts
+++ b/src/stores/room-list/previews/MessageEventPreview.ts
@@ -20,7 +20,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { _t } from "../../../languageHandler";
import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
import ReplyThread from "../../../components/views/elements/ReplyThread";
-import { sanitizedHtmlNodeInnerText } from "../../../HtmlUtils";
+import { getHtmlText } from "../../../HtmlUtils";
export class MessageEventPreview implements IPreview {
public getTextFor(event: MatrixEvent, tagId?: TagID): string {
@@ -55,7 +55,7 @@ export class MessageEventPreview implements IPreview {
}
if (hasHtml) {
- body = sanitizedHtmlNodeInnerText(body);
+ body = getHtmlText(body);
}
if (msgtype === 'm.emote') {
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js
index 2c6acd5503..b5bd5b0af0 100644
--- a/src/utils/ErrorUtils.js
+++ b/src/utils/ErrorUtils.js
@@ -49,12 +49,6 @@ export function messageForResourceLimitError(limitType, adminContact, strings, e
}
}
-export function messageForSendError(errorData) {
- if (errorData.errcode === "M_TOO_LARGE") {
- return _t("The message you are trying to send is too large.");
- }
-}
-
export function messageForSyncError(err) {
if (err.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
const limitError = messageForResourceLimitError(
diff --git a/src/utils/Mouse.ts b/src/utils/Mouse.ts
new file mode 100644
index 0000000000..a85c6492c4
--- /dev/null
+++ b/src/utils/Mouse.ts
@@ -0,0 +1,50 @@
+/*
+Copyright 2021 Šimon Brandner
+
+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.
+*/
+
+/**
+ * Different browsers use different deltaModes. This causes different behaviour.
+ * To avoid that we use this function to convert any event to pixels.
+ * @param {WheelEvent} event to normalize
+ * @returns {WheelEvent} normalized event event
+ */
+export function normalizeWheelEvent(event: WheelEvent): WheelEvent {
+ const LINE_HEIGHT = 18;
+
+ let deltaX;
+ let deltaY;
+ let deltaZ;
+
+ if (event.deltaMode === 1) { // Units are lines
+ deltaX = (event.deltaX * LINE_HEIGHT);
+ deltaY = (event.deltaY * LINE_HEIGHT);
+ deltaZ = (event.deltaZ * LINE_HEIGHT);
+ } else {
+ deltaX = event.deltaX;
+ deltaY = event.deltaY;
+ deltaZ = event.deltaZ;
+ }
+
+ return new WheelEvent(
+ "syntheticWheel",
+ {
+ deltaMode: 0,
+ deltaY: deltaY,
+ deltaX: deltaX,
+ deltaZ: deltaZ,
+ ...event,
+ },
+ );
+}
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index 8ab66dfb29..cea377bfe9 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,23 +15,47 @@ limitations under the License.
*/
/**
- * Quickly resample an array to have less data points. This isn't a perfect representation,
- * though this does work best if given a large array to downsample to a much smaller array.
- * @param {number[]} input The input array to downsample.
+ * Quickly resample an array to have less/more data points. If an input which is larger
+ * than the desired size is provided, it will be downsampled. Similarly, if the input
+ * is smaller than the desired size then it will be upsampled.
+ * @param {number[]} input The input array to resample.
* @param {number} points The number of samples to end up with.
- * @returns {number[]} The downsampled array.
+ * @returns {number[]} The resampled array.
*/
export function arrayFastResample(input: number[], points: number): number[] {
- // Heavily inpired by matrix-media-repo (used with permission)
+ if (input.length === points) return input; // short-circuit a complicated call
+
+ // Heavily inspired by matrix-media-repo (used with permission)
// https://github.com/turt2live/matrix-media-repo/blob/abe72c87d2e29/util/util_audio/fastsample.go#L10
- const everyNth = Math.round(input.length / points);
- const samples: number[] = [];
- for (let i = 0; i < input.length; i += everyNth) {
- samples.push(input[i]);
+ let samples: number[] = [];
+ if (input.length > points) {
+ // Danger: this loop can cause out of memory conditions if the input is too small.
+ const everyNth = Math.round(input.length / points);
+ for (let i = 0; i < input.length; i += everyNth) {
+ samples.push(input[i]);
+ }
+ } else {
+ // Smaller inputs mean we have to spread the values over the desired length. We
+ // end up overshooting the target length in doing this, so we'll resample down
+ // before returning. This recursion is risky, but mathematically should not go
+ // further than 1 level deep.
+ const spreadFactor = Math.ceil(points / input.length);
+ for (const val of input) {
+ samples.push(...arraySeed(val, spreadFactor));
+ }
+ samples = arrayFastResample(samples, points);
}
+
+ // Sanity fill, just in case
while (samples.length < points) {
samples.push(input[input.length - 1]);
}
+
+ // Sanity trim, just in case
+ if (samples.length > points) {
+ samples = samples.slice(0, points);
+ }
+
return samples;
}
@@ -178,6 +202,13 @@ export class GroupedArray {
constructor(private val: Map) {
}
+ /**
+ * The value of this group, after all applicable alterations.
+ */
+ public get value(): Map {
+ return this.val;
+ }
+
/**
* Orders the grouping into an array using the provided key order.
* @param keyOrder The key order.
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
index f7f4787896..d3ca318c28 100644
--- a/src/utils/enums.ts
+++ b/src/utils/enums.ts
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,11 +19,23 @@ limitations under the License.
* @param e The enum.
* @returns The enum values.
*/
-export function getEnumValues(e: any): T[] {
+export function getEnumValues(e: any): (string | number)[] {
+ // String-based enums will simply be objects ({Key: "value"}), but number-based
+ // enums will instead map themselves twice: in one direction for {Key: 12} and
+ // the reverse for easy lookup, presumably ({12: Key}). In the reverse mapping,
+ // the key is a string, not a number.
+ //
+ // For this reason, we try to determine what kind of enum we're dealing with.
+
const keys = Object.keys(e);
- return keys
- .filter(k => ['string', 'number'].includes(typeof(e[k])))
- .map(k => e[k]);
+ const values: (string | number)[] = [];
+ for (const key of keys) {
+ const value = e[key];
+ if (Number.isFinite(value) || e[value.toString()] !== Number(key)) {
+ values.push(value);
+ }
+ }
+ return values;
}
/**
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
index e7f4f0f907..2c9361beba 100644
--- a/src/utils/objects.ts
+++ b/src/utils/objects.ts
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -141,3 +141,21 @@ export function objectKeyChanges(a: O, b: O): (keyof O)[] {
export function objectClone(obj: O): O {
return JSON.parse(JSON.stringify(obj));
}
+
+/**
+ * Converts a series of entries to an object.
+ * @param entries The entries to convert.
+ * @returns The converted object.
+ */
+// NOTE: Deprecated once we have Object.fromEntries() support.
+// @ts-ignore - return type is complaining about non-string keys, but we know better
+export function objectFromEntries(entries: Iterable<[K, V]>): {[k: K]: V} {
+ const obj: {
+ // @ts-ignore - same as return type
+ [k: K]: V} = {};
+ for (const e of entries) {
+ // @ts-ignore - same as return type
+ obj[e[0]] = e[1];
+ }
+ return obj;
+}
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index fcdd71629e..d3211f564c 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -29,7 +29,10 @@ function waitForRoomListStoreUpdate() {
describe('RoomList', () => {
function createRoom(opts) {
- const room = new Room(generateRoomId(), null, client.getUserId());
+ const room = new Room(generateRoomId(), MatrixClientPeg.get(), client.getUserId(), {
+ // The room list now uses getPendingEvents(), so we need a detached ordering.
+ pendingEventOrdering: "detached",
+ });
if (opts) {
Object.assign(room, opts);
}
diff --git a/test/test-utils.js b/test/test-utils.js
index d344a7e9b1..baa77114ed 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -83,6 +83,13 @@ export function createTestClient() {
rooms: [],
events: [],
}),
+
+ // Used by various internal bits we aren't concerned with (yet)
+ _sessionStore: {
+ store: {
+ getItem: jest.fn(),
+ },
+ },
};
}
diff --git a/test/Singleflight-test.ts b/test/utils/Singleflight-test.ts
similarity index 98%
rename from test/Singleflight-test.ts
rename to test/utils/Singleflight-test.ts
index 4f0c6e0da3..80258701bb 100644
--- a/test/Singleflight-test.ts
+++ b/test/utils/Singleflight-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import {Singleflight} from "../src/utils/Singleflight";
+import {Singleflight} from "../../src/utils/Singleflight";
describe('Singleflight', () => {
afterEach(() => {
diff --git a/test/utils/arrays-test.ts b/test/utils/arrays-test.ts
new file mode 100644
index 0000000000..ececd274b2
--- /dev/null
+++ b/test/utils/arrays-test.ts
@@ -0,0 +1,294 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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,
+ arrayFastClone,
+ arrayFastResample,
+ arrayHasDiff,
+ arrayHasOrderChange,
+ arrayMerge,
+ arraySeed,
+ arrayUnion,
+ ArrayUtil,
+ GroupedArray,
+} from "../../src/utils/arrays";
+import {objectFromEntries} from "../../src/utils/objects";
+
+function expectSample(i: number, input: number[], expected: number[]) {
+ console.log(`Resample case index: ${i}`); // for debugging test failures
+ const result = arrayFastResample(input, expected.length);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(expected.length);
+ expect(result).toEqual(expected);
+}
+
+describe('arrays', () => {
+ describe('arrayFastResample', () => {
+ it('should downsample', () => {
+ [
+ {input: [1, 2, 3, 4, 5], output: [1, 4]}, // Odd -> Even
+ {input: [1, 2, 3, 4, 5], output: [1, 3, 5]}, // Odd -> Odd
+ {input: [1, 2, 3, 4], output: [1, 2, 3]}, // Even -> Odd
+ {input: [1, 2, 3, 4], output: [1, 3]}, // Even -> Even
+ ].forEach((c, i) => expectSample(i, c.input, c.output));
+ });
+
+ it('should upsample', () => {
+ [
+ {input: [1, 2, 3], output: [1, 1, 2, 2, 3, 3]}, // Odd -> Even
+ {input: [1, 2, 3], output: [1, 1, 2, 2, 3]}, // Odd -> Odd
+ {input: [1, 2], output: [1, 1, 1, 2, 2]}, // Even -> Odd
+ {input: [1, 2], output: [1, 1, 1, 2, 2, 2]}, // Even -> Even
+ ].forEach((c, i) => expectSample(i, c.input, c.output));
+ });
+
+ it('should maintain sample', () => {
+ [
+ {input: [1, 2, 3], output: [1, 2, 3]}, // Odd
+ {input: [1, 2], output: [1, 2]}, // Even
+ ].forEach((c, i) => expectSample(i, c.input, c.output));
+ });
+ });
+
+ describe('arraySeed', () => {
+ it('should create an array of given length', () => {
+ const val = 1;
+ const output = [val, val, val];
+ const result = arraySeed(val, output.length);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(output.length);
+ expect(result).toEqual(output);
+ });
+ it('should maintain pointers', () => {
+ const val = {}; // this works because `{} !== {}`, which is what toEqual checks
+ const output = [val, val, val];
+ const result = arraySeed(val, output.length);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(output.length);
+ expect(result).toEqual(output);
+ });
+ });
+
+ describe('arrayFastClone', () => {
+ it('should break pointer reference on source array', () => {
+ const val = {}; // we'll test to make sure the values maintain pointers too
+ const input = [val, val, val];
+ const result = arrayFastClone(input);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(input.length);
+ expect(result).toEqual(input); // we want the array contents to match...
+ expect(result).not.toBe(input); // ... but be a different reference
+ });
+ });
+
+ describe('arrayHasOrderChange', () => {
+ it('should flag true on B ordering difference', () => {
+ const a = [1, 2, 3];
+ const b = [3, 2, 1];
+ const result = arrayHasOrderChange(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag false on no ordering difference', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 3];
+ const result = arrayHasOrderChange(a, b);
+ expect(result).toBe(false);
+ });
+
+ it('should flag true on A length > B length', () => {
+ const a = [1, 2, 3, 4];
+ const b = [1, 2, 3];
+ const result = arrayHasOrderChange(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag true on A length < B length', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 3, 4];
+ const result = arrayHasOrderChange(a, b);
+ expect(result).toBe(true);
+ });
+ });
+
+ describe('arrayHasDiff', () => {
+ it('should flag true on A length > B length', () => {
+ const a = [1, 2, 3, 4];
+ const b = [1, 2, 3];
+ const result = arrayHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag true on A length < B length', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 3, 4];
+ const result = arrayHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag true on element differences', () => {
+ const a = [1, 2, 3];
+ const b = [4, 5, 6];
+ const result = arrayHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag false if same but order different', () => {
+ const a = [1, 2, 3];
+ const b = [3, 1, 2];
+ const result = arrayHasDiff(a, b);
+ expect(result).toBe(false);
+ });
+
+ it('should flag false if same', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 3];
+ const result = arrayHasDiff(a, b);
+ expect(result).toBe(false);
+ });
+ });
+
+ describe('arrayDiff', () => {
+ it('should see added from A->B', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 3, 4];
+ const result = arrayDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(0);
+ expect(result.added).toEqual([4]);
+ });
+
+ it('should see removed from A->B', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2];
+ const result = arrayDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(1);
+ expect(result.removed).toEqual([3]);
+ });
+
+ it('should see added and removed in the same set', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 4]; // note diff
+ const result = arrayDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(1);
+ expect(result.added).toEqual([4]);
+ expect(result.removed).toEqual([3]);
+ });
+ });
+
+ describe('arrayUnion', () => {
+ it('should return a union', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 4]; // note diff
+ const result = arrayUnion(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(2);
+ expect(result).toEqual([1, 2]);
+ });
+
+ it('should return an empty array on no matches', () => {
+ const a = [1, 2, 3];
+ const b = [4, 5, 6];
+ const result = arrayUnion(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(0);
+ });
+ });
+
+ describe('arrayMerge', () => {
+ it('should merge 3 arrays with deduplication', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 4, 5]; // note missing 3
+ const c = [6, 7, 8, 9];
+ const result = arrayMerge(a, b, c);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(9);
+ expect(result).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9]);
+ });
+
+ it('should deduplicate a single array', () => {
+ // dev note: this is technically an edge case, but it is described behaviour if the
+ // function is only provided one function (it'll merge the array against itself)
+ const a = [1, 1, 2, 2, 3, 3];
+ const result = arrayMerge(a);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(3);
+ expect(result).toEqual([1, 2, 3]);
+ });
+ });
+
+ describe('ArrayUtil', () => {
+ it('should maintain the pointer to the given array', () => {
+ const input = [1, 2, 3];
+ const result = new ArrayUtil(input);
+ expect(result.value).toBe(input);
+ });
+
+ it('should group appropriately', () => {
+ const input = [['a', 1], ['b', 2], ['c', 3], ['a', 4], ['a', 5], ['b', 6]];
+ const output = {
+ 'a': [['a', 1], ['a', 4], ['a', 5]],
+ 'b': [['b', 2], ['b', 6]],
+ 'c': [['c', 3]],
+ };
+ const result = new ArrayUtil(input).groupBy(p => p[0]);
+ expect(result).toBeDefined();
+ expect(result.value).toBeDefined();
+
+ const asObject = objectFromEntries(result.value.entries());
+ expect(asObject).toMatchObject(output);
+ });
+ });
+
+ describe('GroupedArray', () => {
+ it('should maintain the pointer to the given map', () => {
+ const input = new Map([
+ ['a', [1, 2, 3]],
+ ['b', [7, 8, 9]],
+ ['c', [4, 5, 6]],
+ ]);
+ const result = new GroupedArray(input);
+ expect(result.value).toBe(input);
+ });
+
+ it('should ordering by the provided key order', () => {
+ const input = new Map([
+ ['a', [1, 2, 3]],
+ ['b', [7, 8, 9]], // note counting diff
+ ['c', [4, 5, 6]],
+ ]);
+ const output = [4, 5, 6, 1, 2, 3, 7, 8, 9];
+ const keyOrder = ['c', 'a', 'b']; // note weird order to cause the `output` to be strange
+ const result = new GroupedArray(input).orderBy(keyOrder);
+ expect(result).toBeDefined();
+ expect(result.value).toBeDefined();
+ expect(result.value).toEqual(output);
+ });
+ });
+});
+
diff --git a/test/utils/enums-test.ts b/test/utils/enums-test.ts
new file mode 100644
index 0000000000..423b135f77
--- /dev/null
+++ b/test/utils/enums-test.ts
@@ -0,0 +1,67 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 {getEnumValues, isEnumValue} from "../../src/utils/enums";
+
+enum TestStringEnum {
+ First = "__first__",
+ Second = "__second__",
+}
+
+enum TestNumberEnum {
+ FirstKey = 10,
+ SecondKey = 20,
+}
+
+describe('enums', () => {
+ describe('getEnumValues', () => {
+ it('should work on string enums', () => {
+ const result = getEnumValues(TestStringEnum);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(2);
+ expect(result).toEqual(['__first__', '__second__']);
+ });
+
+ it('should work on number enums', () => {
+ const result = getEnumValues(TestNumberEnum);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(2);
+ expect(result).toEqual([10, 20]);
+ });
+ });
+
+ describe('isEnumValue', () => {
+ it('should return true on values in a string enum', () => {
+ const result = isEnumValue(TestStringEnum, '__first__');
+ expect(result).toBe(true);
+ });
+
+ it('should return false on values not in a string enum', () => {
+ const result = isEnumValue(TestStringEnum, 'not a value');
+ expect(result).toBe(false);
+ });
+
+ it('should return true on values in a number enum', () => {
+ const result = isEnumValue(TestNumberEnum, 10);
+ expect(result).toBe(true);
+ });
+
+ it('should return false on values not in a number enum', () => {
+ const result = isEnumValue(TestStringEnum, 99);
+ expect(result).toBe(false);
+ });
+ });
+});
diff --git a/test/utils/iterables-test.ts b/test/utils/iterables-test.ts
new file mode 100644
index 0000000000..9b30b6241c
--- /dev/null
+++ b/test/utils/iterables-test.ts
@@ -0,0 +1,77 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 {iterableDiff, iterableUnion} from "../../src/utils/iterables";
+
+describe('iterables', () => {
+ describe('iterableUnion', () => {
+ it('should return a union', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 4]; // note diff
+ const result = iterableUnion(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(2);
+ expect(result).toEqual([1, 2]);
+ });
+
+ it('should return an empty array on no matches', () => {
+ const a = [1, 2, 3];
+ const b = [4, 5, 6];
+ const result = iterableUnion(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(0);
+ });
+ });
+
+ describe('iterableDiff', () => {
+ it('should see added from A->B', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 3, 4];
+ const result = iterableDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(0);
+ expect(result.added).toEqual([4]);
+ });
+
+ it('should see removed from A->B', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2];
+ const result = iterableDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(1);
+ expect(result.removed).toEqual([3]);
+ });
+
+ it('should see added and removed in the same set', () => {
+ const a = [1, 2, 3];
+ const b = [1, 2, 4]; // note diff
+ const result = iterableDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(1);
+ expect(result.added).toEqual([4]);
+ expect(result.removed).toEqual([3]);
+ });
+ });
+});
diff --git a/test/utils/maps-test.ts b/test/utils/maps-test.ts
new file mode 100644
index 0000000000..8764a8f2cf
--- /dev/null
+++ b/test/utils/maps-test.ts
@@ -0,0 +1,245 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 {EnhancedMap, mapDiff, mapKeyChanges} from "../../src/utils/maps";
+
+describe('maps', () => {
+ describe('mapDiff', () => {
+ it('should indicate no differences when the pointers are the same', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const result = mapDiff(a, a);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ expect(result.changed).toHaveLength(0);
+ });
+
+ it('should indicate no differences when there are none', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 2], [3, 3]]);
+ const result = mapDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ expect(result.changed).toHaveLength(0);
+ });
+
+ it('should indicate added properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 2], [3, 3], [4, 4]]);
+ const result = mapDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(0);
+ expect(result.changed).toHaveLength(0);
+ expect(result.added).toEqual([4]);
+ });
+
+ it('should indicate removed properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 2]]);
+ const result = mapDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(1);
+ expect(result.changed).toHaveLength(0);
+ expect(result.removed).toEqual([3]);
+ });
+
+ it('should indicate changed properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 2], [3, 4]]); // note change
+ const result = mapDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ expect(result.changed).toHaveLength(1);
+ expect(result.changed).toEqual([3]);
+ });
+
+ it('should indicate changed, added, and removed properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 8], [4, 4]]); // note change
+ const result = mapDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(1);
+ expect(result.changed).toHaveLength(1);
+ expect(result.added).toEqual([4]);
+ expect(result.removed).toEqual([3]);
+ expect(result.changed).toEqual([2]);
+ });
+
+ it('should indicate changes for difference in pointers', () => {
+ const a = new Map([[1, {}]]); // {} always creates a new object
+ const b = new Map([[1, {}]]);
+ const result = mapDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ expect(result.changed).toHaveLength(1);
+ expect(result.changed).toEqual([1]);
+ });
+ });
+
+ describe('mapKeyChanges', () => {
+ it('should indicate no changes for unchanged pointers', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const result = mapKeyChanges(a, a);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(0);
+ });
+
+ it('should indicate no changes for unchanged maps with different pointers', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 2], [3, 3]]);
+ const result = mapKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(0);
+ });
+
+ it('should indicate changes for added properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 2], [3, 3], [4, 4]]);
+ const result = mapKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(1);
+ expect(result).toEqual([4]);
+ });
+
+ it('should indicate changes for removed properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3], [4, 4]]);
+ const b = new Map([[1, 1], [2, 2], [3, 3]]);
+ const result = mapKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(1);
+ expect(result).toEqual([4]);
+ });
+
+ it('should indicate changes for changed properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3], [4, 4]]);
+ const b = new Map([[1, 1], [2, 2], [3, 3], [4, 55]]);
+ const result = mapKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(1);
+ expect(result).toEqual([4]);
+ });
+
+ it('should indicate changes for properties with different pointers', () => {
+ const a = new Map([[1, {}]]); // {} always creates a new object
+ const b = new Map([[1, {}]]);
+ const result = mapKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(1);
+ expect(result).toEqual([1]);
+ });
+
+ it('should indicate changes for changed, added, and removed properties', () => {
+ const a = new Map([[1, 1], [2, 2], [3, 3]]);
+ const b = new Map([[1, 1], [2, 8], [4, 4]]); // note change
+ const result = mapKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(3);
+ expect(result).toEqual([3, 4, 2]); // order irrelevant, but the test cares
+ });
+ });
+
+ describe('EnhancedMap', () => {
+ // Most of these tests will make sure it implements the Map class
+
+ it('should be empty by default', () => {
+ const result = new EnhancedMap();
+ expect(result.size).toBe(0);
+ });
+
+ it('should use the provided entries', () => {
+ const obj = {a: 1, b: 2};
+ const result = new EnhancedMap(Object.entries(obj));
+ expect(result.size).toBe(2);
+ expect(result.get('a')).toBe(1);
+ expect(result.get('b')).toBe(2);
+ });
+
+ it('should create keys if they do not exist', () => {
+ const key = 'a';
+ const val = {}; // we'll check pointers
+
+ const result = new EnhancedMap();
+ expect(result.size).toBe(0);
+
+ let get = result.getOrCreate(key, val);
+ expect(get).toBeDefined();
+ expect(get).toBe(val);
+ expect(result.size).toBe(1);
+
+ get = result.getOrCreate(key, 44); // specifically change `val`
+ expect(get).toBeDefined();
+ expect(get).toBe(val);
+ expect(result.size).toBe(1);
+
+ get = result.get(key); // use the base class function
+ expect(get).toBeDefined();
+ expect(get).toBe(val);
+ expect(result.size).toBe(1);
+ });
+
+ it('should proxy remove to delete and return it', () => {
+ const val = {};
+ const result = new EnhancedMap();
+ result.set('a', val);
+
+ expect(result.size).toBe(1);
+
+ const removed = result.remove('a');
+ expect(result.size).toBe(0);
+ expect(removed).toBeDefined();
+ expect(removed).toBe(val);
+ });
+
+ it('should support removing unknown keys', () => {
+ const val = {};
+ const result = new EnhancedMap();
+ result.set('a', val);
+
+ expect(result.size).toBe(1);
+
+ const removed = result.remove('not-a');
+ expect(result.size).toBe(1);
+ expect(removed).not.toBeDefined();
+ });
+ });
+});
diff --git a/test/utils/numbers-test.ts b/test/utils/numbers-test.ts
new file mode 100644
index 0000000000..36e7d4f7e7
--- /dev/null
+++ b/test/utils/numbers-test.ts
@@ -0,0 +1,163 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 {clamp, defaultNumber, percentageOf, percentageWithin, sum} from "../../src/utils/numbers";
+
+describe('numbers', () => {
+ describe('defaultNumber', () => {
+ it('should use the default when the input is not a number', () => {
+ const def = 42;
+
+ let result = defaultNumber(null, def);
+ expect(result).toBe(def);
+
+ result = defaultNumber(undefined, def);
+ expect(result).toBe(def);
+
+ result = defaultNumber(Number.NaN, def);
+ expect(result).toBe(def);
+ });
+
+ it('should use the number when it is a number', () => {
+ const input = 24;
+ const def = 42;
+ const result = defaultNumber(input, def);
+ expect(result).toBe(input);
+ });
+ });
+
+ describe('clamp', () => {
+ it('should clamp high numbers', () => {
+ const input = 101;
+ const min = 0;
+ const max = 100;
+ const result = clamp(input, min, max);
+ expect(result).toBe(max);
+ });
+
+ it('should clamp low numbers', () => {
+ const input = -1;
+ const min = 0;
+ const max = 100;
+ const result = clamp(input, min, max);
+ expect(result).toBe(min);
+ });
+
+ it('should not clamp numbers in range', () => {
+ const input = 50;
+ const min = 0;
+ const max = 100;
+ const result = clamp(input, min, max);
+ expect(result).toBe(input);
+ });
+
+ it('should clamp floats', () => {
+ const min = -0.10;
+ const max = +0.10;
+
+ let result = clamp(-1.2, min, max);
+ expect(result).toBe(min);
+
+ result = clamp(1.2, min, max);
+ expect(result).toBe(max);
+
+ result = clamp(0.02, min, max);
+ expect(result).toBe(0.02);
+ });
+ });
+
+ describe('sum', () => {
+ it('should sum', () => { // duh
+ const result = sum(1, 2, 1, 4);
+ expect(result).toBe(8);
+ });
+ });
+
+ describe('percentageWithin', () => {
+ it('should work within 0-100', () => {
+ const result = percentageWithin(0.4, 0, 100);
+ expect(result).toBe(40);
+ });
+
+ it('should work within 0-100 when pct > 1', () => {
+ const result = percentageWithin(1.4, 0, 100);
+ expect(result).toBe(140);
+ });
+
+ it('should work within 0-100 when pct < 0', () => {
+ const result = percentageWithin(-1.4, 0, 100);
+ expect(result).toBe(-140);
+ });
+
+ it('should work with ranges other than 0-100', () => {
+ const result = percentageWithin(0.4, 10, 20);
+ expect(result).toBe(14);
+ });
+
+ it('should work with ranges other than 0-100 when pct > 1', () => {
+ const result = percentageWithin(1.4, 10, 20);
+ expect(result).toBe(24);
+ });
+
+ it('should work with ranges other than 0-100 when pct < 0', () => {
+ const result = percentageWithin(-1.4, 10, 20);
+ expect(result).toBe(-4);
+ });
+
+ it('should work with floats', () => {
+ const result = percentageWithin(0.4, 10.2, 20.4);
+ expect(result).toBe(14.28);
+ });
+ });
+
+ // These are the inverse of percentageWithin
+ describe('percentageOf', () => {
+ it('should work within 0-100', () => {
+ const result = percentageOf(40, 0, 100);
+ expect(result).toBe(0.4);
+ });
+
+ it('should work within 0-100 when val > 100', () => {
+ const result = percentageOf(140, 0, 100);
+ expect(result).toBe(1.40);
+ });
+
+ it('should work within 0-100 when val < 0', () => {
+ const result = percentageOf(-140, 0, 100);
+ expect(result).toBe(-1.40);
+ });
+
+ it('should work with ranges other than 0-100', () => {
+ const result = percentageOf(14, 10, 20);
+ expect(result).toBe(0.4);
+ });
+
+ it('should work with ranges other than 0-100 when val > 100', () => {
+ const result = percentageOf(24, 10, 20);
+ expect(result).toBe(1.4);
+ });
+
+ it('should work with ranges other than 0-100 when val < 0', () => {
+ const result = percentageOf(-4, 10, 20);
+ expect(result).toBe(-1.4);
+ });
+
+ it('should work with floats', () => {
+ const result = percentageOf(14.28, 10.2, 20.4);
+ expect(result).toBe(0.4);
+ });
+ });
+});
diff --git a/test/utils/objects-test.ts b/test/utils/objects-test.ts
new file mode 100644
index 0000000000..b7a80e6761
--- /dev/null
+++ b/test/utils/objects-test.ts
@@ -0,0 +1,262 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 {
+ objectClone,
+ objectDiff,
+ objectExcluding,
+ objectFromEntries,
+ objectHasDiff,
+ objectKeyChanges,
+ objectShallowClone,
+ objectWithOnly,
+} from "../../src/utils/objects";
+
+describe('objects', () => {
+ describe('objectExcluding', () => {
+ it('should exclude the given properties', () => {
+ const input = {hello: "world", test: true};
+ const output = {hello: "world"};
+ const props = ["test", "doesnotexist"]; // we also make sure it doesn't explode on missing props
+ const result = objectExcluding(input, props); // any is to test the missing prop
+ expect(result).toBeDefined();
+ expect(result).toMatchObject(output);
+ });
+ });
+
+ describe('objectWithOnly', () => {
+ it('should exclusively use the given properties', () => {
+ const input = {hello: "world", test: true};
+ const output = {hello: "world"};
+ const props = ["hello", "doesnotexist"]; // we also make sure it doesn't explode on missing props
+ const result = objectWithOnly(input, props); // any is to test the missing prop
+ expect(result).toBeDefined();
+ expect(result).toMatchObject(output);
+ });
+ });
+
+ describe('objectShallowClone', () => {
+ it('should create a new object', () => {
+ const input = {test: 1};
+ const result = objectShallowClone(input);
+ expect(result).toBeDefined();
+ expect(result).not.toBe(input);
+ expect(result).toMatchObject(input);
+ });
+
+ it('should only clone the top level properties', () => {
+ const input = {a: 1, b: {c: 2}};
+ const result = objectShallowClone(input);
+ expect(result).toBeDefined();
+ expect(result).toMatchObject(input);
+ expect(result.b).toBe(input.b);
+ });
+
+ it('should support custom clone functions', () => {
+ const input = {a: 1, b: 2};
+ const output = {a: 4, b: 8};
+ const result = objectShallowClone(input, (k, v) => {
+ // XXX: inverted expectation for ease of assertion
+ expect(Object.keys(input)).toContain(k);
+
+ return v * 4;
+ });
+ expect(result).toBeDefined();
+ expect(result).toMatchObject(output);
+ });
+ });
+
+ describe('objectHasDiff', () => {
+ it('should return false for the same pointer', () => {
+ const a = {};
+ const result = objectHasDiff(a, a);
+ expect(result).toBe(false);
+ });
+
+ it('should return true if keys for A > keys for B', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 1};
+ const result = objectHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should return true if keys for A < keys for B', () => {
+ const a = {a: 1};
+ const b = {a: 1, b: 2};
+ const result = objectHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should return false if the objects are the same but different pointers', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 1, b: 2};
+ const result = objectHasDiff(a, b);
+ expect(result).toBe(false);
+ });
+
+ it('should consider pointers when testing values', () => {
+ const a = {a: {}, b: 2}; // `{}` is shorthand for `new Object()`
+ const b = {a: {}, b: 2};
+ const result = objectHasDiff(a, b);
+ expect(result).toBe(true); // even though the keys are the same, the value pointers vary
+ });
+ });
+
+ describe('objectDiff', () => {
+ it('should return empty sets for the same object', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 1, b: 2};
+ const result = objectDiff(a, b);
+ expect(result).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toHaveLength(0);
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ });
+
+ it('should return empty sets for the same object pointer', () => {
+ const a = {a: 1, b: 2};
+ const result = objectDiff(a, a);
+ expect(result).toBeDefined();
+ expect(result.changed).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toHaveLength(0);
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ });
+
+ it('should indicate when property changes are made', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 11, b: 2};
+ const result = objectDiff(a, b);
+ expect(result.changed).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toHaveLength(1);
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(0);
+ expect(result.changed).toEqual(['a']);
+ });
+
+ it('should indicate when properties are added', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 1, b: 2, c: 3};
+ const result = objectDiff(a, b);
+ expect(result.changed).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toHaveLength(0);
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(0);
+ expect(result.added).toEqual(['c']);
+ });
+
+ it('should indicate when properties are removed', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 1};
+ const result = objectDiff(a, b);
+ expect(result.changed).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toHaveLength(0);
+ expect(result.added).toHaveLength(0);
+ expect(result.removed).toHaveLength(1);
+ expect(result.removed).toEqual(['b']);
+ });
+
+ it('should indicate when multiple aspects change', () => {
+ const a = {a: 1, b: 2, c: 3};
+ const b: (typeof a | {d: number}) = {a: 1, b: 22, d: 4};
+ const result = objectDiff(a, b);
+ expect(result.changed).toBeDefined();
+ expect(result.added).toBeDefined();
+ expect(result.removed).toBeDefined();
+ expect(result.changed).toHaveLength(1);
+ expect(result.added).toHaveLength(1);
+ expect(result.removed).toHaveLength(1);
+ expect(result.changed).toEqual(['b']);
+ expect(result.removed).toEqual(['c']);
+ expect(result.added).toEqual(['d']);
+ });
+ });
+
+ describe('objectKeyChanges', () => {
+ it('should return an empty set if no properties changed', () => {
+ const a = {a: 1, b: 2};
+ const b = {a: 1, b: 2};
+ const result = objectKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(0);
+ });
+
+ it('should return an empty set if no properties changed for the same pointer', () => {
+ const a = {a: 1, b: 2};
+ const result = objectKeyChanges(a, a);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(0);
+ });
+
+ it('should return properties which were changed, added, or removed', () => {
+ const a = {a: 1, b: 2, c: 3};
+ const b: (typeof a | {d: number}) = {a: 1, b: 22, d: 4};
+ const result = objectKeyChanges(a, b);
+ expect(result).toBeDefined();
+ expect(result).toHaveLength(3);
+ expect(result).toEqual(['c', 'd', 'b']); // order isn't important, but the test cares
+ });
+ });
+
+ describe('objectClone', () => {
+ it('should deep clone an object', () => {
+ const a = {
+ hello: "world",
+ test: {
+ another: "property",
+ test: 42,
+ third: {
+ prop: true,
+ },
+ },
+ };
+ const result = objectClone(a);
+ expect(result).toBeDefined();
+ expect(result).not.toBe(a);
+ expect(result).toMatchObject(a);
+ expect(result.test).not.toBe(a.test);
+ expect(result.test.third).not.toBe(a.test.third);
+ });
+ });
+
+ describe('objectFromEntries', () => {
+ it('should create an object from an array of entries', () => {
+ const output = {a: 1, b: 2, c: 3};
+ const result = objectFromEntries(Object.entries(output));
+ expect(result).toBeDefined();
+ expect(result).toMatchObject(output);
+ });
+
+ it('should maintain pointers in values', () => {
+ const output = {a: {}, b: 2, c: 3};
+ const result = objectFromEntries(Object.entries(output));
+ expect(result).toBeDefined();
+ expect(result).toMatchObject(output);
+ expect(result['a']).toBe(output.a);
+ });
+ });
+});
diff --git a/test/utils/sets-test.ts b/test/utils/sets-test.ts
new file mode 100644
index 0000000000..98dc218309
--- /dev/null
+++ b/test/utils/sets-test.ts
@@ -0,0 +1,56 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 {setHasDiff} from "../../src/utils/sets";
+
+describe('sets', () => {
+ describe('setHasDiff', () => {
+ it('should flag true on A length > B length', () => {
+ const a = new Set([1, 2, 3, 4]);
+ const b = new Set([1, 2, 3]);
+ const result = setHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag true on A length < B length', () => {
+ const a = new Set([1, 2, 3]);
+ const b = new Set([1, 2, 3, 4]);
+ const result = setHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag true on element differences', () => {
+ const a = new Set([1, 2, 3]);
+ const b = new Set([4, 5, 6]);
+ const result = setHasDiff(a, b);
+ expect(result).toBe(true);
+ });
+
+ it('should flag false if same but order different', () => {
+ const a = new Set([1, 2, 3]);
+ const b = new Set([3, 1, 2]);
+ const result = setHasDiff(a, b);
+ expect(result).toBe(false);
+ });
+
+ it('should flag false if same', () => {
+ const a = new Set([1, 2, 3]);
+ const b = new Set([1, 2, 3]);
+ const result = setHasDiff(a, b);
+ expect(result).toBe(false);
+ });
+ });
+});
diff --git a/yarn.lock b/yarn.lock
index 66329cfa89..b658a73b60 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5588,8 +5588,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "9.11.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e277de6e3d9bbb98fbfbbedd47d86ee85f6f47e5"
+ version "10.0.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c8f69c0b7937b9064938c134d708c4d064b71315"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
![]({require("../../../res/img/feather-customised/warning-triangle.svg")} "{_t(\"Warning\")}"){kind=small}
-