summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorfutchitwo <74236683+futchitwo@users.noreply.github.com>2023-04-26 14:10:04 +0900
committerGitHub <noreply@github.com>2023-04-26 14:10:04 +0900
commit52a1d962189489316667949f15bf6346fad8714e (patch)
tree2d92e02d7f86262c015e27e16129b22bdb69e32c /packages/frontend/src
parent[fix] .wav .flac ファイルを再生可能にする (#10686) (diff)
downloadmisskey-52a1d962189489316667949f15bf6346fad8714e.tar.gz
misskey-52a1d962189489316667949f15bf6346fad8714e.tar.bz2
misskey-52a1d962189489316667949f15bf6346fad8714e.zip
fix(play preset): Set failback for notes without text or user.name in Timeline preset (#10718)
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/pages/flash/flash-edit.vue9
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 35edcc7cda..639e351cac 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -305,6 +305,11 @@ const PRESET_TIMELINE = `/// @ 0.13.1
// それぞれのノートごとにUI要素作成
let noteEls = []
each (let note, notes) {
+ // 表示名を設定していないアカウントはidを表示
+ let userName = if Core:type(note.user.name) == "str" note.user.name else note.user.username
+ // リノートもしくはメディア・投票のみで本文が無いノートに代替表示文を設定
+ let noteText = if Core:type(note.text) == "str" note.text else "(リノートもしくはメディア・投票のみのノート)"
+
let el = Ui:C:container({
bgColor: "#444"
fgColor: "#fff"
@@ -312,11 +317,11 @@ const PRESET_TIMELINE = `/// @ 0.13.1
rounded: true
children: [
Ui:C:mfm({
- text: note.user.name
+ text: userName
bold: true
})
Ui:C:mfm({
- text: note.text
+ text: noteText
})
]
})