diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 33d7e760a..741a5a619 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -717,6 +717,8 @@ unlikeConfirm: "いいね解除しますか?" fullView: "フルビュー" quitFullView: "フルビュー解除" addDescription: "説明を追加" +userPagePinTip: "個々のノートのメニューから「ピン留め」を選択することで、ここにノートを表示しておくことができます。" +notSpecifiedMentionWarning: "宛先に含まれていないメンションがあります" _email: _follow: diff --git a/package.json b/package.json index e6f3b71b7..825341d04 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.76.0", + "version": "12.76.1", "codename": "indigo", "repository": { "type": "git", @@ -181,7 +181,7 @@ "markdown-it": "12.0.4", "markdown-it-anchor": "7.1.0", "matter-js": "0.16.1", - "mfm-js": "0.14.0", + "mfm-js": "0.15.0", "mocha": "8.3.2", "moji": "0.5.1", "ms": "2.1.3", diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index 433655d6e..833cdfc89 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -24,11 +24,9 @@ export default defineComponent({ methods: { focus() { this.$slots.default[0].elm.focus(); - } - }, + }, - render() { - const getDateText = (time: string) => { + getDateText(time: string) { const date = new Date(time).getDate(); const month = new Date(time).getMonth() + 1; return this.$t('monthAndDay', { @@ -36,9 +34,13 @@ export default defineComponent({ day: date.toString() }); } + }, + render() { const noGap = [...document.querySelectorAll('._noGap_')].some(el => el.contains(this.$parent.$el)); + if (this.items.length === 0) return; + return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? { class: 'sqadhkmv' + (noGap ? ' _block' : ''), name: 'list', @@ -72,10 +74,10 @@ export default defineComponent({ class: 'icon', icon: faAngleUp, }), - getDateText(item.createdAt) + this.getDateText(item.createdAt) ]), h('span', [ - getDateText(this.items[i + 1].createdAt), + this.getDateText(this.items[i + 1].createdAt), h(FontAwesomeIcon, { class: 'icon', icon: faAngleDown, diff --git a/src/client/components/mfm.ts b/src/client/components/mfm.ts index b8e948a18..3b08c83c7 100644 --- a/src/client/components/mfm.ts +++ b/src/client/components/mfm.ts @@ -58,10 +58,13 @@ export default defineComponent({ const text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n'); if (!this.plain) { - const x = text.split('\n') - .map(t => t == '' ? [h('br')] : [t, h('br')]); - x[x.length - 1].pop(); - return x; + const res = []; + for (const t of text.split('\n')) { + res.push(h('br')); + res.push(t); + } + res.shift(); + return res; } else { return [text.replace(/\n/g, ' ')]; } diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index baafa86f4..0891108d8 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -1,7 +1,6 @@