diff --git a/changelog.d/server-mute-render-modify.fix b/changelog.d/server-mute-render-modify.fix
deleted file mode 100644
index cb94bb826..000000000
--- a/changelog.d/server-mute-render-modify.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed server-side domain mutes rendering/api calls
diff --git a/changelog.d/theme2-font-cache.fix b/changelog.d/theme2-font-cache.fix
deleted file mode 100644
index d8782b467..000000000
--- a/changelog.d/theme2-font-cache.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Theme 2 fonts falling back to serif after upgrade
diff --git a/changelog.d/timeline_rendering_status_index_approx.fix b/changelog.d/timeline_rendering_status_index_approx.fix
deleted file mode 100644
index 717464c58..000000000
--- a/changelog.d/timeline_rendering_status_index_approx.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed status index approxmiation in timeline rendering for dynamically changing viewport geometries
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index a5395ae36..f89253133 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -153,6 +153,7 @@
+ {{ item }}
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index c3f4d381d..17065a9ef 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -263,10 +263,7 @@ const Timeline = {
// Start from approximating the index of some visible status by using the
// the center of the screen on the timeline.
- let approxIndex = Math.min(
- Math.floor(statuses.length * (centerOfScreen / height)),
- statuses.length - 1,
- )
+ let approxIndex = Math.floor(statuses.length * (centerOfScreen / height))
let err = statuses[approxIndex].getBoundingClientRect().y
// if we have a previous scroll index that can be used, test if it's
diff --git a/src/modules/users.js b/src/modules/users.js
index bfa4f0f41..9e24c1bdd 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -37,10 +37,8 @@ import {
import {
blockUser as apiBlockUser,
editUserNote as apiEditUserNote,
- muteDomain as apiMuteDomain,
muteUser as apiMuteUser,
unblockUser as apiUnblockUser,
- unmuteDomain as apiUnmuteDomain,
unmuteUser as apiUnmuteUser,
fetchBlocks,
fetchDomainMutes,
@@ -172,14 +170,14 @@ const showReblogs = (store, userId) => {
}
const muteDomain = (store, domain) => {
- return apiMuteDomain({
+ return muteDomain({
domain,
credentials: useOAuthStore().token,
}).then(() => store.commit('addDomainMute', domain))
}
const unmuteDomain = (store, domain) => {
- return apiUnmuteDomain({
+ return unmuteDomain({
domain,
credentials: useOAuthStore().token,
}).then(() => store.commit('removeDomainMute', domain))
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index d42c5793f..318978264 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -92,11 +92,6 @@ export const adoptStyleSheets = throttle(() => {
const EAGER_STYLE_ID = 'pleroma-eager-styles'
const LAZY_STYLE_ID = 'pleroma-lazy-styles'
-export const hasInvalidCachedThemeRules = (data) =>
- data
- .flat()
- .some((rule) => /--(?:mono)?font:\s*\[object Object\](?:;|$)/i.test(rule))
-
const generateTheme = (inputRuleset, callbacks, debug) => {
const {
onNewRule = () => {
@@ -156,8 +151,7 @@ export const tryLoadCache = async () => {
if (
cache.engineChecksum === getEngineChecksum() &&
cache.checksum !== undefined &&
- cache.checksum === useMergedConfigStore().mergedConfig.themeChecksum &&
- !hasInvalidCachedThemeRules(cache.data)
+ cache.checksum === useMergedConfigStore().mergedConfig.themeChecksum
) {
const eagerStyles = createStyleSheet(EAGER_STYLE_ID, 10)
const lazyStyles = createStyleSheet(LAZY_STYLE_ID, 20)
diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js
index 48afe4ad9..8c3ac6ad2 100644
--- a/src/services/theme_data/theme2_to_theme3.js
+++ b/src/services/theme_data/theme2_to_theme3.js
@@ -266,7 +266,7 @@ export const convertTheme2To3 = (data) => {
Object.keys(data.fonts || {}).forEach((key) => {
if (!fontsKeys.has(key)) return
if (!data.fonts[key]) return
- const originalFont = data.fonts[key].family
+ const originalFont = data.fonts[key]
const rule = { source: '2to3' }
switch (key) {
diff --git a/test/unit/specs/services/style_setter/style_setter.spec.js b/test/unit/specs/services/style_setter/style_setter.spec.js
deleted file mode 100644
index c1bacdfa1..000000000
--- a/test/unit/specs/services/style_setter/style_setter.spec.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { hasInvalidCachedThemeRules } from 'src/services/style_setter/style_setter.js'
-
-describe('style setter cache', () => {
- it('rejects cached rules containing serialized objects', () => {
- expect(
- hasInvalidCachedThemeRules([
- ['html { --font: [object Object]; }'],
- ['.post { --font: sans-serif; }'],
- ]),
- ).to.equal(true)
- })
-
- it('accepts cached rules containing valid font families', () => {
- expect(
- hasInvalidCachedThemeRules([
- ['html { --font: sans-serif; }'],
- [
- '.post { --font: "Atkinson Hyperlegible"; }',
- '.post::after { content: "[object Object]"; }',
- ],
- ]),
- ).to.equal(false)
- })
-})
diff --git a/test/unit/specs/services/theme_data/theme2_to_theme3.spec.js b/test/unit/specs/services/theme_data/theme2_to_theme3.spec.js
deleted file mode 100644
index 7165d88db..000000000
--- a/test/unit/specs/services/theme_data/theme2_to_theme3.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
- basePaletteKeys,
- convertTheme2To3,
-} from 'src/services/theme_data/theme2_to_theme3.js'
-
-describe('Theme 2 to Theme 3 conversion', () => {
- it('converts font descriptors to CSS font families', () => {
- const colors = Object.fromEntries(
- [...basePaletteKeys].map((key) => [key, '#000000']),
- )
- const rules = convertTheme2To3({
- colors,
- fonts: {
- interface: { family: 'sans-serif' },
- input: { family: 'Open Sans' },
- post: { family: 'Atkinson Hyperlegible' },
- postCode: { family: 'monospace' },
- },
- })
-
- expect(rules).to.deep.include({
- source: '2to3',
- component: 'Root',
- directives: { '--font': 'generic | sans-serif' },
- })
- expect(rules).to.deep.include({
- source: '2to3',
- component: 'Root',
- directives: { '--monoFont': 'generic | monospace' },
- })
- expect(rules).to.deep.include({
- source: '2to3',
- component: 'Input',
- directives: { '--font': 'generic | Open Sans' },
- })
- expect(rules).to.deep.include({
- source: '2to3',
- component: 'RichContent',
- directives: { '--font': 'generic | Atkinson Hyperlegible' },
- })
- })
-})