fix: addons not being uninstalled correctly

This commit is contained in:
Isaac
2022-08-24 21:41:22 +01:00
parent 484d16122c
commit b93302153e
2 changed files with 27 additions and 21 deletions

View File

@@ -244,7 +244,13 @@ export default class Background extends PureComponent {
return setFavourited(photofavourited);
}
const photoPack = JSON.parse(localStorage.getItem('photo_packs'));
const photoPack = [];
const installed = JSON.parse(localStorage.getItem('installed'));
installed.forEach(item => {
if (item.type === 'photos') {
photoPack.push(...item.photos)
}
});
if (photoPack) {
const randomPhoto = photoPack[Math.floor(Math.random() * photoPack.length)];
return this.setState({

View File

@@ -236,29 +236,29 @@ export default class Quote extends PureComponent {
return this.doOffline();
}
}
const quotePack = [];
const installed = JSON.parse(localStorage.getItem('installed'));
installed.forEach(item => {
if (item.type === 'quotes') {
quotePack.push(...item.quotes)
}
});
let quotePack = localStorage.getItem('quote_packs');
if (quotePack) {
const data = quotePack[Math.floor(Math.random() * quotePack.length)];
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');
if (quotePack !== null) {
quotePack = JSON.parse(quotePack);
if (quotePack) {
const data = quotePack[Math.floor(Math.random() * quotePack.length)];
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.quote + '"',
author: data.author,
authorlink: this.getAuthorLink(data.author),
authorimg: info.icon_url,
});
} else {
return this.doOffline();
}
return this.setState({
quote: '"' + data.quote + '"',
author: data.author,
authorlink: this.getAuthorLink(data.author),
authorimg: info.icon_url,
});
} else {
return this.doOffline();
}
break;
case 'api':
if (offline) {
return this.doOffline();