From 91190244fb851a230e8d7d972ab4ff8db09beee7 Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 8 Jun 2023 19:02:50 +0900 Subject: [PATCH 1/6] change note menu order --- packages/client/src/scripts/get-note-menu.ts | 78 ++++++++++---------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index aaec3099d2..7b98799e5f 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -262,13 +262,6 @@ export function getNoteMenu(props: { null, ] : []), - instance.features.postEditing && isAppearAuthor - ? { - icon: "ph-pencil-line ph-bold ph-lg", - text: i18n.ts.edit, - action: edit, - } - : undefined, { icon: "ph-clipboard-text ph-bold ph-lg", text: i18n.ts.copyContent, @@ -372,33 +365,44 @@ export function getNoteMenu(props: { }] : [] ),*/ - ...(!isAppearAuthor - ? [ - null, - { - icon: "ph-warning-circle ph-bold ph-lg", - text: i18n.ts.reportAbuse, - action: () => { - const u = - appearNote.url || - appearNote.uri || - `${url}/notes/${appearNote.id}`; - os.popup( - defineAsyncComponent( - () => import("@/components/MkAbuseReportWindow.vue"), - ), - { - user: appearNote.user, - initialComment: `Note: ${u}\n-----\n`, - }, - {}, - "closed", - ); - }, + null, + !isAppearAuthor + ? { + icon: "ph-warning-circle ph-bold ph-lg", + text: i18n.ts.reportAbuse, + action: () => { + const u = + appearNote.url || + appearNote.uri || + `${url}/notes/${appearNote.id}`; + os.popup( + defineAsyncComponent( + () => import("@/components/MkAbuseReportWindow.vue"), + ), + { + user: appearNote.user, + initialComment: `Note: ${u}\n-----\n`, + }, + {}, + "closed", + ); }, - ] - : []), - + } + : undefined, + instance.features.postEditing && isAppearAuthor + ? { + icon: "ph-pencil-line ph-bold ph-lg", + text: i18n.ts.edit, + action: edit, + } + : undefined, + isAppearAuthor + ? { + icon: "ph-eraser ph-bold ph-lg", + text: i18n.ts.deleteAndEdit, + action: delEdit, + } + : undefined, isAppearAuthor || isModerator ? { icon: "ph-trash ph-bold ph-lg", @@ -407,14 +411,6 @@ export function getNoteMenu(props: { action: del, } : undefined, - - isAppearAuthor - ? { - icon: "ph-eraser ph-bold ph-lg", - text: i18n.ts.deleteAndEdit, - action: delEdit, - } - : undefined, ].filter((x) => x !== undefined); } else { menu = [ From db37f2f8e07b63f8cc0b564f49006a34b645ffee Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 8 Jun 2023 17:47:21 +0000 Subject: [PATCH 2/6] change style --- packages/client/src/components/MkMenu.vue | 22 +++++++++++++++++++- packages/client/src/scripts/get-note-menu.ts | 1 + packages/client/src/types/menu.ts | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue index 4555527747..978db091a0 100644 --- a/packages/client/src/components/MkMenu.vue +++ b/packages/client/src/components/MkMenu.vue @@ -128,7 +128,7 @@
Date: Thu, 8 Jun 2023 11:03:39 -0700 Subject: [PATCH 4/6] Close #10280 --- issue_template/bug.yaml | 2 +- issue_template/feature.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/issue_template/bug.yaml b/issue_template/bug.yaml index b7f0c70986..c7e2f6b788 100644 --- a/issue_template/bug.yaml +++ b/issue_template/bug.yaml @@ -68,5 +68,5 @@ body: options: - label: I agree to follow this project's Contribution Guidelines required: true - - label: I have searched the issue tracker for similar issues, and this is not a duplicate. + - label: I have searched the issue tracker for similar issues, and this is not a duplicate. required: true diff --git a/issue_template/feature.yaml b/issue_template/feature.yaml index 75da17133d..7ebed1b06f 100644 --- a/issue_template/feature.yaml +++ b/issue_template/feature.yaml @@ -68,5 +68,5 @@ body: options: - label: I agree to follow this project's Contribution Guidelines required: true - - label: I have searched the issue tracker for similar requests, and this is not a duplicate. + - label: I have searched the issue tracker for similar requests, and this is not a duplicate. required: true From 9f931e6e8be23b03a0c452780fc95cdcc02fbcec Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 8 Jun 2023 11:13:45 -0700 Subject: [PATCH 5/6] fix: unread message bgcolor --- packages/client/src/components/MkChatPreview.vue | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue index 4d694f2dc6..135db0b262 100644 --- a/packages/client/src/components/MkChatPreview.vue +++ b/packages/client/src/components/MkChatPreview.vue @@ -102,7 +102,7 @@ function isMe(message): boolean { opacity: 0.8; } - &:not(.isMe):not(.isRead) { + &:not(.isRead) { background-color: var(--accentedBg); } @@ -175,13 +175,6 @@ function isMe(message): boolean { &.max-width_400px { > .message { - &:not(.isMe):not(.isRead) { - > div { - background-image: none; - border-left: solid 4px #3aa2dc; - } - } - > div { padding: 16px; font-size: 0.9em; From 73ff326ca9266a23ba3d9929fd3e4af68f848e93 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 8 Jun 2023 11:14:01 -0700 Subject: [PATCH 6/6] dev46 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a03c5dff1b..d577699108 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "14.0.0-dev44", + "version": "14.0.0-dev46", "codename": "aqua", "repository": { "type": "git",