fixed hideISP
This commit is contained in:
parent
8985094644
commit
58f06dea94
6 changed files with 23 additions and 18 deletions
18
src/App.js
18
src/App.js
|
|
@ -150,13 +150,6 @@ export default {
|
||||||
shout() {
|
shout() {
|
||||||
return useShoutStore().joined
|
return useShoutStore().joined
|
||||||
},
|
},
|
||||||
showInstanceSpecificPanel() {
|
|
||||||
return (
|
|
||||||
this.showInstanceSpecificPanel &&
|
|
||||||
!this.$store.getters.mergedConfig.hideISP &&
|
|
||||||
this.instanceSpecificPanelContent
|
|
||||||
)
|
|
||||||
},
|
|
||||||
isChats() {
|
isChats() {
|
||||||
return this.$route.name === 'chat' || this.$route.name === 'chats'
|
return this.$route.name === 'chat' || this.$route.name === 'chats'
|
||||||
},
|
},
|
||||||
|
|
@ -197,6 +190,12 @@ export default {
|
||||||
scrollParent() {
|
scrollParent() {
|
||||||
return window /* this.$refs.appContentRef */
|
return window /* this.$refs.appContentRef */
|
||||||
},
|
},
|
||||||
|
showInstanceSpecificPanel() {
|
||||||
|
return (
|
||||||
|
this.instanceSpecificPanelPresent &&
|
||||||
|
!this.$store.getters.mergedConfig.hideISP
|
||||||
|
)
|
||||||
|
},
|
||||||
...mapGetters(['mergedConfig']),
|
...mapGetters(['mergedConfig']),
|
||||||
...mapState(useInterfaceStore, [
|
...mapState(useInterfaceStore, [
|
||||||
'themeApplied',
|
'themeApplied',
|
||||||
|
|
@ -211,9 +210,8 @@ export default {
|
||||||
...mapState(useInstanceStore, {
|
...mapState(useInstanceStore, {
|
||||||
background: (store) => store.instanceIdentity.background,
|
background: (store) => store.instanceIdentity.background,
|
||||||
showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
|
showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
|
||||||
showInstanceSpecificPanel: (store) =>
|
instanceSpecificPanelPresent: (store) =>
|
||||||
store.instanceIdentity.showInstanceSpecificPanel,
|
store.instanceIdentity.showInstanceSpecificPanel &&
|
||||||
instanceSpecificPanelContent: (store) =>
|
|
||||||
store.instanceIdentity.instanceSpecificPanelContent,
|
store.instanceIdentity.instanceSpecificPanelContent,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import IntegerSetting from '../helpers/integer_setting.vue'
|
||||||
import SharedComputedObject from '../helpers/shared_computed_object.js'
|
import SharedComputedObject from '../helpers/shared_computed_object.js'
|
||||||
import UnitSetting from '../helpers/unit_setting.vue'
|
import UnitSetting from '../helpers/unit_setting.vue'
|
||||||
|
|
||||||
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
||||||
import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
|
import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
|
||||||
|
|
||||||
|
|
@ -26,6 +27,12 @@ const ClutterTab = {
|
||||||
computed: {
|
computed: {
|
||||||
...SharedComputedObject(),
|
...SharedComputedObject(),
|
||||||
...mapState(useInstanceCapabilitiesStore, ['shoutAvailable']),
|
...mapState(useInstanceCapabilitiesStore, ['shoutAvailable']),
|
||||||
|
...mapState(useInstanceStore, {
|
||||||
|
showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
|
||||||
|
instanceSpecificPanelPresent: (store) =>
|
||||||
|
store.instanceIdentity.showInstanceSpecificPanel &&
|
||||||
|
store.instanceIdentity.instanceSpecificPanelContent,
|
||||||
|
}),
|
||||||
...mapState(useServerSideStorageStore, {
|
...mapState(useServerSideStorageStore, {
|
||||||
muteFilters: (store) =>
|
muteFilters: (store) =>
|
||||||
Object.entries(store.prefsStorage.simple.muteFilters),
|
Object.entries(store.prefsStorage.simple.muteFilters),
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,11 @@
|
||||||
{{ $t('settings.hide_scrobbles_after') }}
|
{{ $t('settings.hide_scrobbles_after') }}
|
||||||
</UnitSetting>
|
</UnitSetting>
|
||||||
</li>
|
</li>
|
||||||
|
<li v-if="instanceSpecificPanelPresent">
|
||||||
|
<BooleanSetting path="hideISP">
|
||||||
|
{{ $t('settings.hide_isp') }}
|
||||||
|
</BooleanSetting>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@ const GeneralTab = {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState(useInstanceCapabilitiesStore, [
|
...mapState(useInstanceCapabilitiesStore, [
|
||||||
'instanceSpecificPanelPresent',
|
|
||||||
'postFormats',
|
'postFormats',
|
||||||
'suggestionsEnabled',
|
'suggestionsEnabled',
|
||||||
]),
|
]),
|
||||||
|
|
|
||||||
|
|
@ -69,11 +69,6 @@
|
||||||
{{ $t('settings.show_scrollbars') }}
|
{{ $t('settings.show_scrollbars') }}
|
||||||
</BooleanSetting>
|
</BooleanSetting>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="instanceSpecificPanelPresent">
|
|
||||||
<BooleanSetting path="hideISP">
|
|
||||||
{{ $t('settings.hide_isp') }}
|
|
||||||
</BooleanSetting>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
path="panelHeaderSize"
|
path="panelHeaderSize"
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ import {
|
||||||
|
|
||||||
import apiService from '../services/api/api.service.js'
|
import apiService from '../services/api/api.service.js'
|
||||||
|
|
||||||
import { useInterfaceStore } from 'src/stores/interface.js'
|
|
||||||
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
||||||
|
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||||
|
|
||||||
const emptyTl = (userId = 0) => ({
|
const emptyTl = (userId = 0) => ({
|
||||||
statuses: [],
|
statuses: [],
|
||||||
|
|
@ -115,7 +115,8 @@ const sortTimeline = (timeline) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const getLatestScrobble = (state, user) => {
|
const getLatestScrobble = (state, user) => {
|
||||||
const scrobblesSupport = useInstanceCapabilitiesStore().pleromaScrobblesAvailable
|
const scrobblesSupport =
|
||||||
|
useInstanceCapabilitiesStore().pleromaScrobblesAvailable
|
||||||
|
|
||||||
if (!scrobblesSupport || !user.name || user.id === 'undefined') {
|
if (!scrobblesSupport || !user.name || user.id === 'undefined') {
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue