diff --git a/package.json b/package.json index 3408ce50f..db96ae1ca 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://codeberg.org/calckey/calckey.git" }, - "packageManager": "pnpm@8.6.3", + "packageManager": "pnpm@8.6.6", "private": true, "scripts": { "rebuild": "pnpm run clean && pnpm node ./scripts/build-greet.js && pnpm -r run build && pnpm run gulp", diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts index 09a69b25c..0e500b89e 100644 --- a/packages/backend/src/queue/processors/inbox.ts +++ b/packages/backend/src/queue/processors/inbox.ts @@ -37,7 +37,7 @@ export default async (job: Bull.Job): Promise => { if (!signature?.keyId) { const err = `Invalid signature: ${signature}`; - job.moveToFailed({message: err}); + job.moveToFailed({ message: err }); return err; } //#endregion diff --git a/packages/client/package.json b/packages/client/package.json index 2ec569381..e34773ffe 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -57,7 +57,7 @@ "matter-js": "0.18.0", "mfm-js": "0.23.3", "photoswipe": "5.3.7", - "prettier": "2.8.8", + "prettier": "3.0.0", "prettier-plugin-vue": "1.1.6", "prismjs": "1.29.0", "punycode": "2.1.1", diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 19b8ba526..6fdf3b9e0 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -67,7 +67,7 @@ function send() { userId: props.user.id, comment: comment.value, }, - undefined + undefined, ).then((res) => { os.alert({ type: "success", diff --git a/packages/client/src/components/MkAnalogClock.vue b/packages/client/src/components/MkAnalogClock.vue index 43d81f2a9..2c67d2dcd 100644 --- a/packages/client/src/components/MkAnalogClock.vue +++ b/packages/client/src/components/MkAnalogClock.vue @@ -19,7 +19,7 @@ 0, 1 - angleDiff(hAngle, angle) / Math.PI - - numbersOpacityFactor + numbersOpacityFactor, ) " /> @@ -48,7 +48,7 @@ 0, 1 - angleDiff(hAngle, angle) / Math.PI - - numbersOpacityFactor + numbersOpacityFactor, ) " > @@ -151,7 +151,7 @@ const props = withDefaults( graduations: "dots", fadeGraduations: true, sAnimation: "elastic", - } + }, ); const graduationsMajor = computed(() => { @@ -192,7 +192,7 @@ let sOneRound = false; function tick() { const now = new Date(); now.setMinutes( - now.getMinutes() + (new Date().getTimezoneOffset() + props.offset) + now.getMinutes() + (new Date().getTimezoneOffset() + props.offset), ); s = now.getSeconds(); m = now.getMinutes(); @@ -225,7 +225,7 @@ function calcColors() { const computedStyle = getComputedStyle(document.documentElement); const dark = tinycolor(computedStyle.getPropertyValue("--bg")).isDark(); const accent = tinycolor( - computedStyle.getPropertyValue("--accent") + computedStyle.getPropertyValue("--accent"), ).toHexString(); majorGraduationColor = dark ? "rgba(255, 255, 255, 0.3)" @@ -233,7 +233,7 @@ function calcColors() { //minorGraduationColor = dark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; sHandColor = dark ? "rgba(255, 255, 255, 0.5)" : "rgba(0, 0, 0, 0.3)"; mHandColor = tinycolor( - computedStyle.getPropertyValue("--fg") + computedStyle.getPropertyValue("--fg"), ).toHexString(); hHandColor = accent; nowColor = accent; diff --git a/packages/client/src/components/MkAutocomplete.vue b/packages/client/src/components/MkAutocomplete.vue index 37207a14f..e1a61f11f 100644 --- a/packages/client/src/components/MkAutocomplete.vue +++ b/packages/client/src/components/MkAutocomplete.vue @@ -268,7 +268,7 @@ function exec() { } else if (props.type === "hashtag") { if (!props.q || props.q === "") { hashtags.value = JSON.parse( - localStorage.getItem("hashtags") || "[]" + localStorage.getItem("hashtags") || "[]", ); fetching.value = false; } else { @@ -288,7 +288,7 @@ function exec() { // キャッシュ sessionStorage.setItem( cacheKey, - JSON.stringify(searchedHashtags) + JSON.stringify(searchedHashtags), ); }); } @@ -298,7 +298,7 @@ function exec() { // 最近使った絵文字をサジェスト emojis.value = defaultStore.state.recentlyUsedEmojis .map((emoji) => - emojiDb.find((dbEmoji) => dbEmoji.emoji === emoji) + emojiDb.find((dbEmoji) => dbEmoji.emoji === emoji), ) .filter((x) => x) as EmojiDef[]; return; @@ -450,7 +450,7 @@ onMounted(() => { nextTick(() => { exec(); }); - } + }, ); }); }); @@ -470,7 +470,9 @@ onBeforeUnmount(() => { max-width: 100%; margin-top: calc(1em + 8px); overflow: hidden; - transition: top 0.1s ease, left 0.1s ease; + transition: + top 0.1s ease, + left 0.1s ease; > ol { display: block; diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue index aa0adb54b..ab0281908 100644 --- a/packages/client/src/components/MkButton.vue +++ b/packages/client/src/components/MkButton.vue @@ -90,7 +90,7 @@ function onMousedown(evt: MouseEvent): void { target.clientWidth, target.clientHeight, circleCenterX, - circleCenterY + circleCenterY, ); window.setTimeout(() => { diff --git a/packages/client/src/components/MkCaptcha.vue b/packages/client/src/components/MkCaptcha.vue index 554d4ac3a..71d8c2996 100644 --- a/packages/client/src/components/MkCaptcha.vue +++ b/packages/client/src/components/MkCaptcha.vue @@ -25,7 +25,7 @@ type Captcha = { | "expired-callback" | "error-callback" | "endpoint"]?: unknown; - } + }, ): string; remove(id: string): void; execute(id: string): void; @@ -78,7 +78,7 @@ const src = computed(() => { }); const captcha = computed( - () => window[variable.value] || ({} as unknown as Captcha) + () => window[variable.value] || ({} as unknown as Captcha), ); if (loaded) { @@ -91,7 +91,7 @@ if (loaded) { async: true, id: props.provider, src: src.value, - }) + }), ) ).addEventListener("load", () => (available.value = true)); } diff --git a/packages/client/src/components/MkChannelFollowButton.vue b/packages/client/src/components/MkChannelFollowButton.vue index b4cb1a87f..77b5f5f49 100644 --- a/packages/client/src/components/MkChannelFollowButton.vue +++ b/packages/client/src/components/MkChannelFollowButton.vue @@ -34,7 +34,7 @@ const props = withDefaults( }>(), { full: false, - } + }, ); const isFollowing = ref(props.channel.isFollowing); diff --git a/packages/client/src/components/MkChannelList.vue b/packages/client/src/components/MkChannelList.vue index c284736f2..c5452cd12 100644 --- a/packages/client/src/components/MkChannelList.vue +++ b/packages/client/src/components/MkChannelList.vue @@ -35,7 +35,7 @@ const props = withDefaults( }>(), { extractor: (item) => item, - } + }, ); diff --git a/packages/client/src/components/MkChart.vue b/packages/client/src/components/MkChart.vue index 310d980b4..fab89e0b0 100644 --- a/packages/client/src/components/MkChart.vue +++ b/packages/client/src/components/MkChart.vue @@ -91,7 +91,7 @@ Chart.register( Tooltip, SubTitle, Filler, - zoomPlugin + zoomPlugin, //gradient, ); @@ -179,11 +179,11 @@ const render = () => { // フォントカラー Chart.defaults.color = getComputedStyle( - document.documentElement + document.documentElement, ).getPropertyValue("--fg"); const maxes = chartData.series.map((x, i) => - Math.max(...x.data.map((d) => d.y)) + Math.max(...x.data.map((d) => d.y)), ); chartInstance = new Chart(chartEl.value, { @@ -471,9 +471,9 @@ const fetchNotesChart = async (type: string): Promise => { raw.local.inc, negate(raw.local.dec), raw.remote.inc, - negate(raw.remote.dec) + negate(raw.remote.dec), ) - : sum(raw[type].inc, negate(raw[type].dec)) + : sum(raw[type].inc, negate(raw[type].dec)), ), color: "#888888", }, @@ -483,7 +483,7 @@ const fetchNotesChart = async (type: string): Promise => { data: format( type === "combined" ? sum(raw.local.diffs.renote, raw.remote.diffs.renote) - : raw[type].diffs.renote + : raw[type].diffs.renote, ), color: colors.green, }, @@ -493,7 +493,7 @@ const fetchNotesChart = async (type: string): Promise => { data: format( type === "combined" ? sum(raw.local.diffs.reply, raw.remote.diffs.reply) - : raw[type].diffs.reply + : raw[type].diffs.reply, ), color: colors.yellow, }, @@ -503,7 +503,7 @@ const fetchNotesChart = async (type: string): Promise => { data: format( type === "combined" ? sum(raw.local.diffs.normal, raw.remote.diffs.normal) - : raw[type].diffs.normal + : raw[type].diffs.normal, ), color: colors.blue, }, @@ -514,9 +514,9 @@ const fetchNotesChart = async (type: string): Promise => { type === "combined" ? sum( raw.local.diffs.withFile, - raw.remote.diffs.withFile + raw.remote.diffs.withFile, ) - : raw[type].diffs.withFile + : raw[type].diffs.withFile, ), color: colors.purple, }, @@ -567,8 +567,8 @@ const fetchUsersChart = async (total: boolean): Promise => { raw.local.inc, negate(raw.local.dec), raw.remote.inc, - negate(raw.remote.dec) - ) + negate(raw.remote.dec), + ), ), }, { @@ -577,7 +577,7 @@ const fetchUsersChart = async (total: boolean): Promise => { data: format( total ? raw.local.total - : sum(raw.local.inc, negate(raw.local.dec)) + : sum(raw.local.inc, negate(raw.local.dec)), ), }, { @@ -586,7 +586,7 @@ const fetchUsersChart = async (total: boolean): Promise => { data: format( total ? raw.remote.total - : sum(raw.remote.inc, negate(raw.remote.dec)) + : sum(raw.remote.inc, negate(raw.remote.dec)), ), }, ], @@ -675,8 +675,8 @@ const fetchDriveChart = async (): Promise => { raw.local.incSize, negate(raw.local.decSize), raw.remote.incSize, - negate(raw.remote.decSize) - ) + negate(raw.remote.decSize), + ), ), }, { @@ -719,8 +719,8 @@ const fetchDriveFilesChart = async (): Promise => { raw.local.incCount, negate(raw.local.decCount), raw.remote.incCount, - negate(raw.remote.decCount) - ) + negate(raw.remote.decCount), + ), ), }, { @@ -778,7 +778,7 @@ const fetchInstanceRequestsChart = async (): Promise => { }; const fetchInstanceUsersChart = async ( - total: boolean + total: boolean, ): Promise => { const raw = await os.apiGet("charts/instance", { host: props.args.host, @@ -794,7 +794,7 @@ const fetchInstanceUsersChart = async ( data: format( total ? raw.users.total - : sum(raw.users.inc, negate(raw.users.dec)) + : sum(raw.users.inc, negate(raw.users.dec)), ), }, ], @@ -802,7 +802,7 @@ const fetchInstanceUsersChart = async ( }; const fetchInstanceNotesChart = async ( - total: boolean + total: boolean, ): Promise => { const raw = await os.apiGet("charts/instance", { host: props.args.host, @@ -818,7 +818,7 @@ const fetchInstanceNotesChart = async ( data: format( total ? raw.notes.total - : sum(raw.notes.inc, negate(raw.notes.dec)) + : sum(raw.notes.inc, negate(raw.notes.dec)), ), }, ], @@ -826,7 +826,7 @@ const fetchInstanceNotesChart = async ( }; const fetchInstanceFfChart = async ( - total: boolean + total: boolean, ): Promise => { const raw = await os.apiGet("charts/instance", { host: props.args.host, @@ -842,7 +842,7 @@ const fetchInstanceFfChart = async ( data: format( total ? raw.following.total - : sum(raw.following.inc, negate(raw.following.dec)) + : sum(raw.following.inc, negate(raw.following.dec)), ), }, { @@ -852,7 +852,7 @@ const fetchInstanceFfChart = async ( data: format( total ? raw.followers.total - : sum(raw.followers.inc, negate(raw.followers.dec)) + : sum(raw.followers.inc, negate(raw.followers.dec)), ), }, ], @@ -860,7 +860,7 @@ const fetchInstanceFfChart = async ( }; const fetchInstanceDriveUsageChart = async ( - total: boolean + total: boolean, ): Promise => { const raw = await os.apiGet("charts/instance", { host: props.args.host, @@ -877,7 +877,7 @@ const fetchInstanceDriveUsageChart = async ( data: format( total ? raw.drive.totalUsage - : sum(raw.drive.incUsage, negate(raw.drive.decUsage)) + : sum(raw.drive.incUsage, negate(raw.drive.decUsage)), ), }, ], @@ -885,7 +885,7 @@ const fetchInstanceDriveUsageChart = async ( }; const fetchInstanceDriveFilesChart = async ( - total: boolean + total: boolean, ): Promise => { const raw = await os.apiGet("charts/instance", { host: props.args.host, @@ -901,7 +901,7 @@ const fetchInstanceDriveFilesChart = async ( data: format( total ? raw.drive.totalFiles - : sum(raw.drive.incFiles, negate(raw.drive.decFiles)) + : sum(raw.drive.incFiles, negate(raw.drive.decFiles)), ), }, ], diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue index c2f9d9db5..2d7e1296d 100644 --- a/packages/client/src/components/MkChatPreview.vue +++ b/packages/client/src/components/MkChatPreview.vue @@ -11,7 +11,7 @@ message.groupId ? `/my/messaging/group/${message.groupId}` : `/my/messaging/${getAcct( - isMe(message) ? message.recipient : message.user + isMe(message) ? message.recipient : message.user, )}` " > diff --git a/packages/client/src/components/MkCode.core.vue b/packages/client/src/components/MkCode.core.vue index c397a950c..579c6cf1e 100644 --- a/packages/client/src/components/MkCode.core.vue +++ b/packages/client/src/components/MkCode.core.vue @@ -18,13 +18,13 @@ const props = defineProps<{ }>(); const prismLang = computed(() => - Prism.languages[props.lang] ? props.lang : "js" + Prism.languages[props.lang] ? props.lang : "js", ); const html = computed(() => Prism.highlight( props.code, Prism.languages[prismLang.value], - prismLang.value - ) + prismLang.value, + ), ); diff --git a/packages/client/src/components/MkCode.vue b/packages/client/src/components/MkCode.vue index f012b5312..2e3fb3f0e 100644 --- a/packages/client/src/components/MkCode.vue +++ b/packages/client/src/components/MkCode.vue @@ -12,6 +12,6 @@ defineProps<{ }>(); const XCode = defineAsyncComponent( - () => import("@/components/MkCode.core.vue") + () => import("@/components/MkCode.core.vue"), ); diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue index 4c4e91160..468982129 100644 --- a/packages/client/src/components/MkContainer.vue +++ b/packages/client/src/components/MkContainer.vue @@ -125,7 +125,7 @@ export default defineComponent({ }, { immediate: true, - } + }, ); this.$el.style.setProperty("--maxHeight", this.maxHeight + "px"); @@ -174,7 +174,9 @@ export default defineComponent({ .container-toggle-enter-active, .container-toggle-leave-active { overflow-y: hidden; - transition: opacity 0.5s, height 0.5s !important; + transition: + opacity 0.5s, + height 0.5s !important; } .container-toggle-enter-from { opacity: 0; diff --git a/packages/client/src/components/MkContextMenu.vue b/packages/client/src/components/MkContextMenu.vue index 3e94dd59d..d615b6352 100644 --- a/packages/client/src/components/MkContextMenu.vue +++ b/packages/client/src/components/MkContextMenu.vue @@ -80,7 +80,8 @@ function onMousedown(evt: Event) { .fade-enter-active, .fade-leave-active { - transition: opacity 0.5s cubic-bezier(0.16, 1, 0.3, 1), + transition: + opacity 0.5s cubic-bezier(0.16, 1, 0.3, 1), transform 0.5s cubic-bezier(0.16, 1, 0.3, 1); transform-origin: left top; } diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue index cce948572..b7d25bd35 100644 --- a/packages/client/src/components/MkCropperDialog.vue +++ b/packages/client/src/components/MkCropperDialog.vue @@ -118,7 +118,7 @@ onMounted(() => { const selection = cropper.getCropperSelection()!; selection.themeColor = tinycolor( - computedStyle.getPropertyValue("--accent") + computedStyle.getPropertyValue("--accent"), ).toHexString(); selection.aspectRatio = props.aspectRatio; selection.initialAspectRatio = props.aspectRatio; diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue index f7fcb1d01..4db39f1ac 100644 --- a/packages/client/src/components/MkCwButton.vue +++ b/packages/client/src/components/MkCwButton.vue @@ -63,7 +63,9 @@ defineExpose({ > span { background: var(--cwBg) !important; color: var(--cwFg); - transition: background 0.2s, color 0.2s; + transition: + background 0.2s, + color 0.2s; > span { font-weight: 500; &::before { diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue index 7ecc91808..ebb66ea1f 100644 --- a/packages/client/src/components/MkDateSeparatedList.vue +++ b/packages/client/src/components/MkDateSeparatedList.vue @@ -84,8 +84,8 @@ export default defineComponent({ class: "ph-caret-down ph-bold ph-lg icon", }), ]), - ] - ) + ], + ), ); return [el, separator]; @@ -119,7 +119,7 @@ export default defineComponent({ : { class: "sqadhkmv" + (props.noGap ? " noGap" : ""), }, - { default: renderChildren } + { default: renderChildren }, ); }, }); @@ -140,7 +140,8 @@ export default defineComponent({ } > .list-enter-active { - transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), + transition: + transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1); } diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue index f870005ef..5a106a5b2 100644 --- a/packages/client/src/components/MkDialog.vue +++ b/packages/client/src/components/MkDialog.vue @@ -78,14 +78,24 @@ okButtonDisabled && disabledReason === 'charactersExceeded' " - v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })" + v-text=" + i18n.t('_dialog.charactersExceeded', { + current: (inputValue as string).length, + max: input.maxLength ?? 'NaN', + }) + " />