From 0c9b1014791f73fdd6c7425c12f3f90f8d92d2c9 Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 1 Jun 2023 07:24:49 +0900 Subject: [PATCH 01/66] switch position of social and recommended --- packages/client/src/pages/timeline.vue | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index a44f36c55..1947caaef 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -109,12 +109,12 @@ let timelines = ["home"]; if (isLocalTimelineAvailable) { timelines.push("local"); } -if (isRecommendedTimelineAvailable) { - timelines.push("recommended"); -} if (isLocalTimelineAvailable) { timelines.push("social"); } +if (isRecommendedTimelineAvailable) { + timelines.push("recommended"); +} if (isGlobalTimelineAvailable) { timelines.push("global"); } @@ -255,16 +255,6 @@ const headerTabs = $computed(() => [ }, ] : []), - ...(isRecommendedTimelineAvailable - ? [ - { - key: "recommended", - title: i18n.ts._timelines.recommended, - icon: "ph-thumbs-up ph-bold ph-lg", - iconOnly: true, - }, - ] - : []), ...(isLocalTimelineAvailable ? [ { @@ -275,6 +265,16 @@ const headerTabs = $computed(() => [ }, ] : []), + ...(isRecommendedTimelineAvailable + ? [ + { + key: "recommended", + title: i18n.ts._timelines.recommended, + icon: "ph-thumbs-up ph-bold ph-lg", + iconOnly: true, + }, + ] + : []), ...(isGlobalTimelineAvailable ? [ { From 6e09a56c2dc9a080fbfb44cc96e778870c8da028 Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 1 Jun 2023 07:29:54 +0900 Subject: [PATCH 02/66] no change, but more comfortable --- packages/client/src/pages/timeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 1947caaef..5d96d6dfd 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -195,7 +195,7 @@ async function chooseAntenna(ev: MouseEvent): Promise { } function saveSrc( - newSrc: "home" | "local" | "recommended" | "social" | "global" + newSrc: "home" | "local" | "social" | "recommended" | "global" ): void { defaultStore.set("tl", { ...defaultStore.state.tl, From d94c276a8c88857c6c37aa44c29867b8f6636fd6 Mon Sep 17 00:00:00 2001 From: mappi Date: Fri, 2 Jun 2023 16:31:25 +0900 Subject: [PATCH 03/66] fix: vue-plyr audio tag Co-authored-by: mappi --- packages/client/src/components/MkNote.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 7eca22a73..1325809f3 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -381,6 +381,8 @@ const currentClipPage = inject | null>( function onContextmenu(ev: MouseEvent): void { const isLink = (el: HTMLElement) => { if (el.tagName === "A") return true; + // The Audio element's context menu is the browser default, such as for selecting playback speed. + if (el.tagName === 'AUDIO') return true; if (el.parentElement) { return isLink(el.parentElement); } From 5c305a85e6eb7509439edf70db9d1c0802ae53ba Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 2 Jun 2023 20:06:04 -0700 Subject: [PATCH 04/66] chore: formatting --- packages/client/src/components/MkCheatSheetDialog.vue | 3 +-- packages/client/src/components/MkNote.vue | 2 +- packages/client/src/pages/mfm-cheat-sheet.vue | 2 +- packages/client/src/pages/user/home.vue | 6 +++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/client/src/components/MkCheatSheetDialog.vue b/packages/client/src/components/MkCheatSheetDialog.vue index 519955d48..3b723cde5 100644 --- a/packages/client/src/components/MkCheatSheetDialog.vue +++ b/packages/client/src/components/MkCheatSheetDialog.vue @@ -6,7 +6,7 @@ @closed="$emit('closed')" > - + @@ -36,5 +36,4 @@ function close(res) { .fade-leave-to { opacity: 0; } - diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 1325809f3..ddf805fb3 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -382,7 +382,7 @@ function onContextmenu(ev: MouseEvent): void { const isLink = (el: HTMLElement) => { if (el.tagName === "A") return true; // The Audio element's context menu is the browser default, such as for selecting playback speed. - if (el.tagName === 'AUDIO') return true; + if (el.tagName === "AUDIO") return true; if (el.parentElement) { return isLink(el.parentElement); } diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue index 1bbe36915..6c284bee0 100644 --- a/packages/client/src/pages/mfm-cheat-sheet.vue +++ b/packages/client/src/pages/mfm-cheat-sheet.vue @@ -450,7 +450,7 @@ import { i18n } from "@/i18n"; import { instance } from "@/instance"; defineProps<{ - popup?: boolean + popup?: boolean; }>(); let preview_mention = $ref("@example"); diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 2ea4bc971..1926fee88 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -134,7 +134,11 @@