matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

No-op removals of widgets that don't exist

Browse Source 
An example of this is setting your very first widget: there's nothing to remove, so you end up with "cannot call .getContent() of undefined" instead.
This commit is contained in:
Travis Ralston
2019-08-21 18:43:29 -06:00
parent 04bb2ed322
commit 19b7d18e7a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/WidgetUtils.js
View File

@@ -354,7 +354,9 @@ export default class WidgetUtils {
if (!client) { if (!client) {
throw new Error('User not logged in'); throw new Error('User not logged in');
} }
const userWidgets = client.getAccountData('m.widgets').getContent() || {}; const widgets = client.getAccountData('m.widgets');
if (!widgets) return;
const userWidgets = widgets.getContent() || {};
Object.entries(userWidgets).forEach(([key, widget]) => { Object.entries(userWidgets).forEach(([key, widget]) => {
if (widget.content && widget.content.type === "m.integration_manager") { if (widget.content && widget.content.type === "m.integration_manager") {
delete userWidgets[key]; delete userWidgets[key];
@@ -382,7 +384,9 @@ export default class WidgetUtils {
if (!client) { if (!client) {
throw new Error('User not logged in'); throw new Error('User not logged in');
} }
const userWidgets = client.getAccountData('m.widgets').getContent() || {}; const widgets = client.getAccountData('m.widgets');
if (!widgets) return;
const userWidgets = widgets.getContent() || {};
Object.entries(userWidgets).forEach(([key, widget]) => { Object.entries(userWidgets).forEach(([key, widget]) => {
if (widget.content && widget.content.type === 'm.stickerpicker') { if (widget.content && widget.content.type === 'm.stickerpicker') {
delete userWidgets[key]; delete userWidgets[key];