nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird

Browse Source
This commit is contained in:
Michael Telatynski
2019-11-21 11:15:32 +00:00
parent 6121420113 04641a0f87
commit d3f872bf7a
24 changed files with 262 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/WidgetUtils.js
View File

@@ -400,7 +400,7 @@ export default class WidgetUtils {
return client.setAccountData('m.widgets', userWidgets);
}
static makeAppConfig(appId, app, senderUserId, roomId) {
static makeAppConfig(appId, app, senderUserId, roomId, eventId) {
const myUserId = MatrixClientPeg.get().credentials.userId;
const user = MatrixClientPeg.get().getUser(myUserId);
const params = {
@@ -419,6 +419,7 @@ export default class WidgetUtils {
app.creatorUserId = senderUserId;
app.id = appId;
app.eventId = eventId;
app.name = app.name || app.type;
if (app.data) {