summaryrefslogtreecommitdiff
path: root/src/client/pages/instance
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-12-19 10:55:52 +0900
committerGitHub <noreply@github.com>2020-12-19 10:55:52 +0900
commit43930e6a84d11fb00b9ae9ac153c2538e179d538 (patch)
treec6f6d98976d9ea5d198d0c1249b7b2a8749353f3 /src/client/pages/instance
parentBump vue-i18n from 9.0.0-beta.7 to 9.0.0-beta.14 (#6993) (diff)
downloadmisskey-43930e6a84d11fb00b9ae9ac153c2538e179d538.tar.gz
misskey-43930e6a84d11fb00b9ae9ac153c2538e179d538.tar.bz2
misskey-43930e6a84d11fb00b9ae9ac153c2538e179d538.zip
Storage improve (#6976)
* wip * wip * wip * wip * wip * Update storage.ts * wip * wip * wip * wip * Update storage.ts * Update storage.ts * wip * wip * wip * wip * wip * wip * wip * Update storage.ts * wip * wip * wip * wip * :pizza: * wip * wip * wip * wip * wip * wip * Update deck-storage.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update store.ts * wip * wip * wip * wip * Update init.ts * wip * wip * Update pizzax.ts * wip * wip * Update timeline.vue * Update init.ts * wip * wip * Update init.ts
Diffstat (limited to 'src/client/pages/instance')
-rw-r--r--src/client/pages/instance/index.metrics.vue2
-rw-r--r--src/client/pages/instance/index.vue2
-rw-r--r--src/client/pages/instance/instance.vue2
-rw-r--r--src/client/pages/instance/queue.chart.vue2
-rw-r--r--src/client/pages/instance/settings.vue3
-rw-r--r--src/client/pages/instance/user-dialog.vue2
6 files changed, 7 insertions, 6 deletions
diff --git a/src/client/pages/instance/index.metrics.vue b/src/client/pages/instance/index.metrics.vue
index f3060b29d5..4fd7e55ab1 100644
--- a/src/client/pages/instance/index.metrics.vue
+++ b/src/client/pages/instance/index.metrics.vue
@@ -160,7 +160,7 @@ export default defineComponent({
computed: {
gridColor() {
// TODO: var(--panel)の色が暗いか明るいかで判定する
- return this.$store.state.device.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+ return this.$store.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
},
},
diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue
index 79fe452589..e9614acf70 100644
--- a/src/client/pages/instance/index.vue
+++ b/src/client/pages/instance/index.vue
@@ -122,7 +122,7 @@ export default defineComponent({
computed: {
meta() {
- return this.$store.state.instance.meta;
+ return this.$instance;
},
},
diff --git a/src/client/pages/instance/instance.vue b/src/client/pages/instance/instance.vue
index 97f85d3b1f..6e626cb178 100644
--- a/src/client/pages/instance/instance.vue
+++ b/src/client/pages/instance/instance.vue
@@ -206,7 +206,7 @@ export default defineComponent({
},
meta() {
- return this.$store.state.instance.meta;
+ return this.$instance;
},
isBlocked() {
diff --git a/src/client/pages/instance/queue.chart.vue b/src/client/pages/instance/queue.chart.vue
index 742c2b7d3c..6a43d14a6b 100644
--- a/src/client/pages/instance/queue.chart.vue
+++ b/src/client/pages/instance/queue.chart.vue
@@ -63,7 +63,7 @@ export default defineComponent({
this.fetchJobs();
// TODO: var(--panel)の色が暗いか明るいかで判定する
- const gridColor = this.$store.state.device.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+ const gridColor = this.$store.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
Chart.defaults.global.defaultFontColor = getComputedStyle(document.documentElement).getPropertyValue('--fg');
diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue
index d9d87ddbe3..62271b3ebe 100644
--- a/src/client/pages/instance/settings.vue
+++ b/src/client/pages/instance/settings.vue
@@ -259,6 +259,7 @@ import MkInfo from '@/components/ui/info.vue';
import { url } from '@/config';
import getAcct from '../../../misc/acct/render';
import * as os from '@/os';
+import { fetchInstance } from '@/instance';
export default defineComponent({
components: {
@@ -565,7 +566,7 @@ export default defineComponent({
summalyProxy: this.summalyProxy,
useStarForReactionFallback: this.useStarForReactionFallback,
}).then(() => {
- this.$store.dispatch('instance/fetch');
+ fetchInstance();
if (withDialog) {
os.success();
}
diff --git a/src/client/pages/instance/user-dialog.vue b/src/client/pages/instance/user-dialog.vue
index 059a5c194c..810db8c508 100644
--- a/src/client/pages/instance/user-dialog.vue
+++ b/src/client/pages/instance/user-dialog.vue
@@ -24,7 +24,7 @@
</div>
<div class="_section">
<div class="_content">
- <MkSwitch v-if="user.host == null && $store.state.i.isAdmin && (moderator || !user.isAdmin)" @update:value="toggleModerator" v-model:value="moderator">{{ $t('moderator') }}</MkSwitch>
+ <MkSwitch v-if="user.host == null && $i.isAdmin && (moderator || !user.isAdmin)" @update:value="toggleModerator" v-model:value="moderator">{{ $t('moderator') }}</MkSwitch>
<MkSwitch @update:value="toggleSilence" v-model:value="silenced">{{ $t('silence') }}</MkSwitch>
<MkSwitch @update:value="toggleSuspend" v-model:value="suspended">{{ $t('suspend') }}</MkSwitch>
</div>