mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1894 from turt2live/travis/fix-stickerpacks

Browse source 
Correctly identify sticker picker widgets
This commit is contained in:
Richard Lewis 2018-05-14 17:40:13 +01:00 committed by GitHub
commit 8c3a63a169
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/utils/widgets.js
View file

@ -58,8 +58,7 @@ function getUserWidgetsArray() {
*/ */
function getStickerpickerWidgets() { function getStickerpickerWidgets() {
const widgets = getUserWidgetsArray(); const widgets = getUserWidgetsArray();
const stickerpickerWidgets = widgets.filter((widget) => widget.type='m.stickerpicker'); return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
return stickerpickerWidgets;
} }
/** /**
@ -73,7 +72,7 @@ function removeStickerpickerWidgets() {
} }
const userWidgets = client.getAccountData('m.widgets').getContent() || {}; const userWidgets = client.getAccountData('m.widgets').getContent() || {};
Object.entries(userWidgets).forEach(([key, widget]) => { Object.entries(userWidgets).forEach(([key, widget]) => {
if (widget.type === 'm.stickerpicker') { if (widget.content && widget.content.type === 'm.stickerpicker') {
delete userWidgets[key]; delete userWidgets[key];
} }
}); });