PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Just use MSC1957

Browse source
This commit is contained in:
Travis Ralston 2019-08-14 09:33:02 -06:00
parent 8b1c90a01e
commit b77be2d380
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/utils/WidgetUtils.js
View file

@ -29,9 +29,6 @@ import SettingsStore from "../settings/SettingsStore";
import ActiveWidgetStore from "../stores/ActiveWidgetStore"; import ActiveWidgetStore from "../stores/ActiveWidgetStore";
import {IntegrationManagers} from "../integrations/IntegrationManagers"; import {IntegrationManagers} from "../integrations/IntegrationManagers";
// We'll be using im.vector.integration_manager until MSC1957 or similar is accepted.
const IM_WIDGET_TYPES = ["m.integration_manager", "im.vector.integration_manager"];
/** /**
* Encodes a URI according to a set of template variables. Variables will be * Encodes a URI according to a set of template variables. Variables will be
* passed through encodeURIComponent. * passed through encodeURIComponent.
@ -349,7 +346,7 @@ export default class WidgetUtils {
*/ */
static getIntegrationManagerWidgets() { static getIntegrationManagerWidgets() {
const widgets = WidgetUtils.getUserWidgetsArray(); const widgets = WidgetUtils.getUserWidgetsArray();
return widgets.filter(w => w.content && IM_WIDGET_TYPES.includes(w.content.type)); return widgets.filter(w => w.content && w.content.type === "m.integration_manager");
} }
static removeIntegrationManagerWidgets() { static removeIntegrationManagerWidgets() {
@ -359,7 +356,7 @@ export default class WidgetUtils {
} }
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.content && IM_WIDGET_TYPES.includes(widget.content.type)) { if (widget.content && widget.content.type === "m.integration_manager") {
delete userWidgets[key]; delete userWidgets[key];
} }
}); });
@ -369,7 +366,7 @@ export default class WidgetUtils {
static addIntegrationManagerWidget(name: string, uiUrl: string, apiUrl: string) { static addIntegrationManagerWidget(name: string, uiUrl: string, apiUrl: string) {
return WidgetUtils.setUserWidget( return WidgetUtils.setUserWidget(
"integration_manager_" + (new Date().getTime()), "integration_manager_" + (new Date().getTime()),
"im.vector.integration_manager", // TODO: Use m.integration_manager post-MSC1957 "m.integration_manager",
uiUrl, uiUrl,
"Integration Manager: " + name, "Integration Manager: " + name,
{"api_url": apiUrl}, {"api_url": apiUrl},