From 58fc53151577d9158f66309f5db8de234bb9604a Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 6 Jul 2021 22:39:52 +0000 Subject: [PATCH] Fix integration (#1275) * Fix integration - Don't use sourceCode as "temporary" value as it's being used as legit value(consider that we delete it after it's non longer needed). - Wrap the metadata into a `try {}` as some styles doesn't have any metadata. * Typos adios magios and bonjour gutentag --- background/style-manager.js | 14 ++++++++++---- content/install-hook-userstylesworld.js | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/background/style-manager.js b/background/style-manager.js index f390bfdc..0944865a 100644 --- a/background/style-manager.js +++ b/background/style-manager.js @@ -378,12 +378,18 @@ const styleMan = (() => { for (const {style: someStyle} of dataMap.values()) { if (someStyle._id === style._id) { someStyle._isUswLinked = true; - someStyle.sourceCode = style.sourceCode; - const {metadata} = await API.worker.parseUsercssMeta(style.sourceCode); + someStyle.originalValue = style.sourceCode; + let metadata = {}; + try { + const {metadata: tmpMetadata} = await API.worker.parseUsercssMeta(style.sourceCode); + metadata = tmpMetadata; + } catch (err) { + console.log(err); + } someStyle.metadata = metadata; } else { delete someStyle._isUswLinked; - delete someStyle.sourceCode; + delete someStyle.originalValue; delete someStyle.metadata; } handleSave(await saveStyle(someStyle), null, null, false); @@ -393,7 +399,7 @@ const styleMan = (() => { }; delete style._isUswLinked; - delete style.sourceCode; + delete style.originalValue; delete style.metadata; for (const [k, v] of Object.entries(await retrieveStyleInformation(style._usw.token))) { style._usw[k] = v; diff --git a/content/install-hook-userstylesworld.js b/content/install-hook-userstylesworld.js index dfcf6d84..ab68803d 100644 --- a/content/install-hook-userstylesworld.js +++ b/content/install-hook-userstylesworld.js @@ -19,6 +19,7 @@ if (location.pathname === '/api/oauth/style/new') { API.styles.find({_isUswLinked: true}).then(style => { + style.sourceCode = style.originalValue; sendPostMessage({type: 'usw-fill-new-style', data: style}); }); }