Compare commits

..

No commits in common. "cc751dc13ace8ed9b09ec4f3ceb87ff773b04bcf" and "c8e4244091c81bc9fe6cdaff064e817a62e3a4a3" have entirely different histories.

4 changed files with 20 additions and 24 deletions

View File

@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.21
# syntax = docker/dockerfile:1.4
ARG NODE_VERSION=22.22.0-bookworm
ARG NODE_VERSION=22.15.0-bookworm
# build assets & compile TypeScript
@ -18,13 +18,10 @@ WORKDIR /misskey
COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
COPY --link ["scripts", "./scripts"]
COPY --link ["patches", "./patches"]
COPY --link ["packages/backend/package.json", "./packages/backend/"]
COPY --link ["packages/frontend-shared/package.json", "./packages/frontend-shared/"]
COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
COPY --link ["packages/frontend-embed/package.json", "./packages/frontend-embed/"]
COPY --link ["packages/frontend-builder/package.json", "./packages/frontend-builder/"]
COPY --link ["packages/i18n/package.json", "./packages/i18n/"]
COPY --link ["packages/icons-subsetter/package.json", "./packages/icons-subsetter/"]
COPY --link ["packages/sw/package.json", "./packages/sw/"]
COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
@ -56,7 +53,6 @@ WORKDIR /misskey
COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
COPY --link ["scripts", "./scripts"]
COPY --link ["patches", "./patches"]
COPY --link ["packages/backend/package.json", "./packages/backend/"]
COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
@ -74,8 +70,10 @@ FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-slim AS runner
ARG UID="991"
ARG GID="991"
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
RUN rm -rf /var/lib/dpkg/info/libc-bin.*
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
&& apt-get install -y \
ffmpeg tini curl libjemalloc-dev libjemalloc2 \
&& ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \
&& groupadd -g "${GID}" misskey \
@ -102,8 +100,6 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/src-js ./packages/backend/src-js
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
COPY --chown=misskey:misskey . ./

View File

@ -133,9 +133,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m">
<SearchMarker :keywords="['cat']">
<MkSwitch v-model="profile.isCat" :disabled="true">
<MkSwitch v-model="profile.isCat">
<template #label><SearchLabel>{{ i18n.ts.flagAsCat }}</SearchLabel></template>
<template #caption>nyaizeは無効化しています</template>
<template #caption>{{ i18n.ts.flagAsCatDescription }}</template>
</MkSwitch>
</SearchMarker>

View File

@ -313,7 +313,7 @@ export const store = markRaw(new Pizzax('base', {
},
squareAvatars: {
where: 'device',
default: true,
default: false,
},
showAvatarDecorations: {
where: 'device',

View File

@ -12,16 +12,16 @@ const koRegex3 = /(야(?=\?))|(야$)|(야(?= ))/gm;
export function nyaize(text: string): string {
return text
// // ja-JP
// .replaceAll('な', 'にゃ').replaceAll('ナ', 'ニャ').replaceAll('ナ', 'ニャ')
// // en-US
// .replace(enRegex1, x => x === 'A' ? 'YA' : 'ya')
// .replace(enRegex2, x => x === 'ING' ? 'YAN' : 'yan')
// .replace(enRegex3, x => x === 'ONE' ? 'NYAN' : 'nyan')
// // ko-KR
// .replace(koRegex1, match => !isNaN(match.charCodeAt(0)) ? String.fromCharCode(
// match.charCodeAt(0) + '냐'.charCodeAt(0) - '나'.charCodeAt(0),
// ) : match)
// .replace(koRegex2, '다냥')
// .replace(koRegex3, '냥');
// ja-JP
.replaceAll('な', 'にゃ').replaceAll('ナ', 'ニャ').replaceAll('ナ', 'ニャ')
// en-US
.replace(enRegex1, x => x === 'A' ? 'YA' : 'ya')
.replace(enRegex2, x => x === 'ING' ? 'YAN' : 'yan')
.replace(enRegex3, x => x === 'ONE' ? 'NYAN' : 'nyan')
// ko-KR
.replace(koRegex1, match => !isNaN(match.charCodeAt(0)) ? String.fromCharCode(
match.charCodeAt(0) + '냐'.charCodeAt(0) - '나'.charCodeAt(0),
) : match)
.replace(koRegex2, '다냥')
.replace(koRegex3, '냥');
}