diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2023-04-15 15:29:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 15:29:57 +0900 |
| commit | bcbf06ac8cdff0b81f4da5a780a8d3c1bbc838e8 (patch) | |
| tree | 56d3185d96e043d151451575f2b445654a4529c6 /packages/frontend/src/components/MkMediaVideo.vue | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | misskey-bcbf06ac8cdff0b81f4da5a780a8d3c1bbc838e8.tar.gz misskey-bcbf06ac8cdff0b81f4da5a780a8d3c1bbc838e8.tar.bz2 misskey-bcbf06ac8cdff0b81f4da5a780a8d3c1bbc838e8.zip | |
feat(client): データセーバーモードの追加 (#10478)
* change nsfw settings
* Update CHANGELOG.md
* (fix) eliminate warning message when manually hide
* Apply suggestions from code review
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* (change) translation key
* revert nsfw settings (partial)
* (add) data saver setting
* Integrate MkMediaBlurhash and MkImgWithBlurhash
* Update CHANGELOG.md
* :art:
* リモートのファイルでsizeが0の場合は表示しない, refを作らない
* fix
* かっこ
---------
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Diffstat (limited to 'packages/frontend/src/components/MkMediaVideo.vue')
| -rw-r--r-- | packages/frontend/src/components/MkMediaVideo.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue index e02a7af09e..a4b76300e6 100644 --- a/packages/frontend/src/components/MkMediaVideo.vue +++ b/packages/frontend/src/components/MkMediaVideo.vue @@ -1,7 +1,9 @@ <template> <div v-if="hide" class="icozogqfvdetwohsdglrbswgrejoxbdj" @click="hide = false"> + <!-- 【注意】dataSaverMode が有効になっている際には、hide が false になるまでサムネイルや動画を読み込まないようにすること --> <div> - <b><i class="ti ti-alert-triangle"></i> {{ i18n.ts.sensitive }}</b> + <b v-if="video.isSensitive"><i class="ti ti-alert-triangle"></i> {{ i18n.ts.sensitive }}{{ defaultStore.state.enableDataSaverMode ? ` (${i18n.ts.video}${video.size ? ' ' + bytes(video.size) : ''})` : '' }}</b> + <b v-else><i class="ti ti-movie"></i> {{ defaultStore.state.enableDataSaverMode && video.size ? bytes(video.size) : i18n.ts.video }}</b> <span>{{ i18n.ts.clickToShow }}</span> </div> </div> @@ -25,6 +27,7 @@ <script lang="ts" setup> import { ref } from 'vue'; import * as misskey from 'misskey-js'; +import bytes from '@/filters/bytes'; import VuePlyr from 'vue-plyr'; import { defaultStore } from '@/store'; import 'vue-plyr/dist/vue-plyr.css'; @@ -34,7 +37,7 @@ const props = defineProps<{ video: misskey.entities.DriveFile; }>(); -const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSensitive && (defaultStore.state.nsfw !== 'ignore')); +const hide = ref((defaultStore.state.nsfw === 'force' || defaultStore.state.enableDataSaverMode) ? true : (props.video.isSensitive && defaultStore.state.nsfw !== 'ignore')); </script> <style lang="scss" scoped> |