From 7880489034ea0a639d459b28f4b359d1499c22db Mon Sep 17 00:00:00 2001 From: David Ralph Date: Wed, 31 Aug 2022 22:05:11 +0100 Subject: [PATCH] fix: remove unused & bugged feature --- .../modals/main/marketplace/Item.jsx | 35 ------------------- src/components/widgets/quote/Quote.jsx | 18 ---------- src/modules/helpers/marketplace.js | 5 --- src/translations/de_DE.json | 4 --- src/translations/en_GB.json | 4 --- src/translations/en_US.json | 4 --- src/translations/es.json | 4 --- src/translations/fr.json | 4 --- src/translations/id_ID.json | 4 --- src/translations/nl.json | 4 --- src/translations/no.json | 4 --- src/translations/ru.json | 4 --- src/translations/tr_TR.json | 4 --- src/translations/zh_CN.json | 4 --- 14 files changed, 102 deletions(-) diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index c895dc9c..9ac547de 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -6,7 +6,6 @@ import { toast } from 'react-toastify'; import { MdIosShare, MdFlag, - MdWarning, MdAccountCircle, MdBugReport, MdFormatQuote, @@ -61,23 +60,6 @@ export default class Item extends PureComponent { return null; } - let warningHTML; - if (this.props.data.quote_api) { - warningHTML = ( -
-
- -
- {variables.getMessage('modals.main.marketplace.product.quote_warning.title')} -
-
-
- {variables.getMessage('modals.main.marketplace.product.quote_warning.description')} -
-
- ); - } - // prevent console error let iconsrc = variables.constants.DDG_IMAGE_PROXY + this.props.data.icon; if (!this.props.data.icon) { @@ -160,22 +142,6 @@ export default class Item extends PureComponent { {variables.getMessage('modals.main.marketplace.product.description')} - {/* - {this.props.data.description.length > 100 ? ( -
this.toggleShowMore()}> - {this.state.showMore === true ? ( - <> - {variables.getMessage('modals.main.marketplace.product.show_less')} - - - ) : ( - <> - {variables.getMessage('modals.main.marketplace.product.show_more')} - - - )} -
- ) : null}*/}
@@ -279,7 +245,6 @@ export default class Item extends PureComponent {
) : null} - {warningHTML}
diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx index 3c11a86b..f122ac24 100644 --- a/src/components/widgets/quote/Quote.jsx +++ b/src/components/widgets/quote/Quote.jsx @@ -214,24 +214,6 @@ export default class Quote extends PureComponent { return this.doOffline(); } - const quotePackAPI = JSON.parse(localStorage.getItem('quoteAPI')); - if (quotePackAPI) { - try { - const data = await (await fetch(quotePackAPI.url)).json(); - const author = data[quotePackAPI.author] || quotePackAPI.author; - const installed = JSON.parse(localStorage.getItem('installed')); - // todo: make this actually get the correct quote pack, instead of the first available - const info = installed.find((i) => i.type === 'quotes'); - - return this.setState({ - quote: '"' + data[quotePackAPI.quote] + '"', - author, - authorimg: info.icon_url, - }); - } catch (e) { - return this.doOffline(); - } - } const quotePack = []; const installed = JSON.parse(localStorage.getItem('installed')); installed.forEach((item) => { diff --git a/src/modules/helpers/marketplace.js b/src/modules/helpers/marketplace.js index 9abbfb1a..8284f165 100644 --- a/src/modules/helpers/marketplace.js +++ b/src/modules/helpers/marketplace.js @@ -47,10 +47,6 @@ export function install(type, input, sideload) { break; case 'quotes': - if (input.quote_api) { - localStorage.setItem('quoteAPI', JSON.stringify(input.quote_api)); - } - const currentQuotes = JSON.parse(localStorage.getItem('quote_packs')) || []; input.quotes.forEach((quote) => { currentQuotes.push(quote); @@ -111,7 +107,6 @@ export function uninstall(type, name) { } }); localStorage.setItem('quote_packs', JSON.stringify(installedContents)); - localStorage.removeItem('quoteAPI'); if (installedContents.length === 0) { localStorage.setItem('quoteType', localStorage.getItem('oldQuoteType') || 'api'); localStorage.removeItem('oldQuoteType'); diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index 006dcd75..ad998aef 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -499,10 +499,6 @@ "remove": "Entfernen", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Warnung", - "description": "Dieses Zitatpaket stellt Anfragen an externe Server, die Sie möglicherweise tracken!" } }, "offline": { diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index ced5a1b0..285529af 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -497,10 +497,6 @@ "remove": "Remove", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Warning", - "description": "This quote pack requests to external servers that may track you!" } }, "offline": { diff --git a/src/translations/en_US.json b/src/translations/en_US.json index d633c9cd..45334a26 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -498,10 +498,6 @@ "remove": "Remove", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Warning", - "description": "This quote pack requests to external servers that may track you!" } }, "offline": { diff --git a/src/translations/es.json b/src/translations/es.json index 71f2057c..f5d6c78e 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -498,10 +498,6 @@ "remove": "Desinstalar", "update_addon": "Actualizar complemento", "back": "Back" - }, - "quote_warning": { - "title": "Advertencia", - "description": "¡Este paquete de citas solicita a servidores externos que pueden rastrearte!" } }, "offline": { diff --git a/src/translations/fr.json b/src/translations/fr.json index cca68885..10ff75d3 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -498,10 +498,6 @@ "remove": "Enlever", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Warning", - "description": "This quote pack requests to external servers that may track you!" } }, "offline": { diff --git a/src/translations/id_ID.json b/src/translations/id_ID.json index 017d2451..6e2d4c78 100644 --- a/src/translations/id_ID.json +++ b/src/translations/id_ID.json @@ -498,10 +498,6 @@ "remove": "Hapus", "update_addon": "Perbarui Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Peringatan", - "description": "Quote pack ini membutuhkan peladen eksternal yang mungkin melacak Anda!" } }, "offline": { diff --git a/src/translations/nl.json b/src/translations/nl.json index 593ab8f0..510cf4d0 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -498,10 +498,6 @@ "remove": "Verwijderen", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Waarschuwing", - "description": "Deze citaatverzameling maakt verbinding met externe servers die kunnen worden gebruikt om je te internetverkeer te tracken!" } }, "offline": { diff --git a/src/translations/no.json b/src/translations/no.json index 6e94db06..a9d164bd 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -498,10 +498,6 @@ "remove": "Fjern", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Warning", - "description": "This quote pack requests to external servers that may track you!" } }, "offline": { diff --git a/src/translations/ru.json b/src/translations/ru.json index 711629c8..ecf62dcf 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -498,10 +498,6 @@ "remove": "Удалить", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "Предупреждение", - "description": "Этот пакет цитат обращается к внешнему серверу и может отслеживать вас!" } }, "offline": { diff --git a/src/translations/tr_TR.json b/src/translations/tr_TR.json index 551d88b1..7f0b0bcc 100644 --- a/src/translations/tr_TR.json +++ b/src/translations/tr_TR.json @@ -498,10 +498,6 @@ "remove": "Kaldır", "update_addon": "Eklentiyi Güncelle", "back": "Geri" - }, - "quote_warning": { - "title": "Uyarı", - "description": "Bu teklif paketi, sizi izleyebilecek harici sunuculara istekte bulunur!" } }, "offline": { diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index 5a5d4c08..3fb568df 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -498,10 +498,6 @@ "remove": "卸载", "update_addon": "Update Add-on", "back": "Back" - }, - "quote_warning": { - "title": "注意", - "description": "本名言包会连接到可能会跟踪您的外部服务器！" } }, "offline": {