aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/api.js5
-rw-r--r--src/modules/config.js1
-rw-r--r--src/modules/instance.js3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/modules/api.js b/src/modules/api.js
index fee584e8..3dbead5b 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -202,12 +202,13 @@ const api = {
timeline = 'friends',
tag = false,
userId = false,
- listId = false
+ listId = false,
+ statusId = false
}) {
if (store.state.fetchers[timeline]) return
const fetcher = store.state.backendInteractor.startFetchingTimeline({
- timeline, store, userId, listId, tag
+ timeline, store, userId, listId, statusId, tag
})
store.commit('addFetcher', { fetcherName: timeline, fetcher })
},
diff --git a/src/modules/config.js b/src/modules/config.js
index a59a80d8..8001b854 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -28,6 +28,7 @@ export const defaultState = {
theme: undefined,
customTheme: undefined,
customThemeSource: undefined,
+ forceThemeRecompilation: false,
hideISP: false,
hideInstanceWallpaper: false,
hideShoutbox: false,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index f12cc735..0a5c1ae7 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -378,7 +378,8 @@ const instance = {
commit('setInstanceOption', { name: 'themeData', value: themeData })
// No need to apply theme if there's user theme already
const { customTheme } = rootState.config
- if (customTheme) return
+ const { themeApplied } = rootState.interface
+ if (customTheme || themeApplied) return
// New theme presets don't have 'theme' property, they use 'source'
const themeSource = themeData.source