imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep all previously approved widget capabilities when requesting new capabilities (#7340)

Browse source
This commit is contained in:
Dominik Henneke 2021-12-13 11:34:04 +01:00 • committed by GitHub
parent 3b3776222b
commit 908e938996
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/stores/widgets/StopGapWidgetDriver.ts
View file

@ -34,7 +34,7 @@ import { IContent, IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event";
import { Room } from "matrix-js-sdk/src/models/room";
import { logger } from "matrix-js-sdk/src/logger";
import { iterableDiff, iterableUnion } from "../../utils/iterables";
import { iterableDiff, iterableMerge } from "../../utils/iterables";
import { MatrixClientPeg } from "../../MatrixClientPeg";
import ActiveRoomObserver from "../../ActiveRoomObserver";
import Modal from "../../Modal";
@ -131,7 +131,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
}
}
const allAllowed = new Set(iterableUnion(allowedSoFar, requested));
const allAllowed = new Set(iterableMerge(allowedSoFar, requested));
if (rememberApproved) {
setRememberedCapabilitiesForWidget(this.forWidget, Array.from(allAllowed));