diff --git a/package.json b/package.json index 71efef3670..0a73d633bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "14.0.0-dev19", + "version": "14.0.0-dev22", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts index 6520163550..3be4524933 100644 --- a/packages/backend/src/models/repositories/note.ts +++ b/packages/backend/src/models/repositories/note.ts @@ -240,7 +240,7 @@ export const NoteRepository = db.getRepository(Note).extend({ ...(meId ? { myReaction: populateMyReaction(note, meId, options?._hint_), - } + } : {}), ...(opts.detail diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 99c3fe0183..021086ca98 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -256,7 +256,6 @@ import { useNoteCapture } from "@/scripts/use-note-capture"; import { notePage } from "@/filters/note"; import { deepClone } from "@/scripts/clone"; - const router = useRouter(); const props = defineProps<{ @@ -401,13 +400,15 @@ function onContextmenu(ev: MouseEvent): void { os.pageWindow(notePage(appearNote)); }, }, - notePage(appearNote) != location.pathname ? { - icon: "ph-arrows-out-simple ph-bold ph-lg", - text: i18n.ts.showInPage, - action: () => { - router.push(notePage(appearNote), "forcePage"); - }, - } : undefined, + notePage(appearNote) != location.pathname + ? { + icon: "ph-arrows-out-simple ph-bold ph-lg", + text: i18n.ts.showInPage, + action: () => { + router.push(notePage(appearNote), "forcePage"); + }, + } + : undefined, null, { type: "a", @@ -423,13 +424,15 @@ function onContextmenu(ev: MouseEvent): void { copyToClipboard(`${url}${notePage(appearNote)}`); }, }, - note.user.host != null ? { - type: "a", - icon: "ph-arrow-square-up-right ph-bold ph-lg", - text: i18n.ts.showOnRemote, - href: note.url ?? note.uri ?? "", - target: "_blank", - } : undefined, + note.user.host != null + ? { + type: "a", + icon: "ph-arrow-square-up-right ph-bold ph-lg", + text: i18n.ts.showOnRemote, + href: note.url ?? note.uri ?? "", + target: "_blank", + } + : undefined, ], ev ); diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 76aa5ba46b..b3aee949ee 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -627,7 +627,7 @@ onUnmounted(() => { background: none; } } - + &.max-width_450px { > .reply-to:first-child { padding-top: 14px; diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 72f6473e7e..37e14b3a4d 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -337,7 +337,7 @@ function onContextmenu(ev: MouseEvent): void { } else { os.contextMenu( [ - { + { type: "label", text: notePage(appearNote), }, @@ -348,13 +348,15 @@ function onContextmenu(ev: MouseEvent): void { os.pageWindow(notePage(appearNote)); }, }, - notePage(appearNote) != location.pathname ? { - icon: "ph-arrows-out-simple ph-bold ph-lg", - text: i18n.ts.showInPage, - action: () => { - router.push(notePage(appearNote), "forcePage"); - }, - } : undefined, + notePage(appearNote) != location.pathname + ? { + icon: "ph-arrows-out-simple ph-bold ph-lg", + text: i18n.ts.showInPage, + action: () => { + router.push(notePage(appearNote), "forcePage"); + }, + } + : undefined, null, { type: "a", @@ -370,13 +372,15 @@ function onContextmenu(ev: MouseEvent): void { copyToClipboard(`${url}${notePage(appearNote)}`); }, }, - note.user.host != null ? { - type: "a", - icon: "ph-arrow-square-up-right ph-bold ph-lg", - text: i18n.ts.showOnRemote, - href: note.url ?? note.uri ?? "", - target: "_blank", - } : undefined, + note.user.host != null + ? { + type: "a", + icon: "ph-arrow-square-up-right ph-bold ph-lg", + text: i18n.ts.showOnRemote, + href: note.url ?? note.uri ?? "", + target: "_blank", + } + : undefined, ], ev ); diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue index bb7dc156f3..3cd6646861 100644 --- a/packages/client/src/pages/about.vue +++ b/packages/client/src/pages/about.vue @@ -7,7 +7,10 @@ :tabs="headerTabs" /> - - -
- - -
- note ? { - title: i18n.t("noteOf", { user: note.user.name || note.user.username }), + title: i18n.t("noteOf", { + user: note.user.name || note.user.username, + }), subtitle: new Date(note.createdAt).toLocaleString(), avatar: note.user, path: `/notes/${note.id}`, share: { - title: i18n.t("noteOf", { user: note.user.name || note.user.username }), + title: i18n.t("noteOf", { + user: note.user.name || note.user.username, + }), text: note.text, }, } diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue index 1ace1dbaf7..e8695ed266 100644 --- a/packages/client/src/pages/notifications.vue +++ b/packages/client/src/pages/notifications.vue @@ -9,7 +9,10 @@ /> - - - -
*v-else on next div* -->
- .contents { - border-right: .5px solid var(--divider); + border-right: 0.5px solid var(--divider); } } &.wallpaper { @@ -473,7 +473,7 @@ console.log(mainRouter.currentRoute.value.name); &:not(.isMobile) { --navBg: transparent; > .contents { - border-inline: .5px solid var(--divider); + border-inline: 0.5px solid var(--divider); margin-inline: -1px; } }