summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-14 20:33:27 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-14 20:33:27 +0900
commitf670345d450d2ac13448c56bc0aeb8dd5c3d84ef (patch)
treef6c4455e54ae3c71ecc426c503d01182e617acb5 /src
parent常にメディアを閲覧注意として投稿するオプションを実装 (diff)
downloadsharkey-f670345d450d2ac13448c56bc0aeb8dd5c3d84ef.tar.gz
sharkey-f670345d450d2ac13448c56bc0aeb8dd5c3d84ef.tar.bz2
sharkey-f670345d450d2ac13448c56bc0aeb8dd5c3d84ef.zip
ユーザー名のホストを省略しないオプションを実装
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/acct.vue2
-rw-r--r--src/client/app/desktop/views/components/settings.vue6
-rw-r--r--src/client/app/mobile/views/pages/settings.vue6
-rw-r--r--src/client/app/store.ts1
4 files changed, 14 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/acct.vue b/src/client/app/common/views/components/acct.vue
index bd7833f1a9..542fbb4296 100644
--- a/src/client/app/common/views/components/acct.vue
+++ b/src/client/app/common/views/components/acct.vue
@@ -1,7 +1,7 @@
<template>
<span class="mk-acct">
<span class="name">@{{ user.username }}</span>
- <span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="user.host || detail">@{{ user.host || host }}</span>
+ <span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="user.host || detail || $store.state.settings.showFullAcct">@{{ user.host || host }}</span>
</span>
</template>
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 8e2905e73b..1973acc839 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -61,6 +61,7 @@
<mk-switch v-model="darkmode" text="%i18n:@dark-mode%"/>
<mk-switch v-model="circleIcons" text="%i18n:@circle-icons%"/>
<mk-switch v-model="contrastedAcct" text="%i18n:@contrasted-acct%"/>
+ <mk-switch v-model="showFullAcct" text="%i18n:common.show-full-acct%"/>
<mk-switch v-model="gradientWindowHeader" text="%i18n:@gradient-window-header%"/>
<mk-switch v-model="iLikeSushi" text="%i18n:common.i-like-sushi%"/>
</div>
@@ -366,6 +367,11 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'contrastedAcct', value }); }
},
+ showFullAcct: {
+ get() { return this.$store.state.settings.showFullAcct; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'showFullAcct', value }); }
+ },
+
iLikeSushi: {
get() { return this.$store.state.settings.iLikeSushi; },
set(value) { this.$store.dispatch('settings/set', { key: 'iLikeSushi', value }); }
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index c93b3a50f1..9b0e521a4f 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -14,6 +14,7 @@
<ui-switch v-model="darkmode">%i18n:@dark-mode%</ui-switch>
<ui-switch v-model="circleIcons">%i18n:@circle-icons%</ui-switch>
<ui-switch v-model="contrastedAcct">%i18n:@contrasted-acct%</ui-switch>
+ <ui-switch v-model="showFullAcct">%i18n:common.show-full-acct%</ui-switch>
<ui-switch v-model="iLikeSushi">%i18n:common.i-like-sushi%</ui-switch>
<ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
<ui-switch v-model="alwaysShowNsfw">%i18n:common.always-show-nsfw% (%i18n:common.this-setting-is-this-device-only%)</ui-switch>
@@ -232,6 +233,11 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'contrastedAcct', value }); }
},
+ showFullAcct: {
+ get() { return this.$store.state.settings.showFullAcct; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'showFullAcct', value }); }
+ },
+
iLikeSushi: {
get() { return this.$store.state.settings.iLikeSushi; },
set(value) { this.$store.dispatch('settings/set', { key: 'iLikeSushi', value }); }
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 7a5b3e986b..997bddc5cc 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -17,6 +17,7 @@ const defaultSettings = {
showClockOnHeader: true,
circleIcons: true,
contrastedAcct: true,
+ showFullAcct: false,
gradientWindowHeader: false,
showReplyTarget: true,
showMyRenotes: true,