diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2024-03-21 18:46:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 18:46:42 +0900 |
| commit | 831c74a25b2db0ba3f6d43a9a1a9072d342b2822 (patch) | |
| tree | 5ad9371369ef6a346e0ca27bc6dea1682044df52 /packages/frontend/src/components/MkNote.vue | |
| parent | enhance(antenna): Botの投稿を除外できるように (#13603) (diff) | |
| download | misskey-831c74a25b2db0ba3f6d43a9a1a9072d342b2822.tar.gz misskey-831c74a25b2db0ba3f6d43a9a1a9072d342b2822.tar.bz2 misskey-831c74a25b2db0ba3f6d43a9a1a9072d342b2822.zip | |
fix: URLプレビューの動作改善＋動作設定を可能にする (#13579)
* wip
* support new version
* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする
* fix lint
* fix lint
* tweak preview request error handles
* fix: CHANGELOG.md
* fix
* fix
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/frontend/src/components/MkNote.vue')
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 5ca0eae012..50741f2cb7 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -82,7 +82,9 @@ SPDX-License-Identifier: AGPL-3.0-only <MkMediaList :mediaList="appearNote.files"/> </div> <MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/> - <MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/> + <div v-if="isEnabledUrlPreview"> + <MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/> + </div> <div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div> <button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click="collapsed = false"> <span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span> @@ -194,6 +196,7 @@ import { MenuItem } from '@/types/menu.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; import { shouldCollapsed } from '@/scripts/collapsed.js'; +import { isEnabledUrlPreview } from '@/instance.js'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; @@ -268,7 +271,7 @@ const renoteCollapsed = ref( defaultStore.state.collapseRenotes && isRenote && ( ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131 (appearNote.value.myReaction != null) - ) + ), ); /* Overload FunctionにLintが対応していないのでコメントアウト |