From 8c2ab25e5f2040fcbc81bc2a02a279fed40e1c11 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Fri, 9 May 2025 17:40:08 +0900 Subject: Feat: No websocket mode (#15851) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wip * wip * wip * wip * Update MkTimeline.vue * wip * wip * wip * Update MkTimeline.vue * Update use-pagination.ts * wip * wip * Update MkTimeline.vue * Update MkTimeline.vue * wip * wip * Update MkTimeline.vue * Update MkTimeline.vue * Update MkTimeline.vue * wip * Update use-pagination.ts * wip * Update use-pagination.ts * Update MkNotifications.vue * Update MkNotifications.vue * wip * wip * wip * Update use-note-capture.ts * Update use-note-capture.ts * Update use-note-capture.ts * wip * wip * wip * wip * Update MkNoteDetailed.vue * wip * wip * Update MkTimeline.vue * wip * fix * Update MkTimeline.vue * wip * test * Revert "test" This reverts commit 3375619396c54dcda5e564eb1da444c2391208c9. * Update use-pagination.ts * test * Revert "test" This reverts commit 42c53c830e28485d2fb49061fa7cdeee31bc6a22. * test * Revert "test" This reverts commit c4f8cda4aa1cec9d1eb97557145f3ad3d2d0e469. * Update style.scss * Update MkTimeline.vue * Update MkTimeline.vue * Update MkTimeline.vue * ✌️ * Update MkTimeline.vue * wip * wip * test * Update MkPullToRefresh.vue * Update MkPullToRefresh.vue * Update MkPullToRefresh.vue * Update MkPullToRefresh.vue * Update MkTimeline.vue * wip * tweak navbar * wip * wip * wip * wip * wip * wip * wip * Update home.vue * wip * refactor * wip * wip * Update note.vue * Update navbar.vue * Update MkPullToRefresh.vue * Update MkPullToRefresh.vue * Update MkPullToRefresh.vue * wip * Update MkStreamingNotificationsTimeline.vue * Update use-pagination.ts * wip * improve perf * wip * Update MkNotesTimeline.vue * wip * megre * Update use-pagination.ts * Update use-pagination.ts * Update MkStreamingNotesTimeline.vue * Update use-pagination.ts * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md --- packages/frontend/src/utility/get-note-menu.ts | 18 ++++++++----- .../frontend/src/utility/timeline-date-separate.ts | 31 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) (limited to 'packages/frontend/src/utility') diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts index dd8bdf43d7..dc813cb78e 100644 --- a/packages/frontend/src/utility/get-note-menu.ts +++ b/packages/frontend/src/utility/get-note-menu.ts @@ -25,10 +25,10 @@ import { getAppearNote } from '@/utility/get-appear-note.js'; import { genEmbedCode } from '@/utility/get-embed-code.js'; import { prefer } from '@/preferences.js'; import { getPluginHandlers } from '@/plugin.js'; +import { globalEvents } from '@/events.js'; export async function getNoteClipMenu(props: { note: Misskey.entities.Note; - isDeleted: Ref; currentClip?: Misskey.entities.Clip; }) { function getClipName(clip: Misskey.entities.Clip) { @@ -68,7 +68,6 @@ export async function getNoteClipMenu(props: { } })); }); - if (props.currentClip?.id === clip.id) props.isDeleted.value = true; } } else if (err.id === 'f0dba960-ff73-4615-8df4-d6ac5d9dc118') { os.alert({ @@ -178,7 +177,6 @@ export function getNoteMenu(props: { note: Misskey.entities.Note; translation: Ref; translating: Ref; - isDeleted: Ref; currentClip?: Misskey.entities.Clip; }) { const appearNote = getAppearNote(props.note); @@ -194,6 +192,8 @@ export function getNoteMenu(props: { misskeyApi('notes/delete', { noteId: appearNote.id, + }).then(() => { + globalEvents.emit('noteDeleted', appearNote.id); }); if (Date.now() - new Date(appearNote.createdAt).getTime() < 1000 * 60 && appearNote.userId === $i.id) { @@ -211,6 +211,8 @@ export function getNoteMenu(props: { misskeyApi('notes/delete', { noteId: appearNote.id, + }).then(() => { + globalEvents.emit('noteDeleted', appearNote.id); }); os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel }); @@ -251,7 +253,6 @@ export function getNoteMenu(props: { async function unclip(): Promise { if (!props.currentClip) return; os.apiWithDialog('clips/remove-note', { clipId: props.currentClip.id, noteId: appearNote.id }); - props.isDeleted.value = true; } async function promote(): Promise { @@ -569,8 +570,9 @@ export function getRenoteMenu(props: { misskeyApi('notes/create', { renoteId: appearNote.id, channelId: appearNote.channelId, - }).then(() => { + }).then((res) => { os.toast(i18n.ts.renoted); + globalEvents.emit('notePosted', res.createdNote); }); } }, @@ -617,8 +619,9 @@ export function getRenoteMenu(props: { localOnly, visibility, renoteId: appearNote.id, - }).then(() => { + }).then((res) => { os.toast(i18n.ts.renoted); + globalEvents.emit('notePosted', res.createdNote); }); } }, @@ -658,8 +661,9 @@ export function getRenoteMenu(props: { misskeyApi('notes/create', { renoteId: appearNote.id, channelId: channel.id, - }).then(() => { + }).then((res) => { os.toast(i18n.tsx.renotedToX({ name: channel.name })); + globalEvents.emit('notePosted', res.createdNote); }); } }, diff --git a/packages/frontend/src/utility/timeline-date-separate.ts b/packages/frontend/src/utility/timeline-date-separate.ts index e1bc9790b9..1071a80962 100644 --- a/packages/frontend/src/utility/timeline-date-separate.ts +++ b/packages/frontend/src/utility/timeline-date-separate.ts @@ -25,6 +25,37 @@ export type DateSeparetedTimelineItem = { nextText: string; }; +// TODO: いちいちDateインスタンス作成するのは無駄感あるから文字列のまま解析したい +export function isSeparatorNeeded( + prev: string | null, + next: string | null, +) { + if (prev == null || next == null) return false; + const prevDate = new Date(prev); + const nextDate = new Date(next); + return ( + prevDate.getFullYear() !== nextDate.getFullYear() || + prevDate.getMonth() !== nextDate.getMonth() || + prevDate.getDate() !== nextDate.getDate() + ); +} + +// TODO: いちいちDateインスタンス作成するのは無駄感あるから文字列のまま解析したい +export function getSeparatorInfo( + prev: string | null, + next: string | null, +) { + if (prev == null || next == null) return null; + const prevDate = new Date(prev); + const nextDate = new Date(next); + return { + prevDate, + prevText: getDateText(prevDate), + nextDate, + nextText: getDateText(nextDate), + }; +} + export function makeDateSeparatedTimelineComputedRef(items: Ref) { return computed[]>(() => { const tl: DateSeparetedTimelineItem[] = []; -- cgit v1.2.3-freya