diff --git a/src/api/admin.js b/src/api/admin.js index c33f863a7..d4a9e8ff9 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -39,7 +39,7 @@ const USERS_URL_LIST = ({ isAdmin && 'is_admin', isModerator && 'is_moderator', ] - .filter((x) => x) + .filter(Boolean) .join(',') return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}` } @@ -236,7 +236,7 @@ export const changeStatusScope = ({ opts: { id, sensitive, visibility }, credentials, }) => { - var payload = {} + const payload = {} if (typeof sensitive !== 'undefined') { payload['sensitive'] = sensitive } diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx index 432250548..55f8179ff 100644 --- a/src/components/rich_content/rich_content.jsx +++ b/src/components/rich_content/rich_content.jsx @@ -335,7 +335,7 @@ export default { this.pauseMfm ? '-pause' : '', this.scaleMfm ? '-scale' : '', ] - .filter((x) => x) + .filter(Boolean) .join(' ') newAttrs['data-mfm-operator'] = mfmOperator switch (mfmOperator) { diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js index c11579e53..0fe9bc022 100644 --- a/src/components/settings_modal/tabs/appearance_tab.js +++ b/src/components/settings_modal/tabs/appearance_tab.js @@ -401,7 +401,7 @@ const AppearanceTab = { } theme3 = init({ - inputRuleset: [...input, paletteRule].filter((x) => x), + inputRuleset: [...input, paletteRule].filter(Boolean), ultimateBackgroundColor: '#000000', liteMode: true, onlyNormalState: true, diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js index 4d3ed1695..a023b4415 100644 --- a/src/components/settings_modal/tabs/style_tab/style_tab.js +++ b/src/components/settings_modal/tabs/style_tab/style_tab.js @@ -602,7 +602,7 @@ export default { .map((x) => Object.entries(x.directives)) .flat() }) - .filter((x) => x) + .filter(Boolean) .flat() .map(([name, value]) => { const [valType, valVal] = value.split('|') diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 974d75ec0..83dc6ce2c 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -126,7 +126,7 @@ const generateTheme = (inputRuleset, callbacks, debug) => { const chunk = chunks[counter] Promise.all(chunk.map((x) => x())).then((result) => { getCssRules( - result.filter((x) => x), + result.filter(Boolean), debug, ).forEach((rule) => { onNewRule(rule, true) diff --git a/src/services/theme_data/css_utils.js b/src/services/theme_data/css_utils.js index 2e3758ad5..990db652c 100644 --- a/src/services/theme_data/css_utils.js +++ b/src/services/theme_data/css_utils.js @@ -104,7 +104,7 @@ export const getCssRules = (rules, debug) => : '', ' --background: ' + v, ] - .filter((x) => x) + .filter(Boolean) .join(';\n') } const color = getCssColorString( @@ -115,7 +115,7 @@ export const getCssRules = (rules, debug) => if (rule.directives.backgroundNoCssColor !== 'yes') { cssDirectives.push('background-color: ' + color) } - return cssDirectives.filter((x) => x).join(';\n') + return cssDirectives.filter(Boolean).join(';\n') } case 'blur': { const cssDirectives = [] @@ -157,7 +157,7 @@ export const getCssRules = (rules, debug) => return null } }) - .filter((x) => x) + .filter(Boolean) .map((x) => ' ' + x + ';') .join('\n') @@ -172,10 +172,10 @@ export const getCssRules = (rules, debug) => virtualDirectives, footer, ] - .filter((x) => x) + .filter(Boolean) .join('\n') }) - .filter((x) => x) + .filter(Boolean) export const getScopedVersion = (rules, newScope) => { return rules.map((x) => { diff --git a/src/services/theme_data/iss_serializer.js b/src/services/theme_data/iss_serializer.js index a9c3887dd..5a336f10b 100644 --- a/src/services/theme_data/iss_serializer.js +++ b/src/services/theme_data/iss_serializer.js @@ -62,6 +62,6 @@ export const serialize = (ruleset) => { return `${header} {\n${content.join(';\n')}\n}` }) - .filter((x) => x) + .filter(Boolean) .join('\n\n') } diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js index aa323ac91..5bab4818c 100644 --- a/src/services/theme_data/theme2_to_theme3.js +++ b/src/services/theme_data/theme2_to_theme3.js @@ -558,9 +558,9 @@ export const convertTheme2To3 = (data) => { ) const flatExtRules = extendedRules - .filter((x) => x) + .filter(Boolean) .reduce((acc, x) => [...acc, ...x], []) - .filter((x) => x) + .filter(Boolean) .reduce((acc, x) => [...acc, ...x], []) return [ diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 0c5c82991..626d7daeb 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -338,10 +338,10 @@ export const init = ({ const relevantRules = ruleset.filter((r) => r.component === component.name) const backgrounds = relevantRules .map((r) => r.directives.background) - .filter((x) => x) + .filter(Boolean) const opacities = relevantRules .map((r) => r.directives.opacity) - .filter((x) => x) + .filter(Boolean) if ( backgrounds.some((x) => x.match(/--parent/)) || opacities.some((x) => x != null && x < 1) @@ -596,7 +596,7 @@ export const init = ({ const shadow = value .split(/,/g) .map((s) => s.trim()) - .filter((x) => x) + .filter(Boolean) dynamicVars[k] = shadow if (combination.component === rootComponentName) { staticVars[k.substring(2)] = shadow @@ -752,7 +752,7 @@ export const init = ({ return processCombination(combination) } }) - .filter((x) => x) + .filter(Boolean) const t2 = performance.now() if (debug) { console.debug('Eager processing took ' + (t2 - t1) + ' ms') diff --git a/src/stores/interface.js b/src/stores/interface.js index 48d7cb061..8c101b9f4 100644 --- a/src/stores/interface.js +++ b/src/stores/interface.js @@ -749,7 +749,7 @@ export const useInterfaceStore = defineStore('interface', { this.styleDataUsed, paletteIss, hacks, - ].filter((x) => x) + ].filter(Boolean) return applyTheme( rulesetArray.flat(),