Merge remote-branch 'misskey/develop'

2024-10-30 14:51:48 +09:00 · 2023-09-07 17:57:17 +09:00 · 2023-09-07 17:57:17 +09:00 · 4eee67647d
commit 4eee67647d
parent 58ad0387f4 90b058e226
31 changed files with 681 additions and 2372 deletions
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@ -114,6 +114,7 @@ redis:

 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@ -121,7 +122,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!

-id: 'aid'
+id: 'aidx'

 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
--- a/.config/example.yml
+++ b/.config/example.yml
@ -125,6 +125,7 @@ redis:

 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@ -132,7 +133,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!

-id: 'aid'
+id: 'aidx'

 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
--- a/.devcontainer/devcontainer.yml
+++ b/.devcontainer/devcontainer.yml
@ -114,6 +114,7 @@ redis:

 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@ -121,7 +122,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!

-id: 'aid'
+id: 'aidx'

 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
--- a/.github/cherrypick/test.yml
+++ b/.github/cherrypick/test.yml
@ -12,4 +12,4 @@ db:
 redis:
  host: 127.0.0.1
  port: 56312
-id: aid
+id: aidx
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@ -13,7 +13,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]

    services:
      postgres:
--- a/.github/workflows/test-cherrypick-js.yml
+++ b/.github/workflows/test-cherrypick-js.yml
@ -16,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/

    steps:
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@ -13,7 +13,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]

    steps:
    - uses: actions/checkout@v4.0.0
@ -51,7 +51,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]
        browser: [chrome]

    services:
--- a/.github/workflows/test-production.yml
+++ b/.github/workflows/test-production.yml
@ -16,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [20.x]
+        node-version: [20.5.1]

    steps:
    - uses: actions/checkout@v4.0.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -21,6 +21,7 @@
 	- お知らせのバナー表示やダイアログ表示が可能に
 	- お知らせのアイコンを設定可能に
 - チャンネルをセンシティブ指定できるようになりました
+	- センシティブチャンネルのNoteのReNoteはデフォルトでHome TLに流れるようになりました
 - 二要素認証のバックアップコードが生成されるようになりました ref. https://github.com/MisskeyIO/misskey/pull/121

 ### Client
@ -35,6 +36,7 @@
 - Enhance: ノート検索にローカルのみ検索可能なオプションの追加
 - Enhance: AiScriptで`LOCALE`として現在の設定言語を取得できるように
 - Enhance: Renote自体を通報できるように
+- Enhance: データセーバーモードの強化
 - Enhance: Renoteを管理者権限で削除可能に
 - `$[rainbow ]`記法が、動きのあるMFMが無効になっていても使用できるようになりました
 - Playの操作を行うAPI TokenをAPIコンソールから発行できるように
@ -52,6 +54,7 @@
 - ファイルアップロード時等にファイル名の拡張子を修正する関数(correctFilename)の挙動を改善
 - Webhookのペイロードにサーバーのurlが含まれるようになりました
 - Webhook設定でsecretを空に出来るように
+- 使われていないアンテナの自動停止を設定可能に
 - Fix: 一部のfeatured noteを照会できない問題を修正
 - Fix: muteがapiからのuser list timeline取得で機能しない問題を修正
 - Fix: ジョブキュー管理画面の認証を回避できる問題を修正
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@ -135,6 +135,7 @@ redis:

 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... Millisecond accuracy
 # meid ... Similar to ObjectID, Millisecond accuracy
 # ulid ... Millisecond accuracy
 # objectid ... This is left for backward compatibility
@ -142,7 +143,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!

-id: "aid"
+id: "aidx"
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────

--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@ -1,65 +0,0 @@
-/**
- * Gulp tasks
- */
-
-import * as fs from 'node:fs';
-import gulp from 'gulp';
-import replace from 'gulp-replace';
-import terser from 'gulp-terser';
-import cssnano from 'gulp-cssnano';
-
-import locales from './locales/index.js';
-import meta from './package.json' assert { type: "json" };
-
-gulp.task('copy:backend:views', () =>
-	gulp.src('./packages/backend/src/server/web/views/**/*').pipe(gulp.dest('./packages/backend/built/server/web/views'))
-);
-
-gulp.task('copy:frontend:fonts', () =>
-	gulp.src('./packages/frontend/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_frontend_dist_/fonts/'))
-);
-
-gulp.task('copy:frontend:tabler-icons', () =>
-	gulp.src('./packages/frontend/node_modules/@tabler/icons-webfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/'))
-);
-
-gulp.task('copy:frontend:locales', cb => {
-	fs.mkdirSync('./built/_frontend_dist_/locales', { recursive: true });
-
-	const v = { '_version_': meta.version };
-
-	for (const [lang, locale] of Object.entries(locales)) {
-		fs.writeFileSync(`./built/_frontend_dist_/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
-	}
-
-	cb();
-});
-
-gulp.task('build:backend:script', () => {
-	return gulp.src(['./packages/backend/src/server/web/boot.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js'])
-		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
-		.pipe(terser({
-			toplevel: true
-		}))
-		.pipe(gulp.dest('./packages/backend/built/server/web/'));
-});
-
-gulp.task('build:backend:style', () => {
-	return gulp.src(['./packages/backend/src/server/web/style.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css', './packages/backend/src/server/web/error.css'])
-		.pipe(cssnano({
-			zindex: false
-		}))
-		.pipe(gulp.dest('./packages/backend/built/server/web/'));
-});
-
-gulp.task('build', gulp.parallel(
-	'copy:frontend:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:frontend:fonts', 'copy:frontend:tabler-icons'
-));
-
-gulp.task('default', gulp.task('build'));
-
-gulp.task('watch', () => {
-	gulp.watch([
-		'./packages/*/src/**/*',
-	], { ignoreInitial: false }, gulp.task('build'));
-});
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -45,6 +45,7 @@ pin: "An dein Profil anheften"
 unpin: "Von deinem Profil lösen"
 copyContent: "Inhalt kopieren"
 copyLink: "Link kopieren"
+copyLinkRenote: "Renote-Link kopieren"
 delete: "Löschen"
 deleteAndEdit: "Löschen und Bearbeiten"
 deleteAndEditConfirm: "Möchtest du diese Notiz wirklich löschen und bearbeiten? Alle Reaktionen, Renotes und Antworten dieser Notiz werden verloren gehen."
@ -667,6 +668,7 @@ behavior: "Verhalten"
 sample: "Beispiel"
 abuseReports: "Meldungen"
 reportAbuse: "Melden"
+reportAbuseRenote: "Renote melden"
 reportAbuseOf: "{name} melden"
 fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
 abuseReported: "Deine Meldung wurde versendet. Vielen Dank."
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -85,6 +85,7 @@ pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
 copyLink: "Copy link"
+copyLinkRenote: "Copy renote link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
 deleteAndEditConfirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
@ -711,7 +712,7 @@ behavior: "Behavior"
 sample: "Sample"
 abuseReports: "Reports"
 reportAbuse: "Report"
-reportAbuseRenote: "Report Renote"
+reportAbuseRenote: "Report renote"
 reportAbuseOf: "Report {name}"
 fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific note, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -45,6 +45,7 @@ pin: "Fijar al perfil"
 unpin: "Desfijar"
 copyContent: "Copiar contenido"
 copyLink: "Copiar enlace"
+copyLinkRenote: "Copiar enlace de renota"
 delete: "Borrar"
 deleteAndEdit: "Borrar y editar"
 deleteAndEditConfirm: "¿Estás seguro de que quieres borrar esta nota y editarla? Perderás todas las reacciones, renotas y respuestas."
@ -667,6 +668,7 @@ behavior: "Comportamiento"
 sample: "Muestra"
 abuseReports: "Reportes"
 reportAbuse: "Reportar"
+reportAbuseRenote: "Reportar renota"
 reportAbuseOf: "Reportar a {name}"
 fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en particular, ingrese la URL de esta."
 abuseReported: "Se ha enviado el reporte. Muchas gracias."
@ -1834,6 +1836,10 @@ _permissions:
  "write:gallery": "Editar galería"
  "read:gallery-likes": "Ver favoritos de la galería"
  "write:gallery-likes": "Editar favoritos de la galería"
+  "read:flash": "Ver Play"
+  "write:flash": "Editar Plays"
+  "read:flash-likes": "Ver los Play que me gustan"
+  "write:flash-likes": "Editar lista de Play que me gustan"
 _auth:
  shareAccessTitle: "Permisos de la aplicación"
  shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
@ -2110,6 +2116,8 @@ _deck:
  introduction2: "Presiona en la  + de la derecha de la pantalla para añadir nuevas columnas donde quieras."
  widgetsIntroduction: "Por favor selecciona \"Editar Widgets\" en el menú columna y agrega un widget."
  useSimpleUiForNonRootPages: "Mostrar páginas no pertenecientes a la raíz con la interfaz simple"
+  usedAsMinWidthWhenFlexible: "Se usará el ancho mínimo cuando la opción \"Autoajustar ancho\" esté habilitada"
+  flexible: "Autoajustar ancho"
  _columns:
    main: "Principal"
    widgets: "Widgets"
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@ -45,6 +45,7 @@ pin: "Fissa sul profilo"
 unpin: "Non fissare sul profilo"
 copyContent: "Copia il contenuto"
 copyLink: "Copia il link"
+copyLinkRenote: "Copia collegamento alla Rinota"
 delete: "Elimina"
 deleteAndEdit: "Elimina e modifica"
 deleteAndEditConfirm: "Vuoi davvero cancellare questa nota e scriverla di nuovo? Verranno eliminate anche tutte le reazioni, rinote e risposte collegate."
@ -667,6 +668,7 @@ behavior: "Comportamento"
 sample: "Esempio"
 abuseReports: "Segnalazioni"
 reportAbuse: "Segnala"
+reportAbuseRenote: "Segnala la Rinota"
 reportAbuseOf: "Segnala {name}"
 fillAbuseReportDescription: "Per favore, spiegaci il motivo della segnalazione. Se riguarda una Nota precisa, indica anche l'indirizzo URL."
 abuseReported: "La segnalazione è stata inviata. Grazie."
@ -2114,8 +2116,8 @@ _deck:
  introduction2: "È possibile aggiungere colonne in qualsiasi momento premendo + sulla destra dello schermo."
  widgetsIntroduction: "Dal menu della colonna, selezionare \"Modifica i riquadri\" per aggiungere un un riquadro con funzionalità"
  useSimpleUiForNonRootPages: "Visualizza sotto pagine con interfaccia web semplice"
-  usedAsMinWidthWhenFlexible: "Lunghezza minima sarò usata quando l'opzione \"Lunghezza automacia\" è attivata"
-  flexible: "Lunghezza automatica"
+  usedAsMinWidthWhenFlexible: "Se \"larghezza flessibile\" è abilitato, questa diventa la larghezza minima"
+  flexible: "Larghezza flessibile"
  _columns:
    main: "Principale"
    widgets: "Riquadri"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@ -45,6 +45,7 @@ pin: "Fixar no perfil"
 unpin: "Desafixar do perfil"
 copyContent: "Copiar conteúdos"
 copyLink: "Copiar link"
+copyLinkRenote: "Copiar o link da repostagem"
 delete: "Excluir"
 deleteAndEdit: "Excluir e editar"
 deleteAndEditConfirm: "Deseja excluir esta nota e editá-la novamente? Todas as reações, compartilhamentos e respostas a esta nota também serão excluídas."
@ -654,6 +655,7 @@ behavior: "Comportamento"
 sample: "Exemplo"
 abuseReports: "Denúncias"
 reportAbuse: "Denúncias"
+reportAbuseRenote: "Reportar repostagem"
 reportAbuseOf: "Denunciar {name}"
 fillAbuseReportDescription: "Por favor, forneça detalhes sobre o motivo da denúncia. Se houver uma nota específica envolvida, inclua também a URL dela."
 abuseReported: "Denúncia enviada. Obrigado por sua ajuda."
@ -829,7 +831,7 @@ hashtags: "Hashtags"
 troubleshooting: "Resolução de problemas"
 useBlurEffect: "Usar efeito de desfoque na UI"
 learnMore: "Saiba mais"
-misskeyUpdated: "Misskey foi atualizado!"
+misskeyUpdated: "CherryPick foi atualizado!"
 whatIsNew: "Ver atualizações"
 translate: "Traduzir"
 translatedFrom: "Traduzido de"
@ -917,23 +919,42 @@ pleaseSelect: "Por favor, selecione."
 reverse: "Inversão"
 colored: "Colorido"
 refreshInterval: "Intervalo de atualização"
+type: "Tipo"
 speed: "Velocidade"
+slow: "Lento"
+fast: "Rápido"
 sensitiveMediaDetection: "Detecção de conteúdo sensível"
+localOnly: "Apenas local"
+remoteOnly: "Apenas remoto"
 cannotUploadBecauseExceedsFileSizeLimit: "Não é possível realizar o upload deste arquivo porque ele excede o tamanho máximo permitido."
 beta: "Beta"
 enableAutoSensitive: "Marcar automaticamente como conteúdo sensível"
 enableAutoSensitiveDescription: "Quando disponível, a marcação de mídia sensível será automaticamente atribuído ao conteúdo de mídia usando aprendizado de máquina. Mesmo que você desative essa função, em alguns servidores, isso pode ser configurado automaticamente."
 activeEmailValidationDescription: "A validação do endereço de e-mail do usuário será realizada de forma mais rigorosa, considerando se é um endereço descartável ou se é possível realizar comunicação efetiva. Se desativado, apenas a validade do formato do endereço será verificada como uma sequência de caracteres."
+shuffle: "Aleatório"
 account: "Contas"
+move: "Mover"
+pushNotification: "Notificações Push"
+subscribePushNotification: "Ativar notificações push"
+unsubscribePushNotification: "Desativar notificações push"
+windowMinimize: "Minimizar"
+windowRestore: "Restaurar"
+caption: "legenda"
+tools: "Ferramentas"
 like: "Curtir"
 unlike: "Remover curtida"
 numberOfLikes: "Número de curtidas"
 show: "Visualizar"
+neverShow: "Não exibir novamente"
+remindMeLater: "Lembrar mais tarde"
 didYouLikeMisskey: "Você gostou do CherryPick?"
 pleaseDonate: "O CherryPick é um software gratuito utilizado por {host}. Para que possamos continuar o desenvolvimento, pedimos que considerem fazer doações. A sua contribuição é muito importante!"
 roles: "Cargos"
 role: "Cargo"
 noRole: "Nenhum cargo"
+normalUser: "Usuários padrão"
+undefined: "Indefinido"
+assign: "Atribuir"
 unassign: "Remover"
 color: "Cor"
 manageCustomEmojis: "Gerenciar Emojis customizados"
@ -953,7 +974,7 @@ thisPostMayBeAnnoying: "Esta nota pode incomodar outras pessoas."
 thisPostMayBeAnnoyingHome: "Postar na linha do tempo inicial"
 thisPostMayBeAnnoyingCancel: "Cancelar"
 thisPostMayBeAnnoyingIgnore: "Postar mesmo assim"
-collapseRenotes: "Ocultar Renotes já visualizadas"
+collapseRenotes: "Ocultar repostagens já visualizadas"
 internalServerError: "Erro interno de servidor"
 emailNotSupported: "O envio de e-mails não é suportado nesta instância"
 likeOnly: "Apenas curtidas"
@ -963,8 +984,19 @@ rolesAssignedToMe: "Cargos atribuídos a mim"
 unfavoriteConfirm: "Deseja realmente remover dos favoritos?"
 drivecleaner: "Limpeza do drive"
 retryAllQueuesConfirmTitle: "Gostaria de tentar novamente agora?"
+reactionsList: "Reações"
+renotesList: "Repostagens"
+leftTop: "Superior esquerdo"
+rightTop: "Superior direito"
+leftBottom: "Inferior esquerdo"
+rightBottom: "Inferior direito"
+vertical: "Vertical"
 horizontal: "Exibir painel lateral inteiro"
+position: "Posição"
+serverRules: "Regras do servidor"
+continue: "Continuar"
 preservedUsernamesDescription: "Liste os nomes de usuário que deseja reservar, separando-os por quebras de linha. Os nomes de usuário especificados aqui não poderão ser utilizados durante a criação de contas. No entanto, esta restrição não se aplica quando a conta é criada por um administrador. Além disso, as contas que já existem não serão afetadas."
+archive: "Arquivo"
 channelArchiveConfirmTitle: "Deseja realmente arquivar {name}?"
 youFollowing: "Seguindo"
 preventAiLearningDescription: "Solicita-se que o conteúdo de notas e imagens enviadas não seja usado como objeto de aprendizado por sistemas externos de geração de texto ou imagens. Isso é alcançado incluindo a flag 'noai' na resposta HTML. No entanto, o cumprimento dessa solicitação depende do próprio sistema de IA, portanto, não é garantia total de prevenção de aprendizado."
@ -1268,6 +1300,8 @@ _menuDisplay:
  sideFull: "Exibir painel lateral inteiro"
  top: "Exibir barra superior"
  hide: "Ocultar"
+_instanceMute:
+  instanceMuteDescription: "Todas as notas e repostagens do servidor configurado serão silenciados, incluindo respostas aos usuários do servidor mutado."
 _theme:
  description: "Descrição"
  alpha: "Opacidade"
@ -1402,6 +1436,7 @@ _notification:
  youGotMention: "{name} te mencionou"
  youGotReply: "{name} te respondeu"
  youGotQuote: "{name} te citou"
+  youRenoted: "Repostagens de {name}"
  youWereFollowed: "Você tem um novo seguidor"
  youReceivedFollowRequest: "Você recebeu um pedido de seguidor"
  yourFollowRequestAccepted: "Seu pedido de seguidor foi aceito"
@ -1454,3 +1489,4 @@ _webhookSettings:
  _events:
    follow: "Quando seguindo um usuário"
    followed: "Quando sendo seguido"
+    renote: "Quando repostado"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -45,6 +45,7 @@ pin: "置顶"
 unpin: "取消置顶"
 copyContent: "复制内容"
 copyLink: "复制链接"
+copyLinkRenote: "复制转帖链接"
 delete: "删除"
 deleteAndEdit: "删除并编辑"
 deleteAndEditConfirm: "要删除此帖并再次编辑吗？对此帖的所有回应、转发和回复也将被删除。"
@ -667,6 +668,7 @@ behavior: "行为"
 sample: "示例"
 abuseReports: "举报"
 reportAbuse: "举报"
+reportAbuseRenote: "举报转帖"
 reportAbuseOf: "举报 {name}"
 fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写 URL 地址。"
 abuseReported: "内容已发送。感谢您提交信息。"
--- a/package.json
+++ b/package.json
@ -1,12 +1,12 @@
 {
 	"name": "cherrypick",
-	"version": "2023.9.0-beta.3-cp-4.3.0-beta.3",
+	"version": "2023.9.0-beta.4-cp-4.3.0-beta.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/kokonect-link/cherrypick.git"
 	},
-	"packageManager": "pnpm@8.7.1",
+	"packageManager": "pnpm@8.7.4",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@ -15,7 +15,8 @@
 	"private": true,
 	"scripts": {
 		"build-pre": "node ./scripts/build-pre.js",
-		"build": "pnpm build-pre && pnpm -r build && pnpm gulp",
+		"build-assets": "node ./scripts/build-assets.mjs",
+		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/index.js",
 		"start:docker": "pnpm check:connect && cd packages/backend && exec node ./built/boot/index.js",
@ -25,7 +26,6 @@
 		"check:connect": "cd packages/backend && pnpm check:connect",
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"migrateandstart:docker": "pnpm migrate && exec pnpm start:docker",
-		"gulp": "pnpm exec gulp build",
 		"watch": "pnpm dev",
 		"dev": "node ./scripts/dev.mjs",
 		"lint": "pnpm -r lint",
@ -36,7 +36,6 @@
 		"jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage",
 		"test": "pnpm -r test",
 		"test-and-coverage": "pnpm -r test-and-coverage",
-		"format": "pnpm exec gulp format",
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
 		"cleanall": "pnpm clean-all"
@ -47,17 +46,13 @@
 	},
 	"dependencies": {
 		"execa": "8.0.1",
-		"gulp": "4.0.2",
-		"gulp-cssnano": "2.1.3",
-		"gulp-rename": "2.0.0",
-		"gulp-replace": "1.1.4",
-		"gulp-terser": "2.1.0",
+		"cssnano": "6.0.1",
 		"js-yaml": "4.1.0",
+		"postcss": "8.4.27",
+		"terser": "5.19.2",
 		"typescript": "5.2.2"
 	},
 	"devDependencies": {
-		"@types/gulp": "4.0.13",
-		"@types/gulp-rename": "2.0.2",
 		"@typescript-eslint/eslint-plugin": "6.6.0",
 		"@typescript-eslint/parser": "6.6.0",
 		"cross-env": "7.0.3",
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@ -123,6 +123,7 @@
 		"microformats-parser": "1.4.1",
 		"mime-types": "2.1.35",
 		"ms": "3.0.0-canary.1",
+		"nanoid": "4.0.2",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
 		"nodemailer": "6.9.4",
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@ -94,6 +94,7 @@ type Source = {

 	perChannelMaxNoteCacheCount?: number;
 	perUserNotificationsMaxCount?: number;
+	deactivateAntennaThreshold?: number;
 };

 export type Config = {
@ -167,6 +168,7 @@ export type Config = {
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
 	perChannelMaxNoteCacheCount: number;
 	perUserNotificationsMaxCount: number;
+	deactivateAntennaThreshold: number;
 };

 const _filename = fileURLToPath(import.meta.url);
@ -258,6 +260,7 @@ export function loadConfig(): Config {
 		clientManifestExists: clientManifestExists,
 		perChannelMaxNoteCacheCount: config.perChannelMaxNoteCacheCount ?? 1000,
 		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 300,
+		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
 	};
 }

--- a/packages/backend/src/core/IdService.ts
+++ b/packages/backend/src/core/IdService.ts
@ -8,6 +8,7 @@ import { ulid } from 'ulid';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { genAid, parseAid } from '@/misc/id/aid.js';
+import { genAidx, parseAidx } from '@/misc/id/aidx.js';
 import { genMeid, parseMeid } from '@/misc/id/meid.js';
 import { genMeidg, parseMeidg } from '@/misc/id/meidg.js';
 import { genObjectId, parseObjectId } from '@/misc/id/object-id.js';
@ -31,6 +32,7 @@ export class IdService {

 		switch (this.method) {
 			case 'aid': return genAid(date);
+			case 'aidx': return genAidx(date);
 			case 'meid': return genMeid(date);
 			case 'meidg': return genMeidg(date);
 			case 'ulid': return ulid(date.getTime());
@ -43,6 +45,7 @@ export class IdService {
 	public parse(id: string): { date: Date; } {
 		switch (this.method) {
 			case 'aid': return parseAid(id);
+			case 'aidx': return parseAidx(id);
 			case 'objectid': return parseObjectId(id);
 			case 'meid': return parseMeid(id);
 			case 'meidg': return parseMeidg(id);
--- a/packages/backend/src/misc/id/aidx.ts
+++ b/packages/backend/src/misc/id/aidx.ts
@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey, cherrypick contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+// AIDX
+// 長さ8の[2000年1月1日からの経過ミリ秒をbase36でエンコードしたもの] + 長さ4の[個体ID] + 長さ4の[カウンタ]
+// (c) mei23
+// https://misskey.m544.net/notes/71899acdcc9859ec5708ac24
+
+import { customAlphabet } from 'nanoid';
+
+export const aidxRegExp = /^[0-9a-z]{16}$/;
+
+const TIME2000 = 946684800000;
+const TIME_LENGTH = 8;
+const NODE_LENGTH = 4;
+const NOISE_LENGTH = 4;
+
+const nodeId = customAlphabet('0123456789abcdefghijklmnopqrstuvwxyz', NODE_LENGTH)();
+let counter = 0;
+
+function getTime(time: number): string {
+	time = time - TIME2000;
+	if (time < 0) time = 0;
+
+	return time.toString(36).padStart(TIME_LENGTH, '0').slice(-TIME_LENGTH);
+}
+
+function getNoise(): string {
+	return counter.toString(36).padStart(NOISE_LENGTH, '0').slice(-NOISE_LENGTH);
+}
+
+export function genAidx(date: Date): string {
+	const t = date.getTime();
+	if (isNaN(t)) throw new Error('Failed to create AIDX: Invalid Date');
+	counter++;
+	return getTime(t) + nodeId + getNoise();
+}
+
+export function parseAidx(id: string): { date: Date; } {
+	const time = parseInt(id.slice(0, TIME_LENGTH), 36) + TIME2000;
+	return { date: new Date(time) };
+}
--- a/packages/backend/src/queue/processors/CleanProcessorService.ts
+++ b/packages/backend/src/queue/processors/CleanProcessorService.ts
@ -10,6 +10,7 @@ import type { AntennasRepository, MutedNotesRepository, RoleAssignmentsRepositor
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
+import type { Config } from '@/config.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';

@ -18,6 +19,9 @@ export class CleanProcessorService {
 	private logger: Logger;

 	constructor(
+		@Inject(DI.config)
+		private config: Config,
+
 		@Inject(DI.userIpsRepository)
 		private userIpsRepository: UserIpsRepository,

@ -54,12 +58,14 @@ export class CleanProcessorService {
 			reason: 'word',
 		});

-		// 7日以上使われてないアンテナを停止
-		this.antennasRepository.update({
-			lastUsedAt: LessThan(new Date(Date.now() - (1000 * 60 * 60 * 24 * 7))),
-		}, {
-			isActive: false,
-		});
+		// 使われてないアンテナを停止
+		if (this.config.deactivateAntennaThreshold > 0) {
+			this.antennasRepository.update({
+				lastUsedAt: LessThan(new Date(Date.now() - this.config.deactivateAntennaThreshold)),
+			}, {
+				isActive: false,
+			});
+		}

 		const expiredRoleAssignments = await this.roleAssignmentsRepository.createQueryBuilder('assign')
 			.where('assign.expiresAt IS NOT NULL')
--- a/packages/backend/test/unit/AnnouncementService.ts
+++ b/packages/backend/test/unit/AnnouncementService.ts
@ -12,7 +12,7 @@ import { GlobalModule } from '@/GlobalModule.js';
 import { AnnouncementService } from '@/core/AnnouncementService.js';
 import type { MiAnnouncement, AnnouncementsRepository, AnnouncementReadsRepository, UsersRepository, MiUser } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
-import { genAid } from '@/misc/id/aid.js';
+import { genAidx } from '@/misc/id/aidx.js';
 import { CacheService } from '@/core/CacheService.js';
 import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
@ -33,7 +33,7 @@ describe('AnnouncementService', () => {
 	function createUser(data: Partial<MiUser> = {}) {
 		const un = secureRndstr(16);
 		return usersRepository.insert({
-			id: genAid(new Date()),
+			id: genAidx(new Date()),
 			createdAt: new Date(),
 			username: un,
 			usernameLower: un,
@ -44,7 +44,7 @@ describe('AnnouncementService', () => {

 	function createAnnouncement(data: Partial<MiAnnouncement> = {}) {
 		return announcementsRepository.insert({
-			id: genAid(new Date()),
+			id: genAidx(new Date()),
 			createdAt: new Date(),
 			updatedAt: null,
 			title: 'Title',
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@ -14,7 +14,7 @@ import { RoleService } from '@/core/RoleService.js';
 import type { MiRole, RolesRepository, RoleAssignmentsRepository, UsersRepository, MiUser } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { MetaService } from '@/core/MetaService.js';
-import { genAid } from '@/misc/id/aid.js';
+import { genAidx } from '@/misc/id/aidx.js';
 import { CacheService } from '@/core/CacheService.js';
 import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
@ -37,7 +37,7 @@ describe('RoleService', () => {
 	function createUser(data: Partial<MiUser> = {}) {
 		const un = secureRndstr(16);
 		return usersRepository.insert({
-			id: genAid(new Date()),
+			id: genAidx(new Date()),
 			createdAt: new Date(),
 			username: un,
 			usernameLower: un,
@ -48,7 +48,7 @@ describe('RoleService', () => {

 	function createRole(data: Partial<MiRole> = {}) {
 		return rolesRepository.insert({
-			id: genAid(new Date()),
+			id: genAidx(new Date()),
 			createdAt: new Date(),
 			updatedAt: new Date(),
 			lastUsedAt: new Date(),
--- a/packages/backend/test/unit/misc/id.ts
+++ b/packages/backend/test/unit/misc/id.ts
@ -6,6 +6,7 @@
 import { ulid } from 'ulid';
 import { describe, test, expect } from '@jest/globals';
 import { aidRegExp, genAid, parseAid } from '@/misc/id/aid.js';
+import { aidxRegExp, genAidx, parseAidx } from '@/misc/id/aidx.js';
 import { genMeid, meidRegExp, parseMeid } from '@/misc/id/meid.js';
 import { genMeidg, meidgRegExp, parseMeidg } from '@/misc/id/meidg.js';
 import { genObjectId, objectIdRegExp, parseObjectId } from '@/misc/id/object-id.js';
@ -19,6 +20,13 @@ describe('misc:id', () => {
 		expect(parseAid(gotAid).date.getTime()).toBe(date.getTime());
 	});

+	test('aidx', () => {
+		const date = new Date();
+		const gotAidx = genAidx(date);
+		expect(gotAidx).toMatch(aidxRegExp);
+		expect(parseAidx(gotAidx).date.getTime()).toBe(date.getTime());
+	});
+
 	test('meid', () => {
 		const date = new Date();
 		const gotMeid = genMeid(date);
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@ -101,8 +101,6 @@
 		"@types/autosize": "^4.0.1",
 		"@types/escape-regexp": "0.0.1",
 		"@types/estree": "1.0.1",
-		"@types/gulp": "4.0.13",
-		"@types/gulp-rename": "2.0.2",
 		"@types/matter-js": "0.19.0",
 		"@types/micromatch": "4.0.2",
 		"@types/node": "20.5.9",
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@ -352,9 +352,15 @@ async function renote() {
 	const configuredVisibility = defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility;
 	const localOnly = defaultStore.state.rememberNoteVisibility ? defaultStore.state.localOnly : defaultStore.state.defaultNoteLocalOnly;

+	let visibility = appearNote.visibility;
+	visibility = smallerVisibility(visibility, configuredVisibility);
+	if (appearNote.channel?.isSensitive) {
+		visibility = smallerVisibility(visibility, 'home');
+	}
+
 	os.api('notes/create', {
 		localOnly,
-		visibility: smallerVisibility(appearNote.visibility, configuredVisibility),
+		visibility,
 		renoteId: appearNote.id,
 	}).then(() => {
 		os.noteToast(i18n.ts.renoted);
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/scripts/build-assets.mjs
+++ b/scripts/build-assets.mjs
@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey, cherrypick contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import cssnano from 'cssnano';
+import postcss from 'postcss';
+import * as terser from 'terser';
+
+import locales from '../locales/index.js';
+import meta from '../package.json' assert { type: "json" };
+
+async function copyFrontendFonts() {
+  await fs.cp('./packages/frontend/node_modules/three/examples/fonts', './built/_frontend_dist_/fonts', { dereference: true, recursive: true });
+}
+
+async function copyFrontendTablerIcons() {
+  await fs.cp('./packages/frontend/node_modules/@tabler/icons-webfont', './built/_frontend_dist_/tabler-icons', { dereference: true, recursive: true });
+}
+
+async function copyFrontendLocales() {
+  await fs.mkdir('./built/_frontend_dist_/locales', { recursive: true });
+
+  const v = { '_version_': meta.version };
+
+  for (const [lang, locale] of Object.entries(locales)) {
+    await fs.writeFile(`./built/_frontend_dist_/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
+  }
+}
+
+async function copyBackendViews() {
+  await fs.cp('./packages/backend/src/server/web/views', './packages/backend/built/server/web/views', { recursive: true });
+}
+
+async function buildBackendScript() {
+  await fs.mkdir('./packages/backend/built/server/web', { recursive: true });
+
+  for (const file of [
+    './packages/backend/src/server/web/boot.js',
+    './packages/backend/src/server/web/bios.js',
+    './packages/backend/src/server/web/cli.js'
+  ]) {
+    let source = await fs.readFile(file, { encoding: 'utf-8' });
+    source = source.replaceAll('LANGS', JSON.stringify(Object.keys(locales)));
+    const { code } = await terser.minify(source, { toplevel: true });
+    await fs.writeFile(`./packages/backend/built/server/web/${path.basename(file)}`, code);
+  }
+}
+
+async function buildBackendStyle() {
+  await fs.mkdir('./packages/backend/built/server/web', { recursive: true });
+
+  for (const file of [
+    './packages/backend/src/server/web/style.css',
+    './packages/backend/src/server/web/bios.css',
+    './packages/backend/src/server/web/cli.css',
+    './packages/backend/src/server/web/error.css'
+  ]) {
+    const source = await fs.readFile(file, { encoding: 'utf-8' });
+    const { css } = await postcss([cssnano({ zindex: false })]).process(source, { from: undefined });
+    await fs.writeFile(`./packages/backend/built/server/web/${path.basename(file)}`, css);
+  }
+}
+
+async function build() {
+  await Promise.all([
+    copyFrontendFonts(),
+    copyFrontendTablerIcons(),
+    copyFrontendLocales(),
+    copyBackendViews(),
+    buildBackendScript(),
+    buildBackendStyle(),
+  ]);
+}
+
+await build();
+
+if (process.argv.includes("--watch")) {
+  const watcher = fs.watch('./packages', { recursive: true });
+  for await (const event of watcher) {
+    if (/^[a-z]+\/src/.test(event.filename)) {
+      await build();
+    }
+  }
+}
--- a/scripts/dev.mjs
+++ b/scripts/dev.mjs
@ -23,7 +23,13 @@ await execa('pnpm', ['build-pre'], {
 	stderr: process.stderr,
 });

-execa('pnpm', ['exec', 'gulp', 'watch'], {
+await execa('pnpm', ['build-assets'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['build-assets', '--watch'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,