Merge pull request #16759 from misskey-dev/develop

Release: 2025.11.0

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "22.15.0"
+			"version": "24.10.0"
 		},
 		"ghcr.io/devcontainers-extra/features/pnpm:2": {
 			"version": "10.10.0"

.github/workflows/dockle.yml

@@ -13,20 +13,36 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_CONTENT_TRUST: 1
-      DOCKLE_VERSION: 0.4.14
+      DOCKLE_VERSION: 0.4.15
+
     steps:
       - uses: actions/checkout@v4.3.0
+
       - name: Download and install dockle v${{ env.DOCKLE_VERSION }}
         run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"
           sudo dpkg -i dockle.deb
+
       - run: |
           cp .config/docker_example.env .config/docker.env
           cp ./compose_example.yml ./compose.yml
+
       - run: |
           docker compose up -d web
-          docker tag "$(docker compose images --format json web | jq -r '.[] | .ID')" misskey-web:latest
+          IMAGE_ID=$(docker compose images --format json web | jq -r '.[0].ID')
-      - run: |
+          docker tag "${IMAGE_ID}" misskey-web:latest
-          cmd="dockle --exit-code 1 misskey-web:latest ${image_name}"
+
-          echo "> ${cmd}"
+      - name: Prune docker junk (optional but recommended)
-          eval "${cmd}"
+        run: |
+          docker system prune -af
+          docker volume prune -f
+
+      - name: Save image for Dockle
+        run: |
+          docker save misskey-web:latest -o ./misskey-web.tar
+          ls -lh ./misskey-web.tar
+
+      - name: Run Dockle with tar input
+        run: |
+          dockle --exit-code 1 --input ./misskey-web.tar
+

.github/workflows/lint.yml

@@ -96,6 +96,7 @@ jobs:
       matrix:
         workspace:
         - backend
+        - frontend
         - sw
         - misskey-js
     steps:
@@ -111,7 +112,9 @@ jobs:
         cache: 'pnpm'
     - run: pnpm i --frozen-lockfile
     - run: pnpm --filter misskey-js run build
-      if: ${{ matrix.workspace == 'backend' || matrix.workspace == 'sw' }}
+      if: ${{ matrix.workspace == 'backend' || matrix.workspace == 'frontend' || matrix.workspace == 'sw' }}
     - run: pnpm --filter misskey-reversi run build
-      if: ${{ matrix.workspace == 'backend' }}
+      if: ${{ matrix.workspace == 'backend' || matrix.workspace == 'frontend' }}
+    - run: pnpm --filter misskey-bubble-game run build
+      if: ${{ matrix.workspace == 'frontend' }}
     - run: pnpm --filter ${{ matrix.workspace }} run typecheck

.node-version

@@ -1 +1 @@
-22.15.0
+24.10.0

CHANGELOG.md

@@ -1,3 +1,34 @@
+## 2025.11.0
+
+### General
+- Feat: チャンネルミュート機能の実装 #10649
+	- チャンネルの概要画面の右上からミュートできます（リンクコピー、共有、設定と同列）
+- Enhance: Node.js 24.10.0をサポートするようになりました
+- Enhance: DockerのNode.jsが24.10.0に更新されました
+- 依存関係の更新
+
+### Client
+- Feat: 画像にメタデータを含むフレームをつけられる機能
+- Enhance: プリセットを作成しなくても画像にウォーターマークを付与できるように
+- Enhance: 管理しているチャンネルの見分けがつきやすくなるように
+- Enhance: プロフィールへのリンクをユーザーポップアップのアバターに追加
+- Enhance: ユーザーのノート、フォロー、フォロワーページへのリンクをユーザーポップアップに追加
+- Enhance: プッシュ通知を行うための権限確認をより確実に行うように
+- Enhance: 投稿フォームのチュートリアルを追加
+- Enhance: 「自動でもっと見る」をほとんどの箇所で利用可能に
+- Enhance: アンテナ・リスト設定画面とタイムラインの動線を改善
+	- アンテナ・リスト一覧画面の項目を選択すると、設定画面ではなくタイムラインに移動するようになりました
+	- アンテナ・リストの設定画面の右上にタイムラインに移動するボタンを追加しました
+- Fix: 紙吹雪エフェクトがアニメーション設定を考慮せず常に表示される問題を修正
+- Fix: ナビゲーションバーのリアルタイムモード切替ボタンの状態をよりわかりやすく表示するように
+- Fix: ページのタイトルが長いとき、はみ出る問題を修正
+- Fix: 投稿フォームのアバターが正しく表示されない問題を修正 #16789
+- FIx: カスタム絵文字(β)画面で変更行が正しくハイライトされない問題を修正 #16626
+
+### Server
+- Enhance: Remote Notes Cleaningが複雑度が高いノートの処理を中断せずに次のノートから再開するように
+- Fix: チャンネルの説明欄の最小文字数制約を除去
+
 ## 2025.10.2
 
 ### Client

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=22.15.0-bookworm
+ARG NODE_VERSION=24.10.0-bookworm
 
 # build assets & compile TypeScript
 

ROADMAP.md

@@ -6,7 +6,7 @@ Also, the later tasks are more indefinite and are subject to change as developme
 This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
 
 - ~~Make the number of type errors zero (backend)~~ → Done ✔️
-- Make the number of type errors zero (frontend)
+- ~~Make the number of type errors zero (frontend)~~ → Done ✔️
 - Improve CI
 	- ~~Fix tests~~ → Done ✔️
 	- Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986

locales/ar-SA.yml

@@ -1011,6 +1011,14 @@ information: "عن"
 inMinutes: "د"
 inDays: "ي"
 widgets: "التطبيقات المُصغّرة"
+presets: "إعدادات مسبقة"
+_imageEditing:
+  _vars:
+    filename: "اسم الملف"
+_imageFrameEditor:
+  font: "الخط"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _chat:
   invitations: "دعوة"
   noHistory: "السجل فارغ"
@@ -1397,6 +1405,9 @@ _postForm:
   replyPlaceholder: "رد على هذه الملاحظة…"
   quotePlaceholder: "اقتبس هذه الملاحظة…"
   channelPlaceholder: "انشر في قناة..."
+  _howToUse:
+    visibility_title: "الظهور"
+    menu_title: "القائمة"
   _placeholders:
     a: "ما الذي تنوي فعله؟"
     b: "ماذا يحدث حولك ؟"

locales/bn-BD.yml

@@ -851,6 +851,14 @@ information: "আপনার সম্পর্কে"
 inMinutes: "মিনিট"
 inDays: "দিন"
 widgets: "উইজেটগুলি"
+_imageEditing:
+  _vars:
+    filename: "ফাইলের নাম"
+_imageFrameEditor:
+  header: "হেডার"
+  font: "ফন্ট"
+  fontSerif: "সেরিফ"
+  fontSansSerif: "স্যান্স সেরিফ"
 _chat:
   invitations: "আমন্ত্রণ"
   noHistory: "কোনো ইতিহাস নেই"
@@ -1169,6 +1177,9 @@ _postForm:
   replyPlaceholder: "নোটটির জবাব দিন..."
   quotePlaceholder: "নোটটিকে উদ্ধৃত করুন..."
   channelPlaceholder: "চ্যানেলে পোস্ট করুন..."
+  _howToUse:
+    visibility_title: "দৃশ্যমানতা"
+    menu_title: "মেনু"
   _placeholders:
     a: "আপনি এখন কি করছেন?"
     b: "আপনার আশে পাশে কি হচ্ছে?"

locales/ca-ES.yml

@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "La càrrega des de l'enllaç pot trigar un temps"
 uploadNFiles: "Pujar {n} arxius"
 explore: "Explora"
 messageRead: "Vist"
+readAllChatMessages: "Marcar tots els missatges com a llegits"
 noMoreHistory: "No hi ha res més per veure"
 startChat: "Comença a xatejar "
 nUsersRead: "Vist per {n}"
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "L'enviament de notificacions ja és activat"
 pushNotificationNotSupported: "El teu navegador o la teva instància no suporta l'enviament de notificacions "
 sendPushNotificationReadMessage: "Esborrar les notificacions enviades quan s'hagin llegit"
 sendPushNotificationReadMessageCaption: "Això pot fer que el teu dispositiu consumeixi més bateria"
+pleaseAllowPushNotification: "Si us plau, permet les notificacions del navegador"
+browserPushNotificationDisabled: "No s'ha pogut obtenir permisos per les notificacions"
+browserPushNotificationDisabledDescription: "No tens permisos per enviar notificacions des de {serverName}. Activa les notificacions a la configuració del teu navegador i tornar-ho a intentar."
 windowMaximize: "Maximitzar "
 windowMinimize: "Minimitzar"
 windowRestore: "Restaurar"
@@ -1396,6 +1400,50 @@ scheduled: "Programat"
 widgets: "Ginys"
 deviceInfo: "Informació del dispositiu"
 deviceInfoDescription: "En fer consultes tècniques influir la següent informació pot ajudar a resoldre'l més ràpidament."
+youAreAdmin: "Ets l'administrador "
+frame: "Marc"
+presets: "Predefinit"
+zeroPadding: "Sense omplir"
+_imageEditing:
+  _vars:
+    caption: "Títol de l'arxiu"
+    filename: "Nom del Fitxer"
+    filename_without_ext: "Nom de l'arxiu sense extensió "
+    year: "Any"
+    month: "Mes"
+    day: "Dia"
+    hour: "Hora"
+    minute: "Minut"
+    second: "Segon"
+    camera_model: "Nom de la càmera "
+    camera_lens_model: "Nom de la lent"
+    camera_mm: "Distància focal"
+    camera_mm_35: "Distància focal (equivalent a 35 mm)"
+    camera_f: "Obertura"
+    camera_s: "Velocitat d'obturació"
+    camera_iso: "Sensibilitat ISO"
+    gps_lat: "Latitud "
+    gps_long: "Longitud "
+_imageFrameEditor:
+  title: "Edició de fotogrames "
+  tip: "Pots decorar les imatges afegint etiquetes que continguin marcs i metadades."
+  header: "Capçalera"
+  footer: "Peu de pàgina "
+  borderThickness: "Amplada de la vora"
+  labelThickness: "Amplada de l'etiqueta "
+  labelScale: "Mida de l'etiqueta "
+  centered: "Alinea al centre"
+  captionMain: "Peu de foto (gran)"
+  captionSub: "Peu de foto (petit)"
+  availableVariables: "Variables disponibles"
+  withQrCode: "Codi QR"
+  backgroundColor: "Color del fons"
+  textColor: "Color del text"
+  font: "Lletra tipogràfica"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "Sortir sense desar?"
+  failedToLoadImage: "Error en carregar la imatge"
 _compression:
   _quality:
     high: "Qualitat alta"
@@ -1498,6 +1546,8 @@ _settings:
   showUrlPreview: "Mostrar vista prèvia d'URL"
   showAvailableReactionsFirstInNote: "Mostra les reacciones que pots fer servir al damunt"
   showPageTabBarBottom: "Mostrar les pestanyes de les línies de temps a la part inferior"
+  emojiPaletteBanner: "Pots registrar ajustos preestablerts com paletes perquè es mostrin permanentment al selector d'emojis, o personalitzar la configuració de visió del selector."
+  enableAnimatedImages: "Activar imatges animades"
   _chat:
     showSenderName: "Mostrar el nom del remitent"
     sendOnEnter: "Introdueix per enviar"
@@ -1506,6 +1556,8 @@ _preferencesProfile:
   profileNameDescription: "Estableix un nom que identifiqui aquest dispositiu."
   profileNameDescription2: "Per exemple: \"PC Principal\", \"Smartphone\", etc"
   manageProfiles: "Gestionar perfils"
+  shareSameProfileBetweenDevicesIsNotRecommended: "No recomanem compartir el mateix perfil en diferents dispositius."
+  useSyncBetweenDevicesOptionIfYouWantToSyncSetting: "Si hi ha ajustos que vols sincronitzar entre diferents dispositius activa l'opció \"Sincronitza entre diferents dispositius\" individualment per cada una de les diferents opcions."
 _preferencesBackup:
   autoBackup: "Còpia de seguretat automàtica "
   restoreFromBackup: "Restaurar des d'una còpia de seguretat"
@@ -1515,6 +1567,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "Has de posar-li un nom al teu perfil per poder activar les còpies de seguretat automàtiques."
   autoPreferencesBackupIsNotEnabledForThisDevice: "La còpia de seguretat automàtica no es troba activada en aquest dispositiu."
   backupFound: "Còpia de seguretat de la configuració trobada"
+  forceBackup: "Còpia de seguretat forçada de la configuració "
 _accountSettings:
   requireSigninToViewContents: "És obligatori l'inici de sessió per poder veure el contingut"
   requireSigninToViewContentsDescription1: "Es requereix l'inici de sessió per poder veure totes les notes i el contingut que has creat. Amb això esperem evitar que els rastrejadors recopilin informació."
@@ -2530,6 +2583,20 @@ _postForm:
   replyPlaceholder: "Contestar..."
   quotePlaceholder: "Citar..."
   channelPlaceholder: "Publicar a un canal..."
+  showHowToUse: "Mostrar les instruccions"
+  _howToUse:
+    content_title: "Cos principal"
+    content_description: "Introdueix el contingut que vols publicar."
+    toolbar_title: "Barra d'eines "
+    toolbar_description: "Pots adjuntar arxius o enquestes, afegir anotacions o etiquetes i inserir emojis o mencions."
+    account_title: "Menú del compte"
+    account_description: "Pots anar canviant de comptes per publicar o veure una llista d'esborranys i les publicacions programades del teu compte."
+    visibility_title: "Visibilitat"
+    visibility_description: "Pots configurar la visibilitat de les teves notes."
+    menu_title: "Menú"
+    menu_description: "Pots fer altres accions com desar esborranys, programar publicacions i configurar reaccions."
+    submit_title: "Botó per publicar"
+    submit_description: "Publica les teves notes. També pots fer servir Ctrl + Enter / Cmd + Enter"
   _placeholders:
     a: "Que vols dir?..."
     b: "Alguna cosa interessant al teu voltant?..."
@@ -2807,6 +2874,8 @@ _abuseReport:
     notifiedWebhook: "Webhook que s'ha de fer servir"
     deleteConfirm: "Segur que vols esborrar el destinatari de l'informe de moderació?"
 _moderationLogTypes:
+  clearQueue: "Esborra la cua de feina"
+  promoteQueue: "Tornar a intentar la feina de la cua"
   createRole: "Rol creat"
   deleteRole: "Rol esborrat"
   updateRole: "Rol actualitzat"
@@ -3223,11 +3292,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "Mida del lunar secundari"
   polkadotSubDotDivisions: "Nombre de punts secundaris"
   leaveBlankToAccountUrl: "Si deixes aquest camp buit, es farà servir l'URL del teu compte"
+  failedToLoadImage: "Error en carregar la imatge"
 _imageEffector:
   title: "Efecte"
   addEffect: "Afegeix un efecte"
   discardChangesConfirm: "Vols descartar els canvis i sortir?"
   nothingToConfigure: "No hi ha opcions de configuració disponibles"
+  failedToLoadImage: "Error en carregar la imatge"
   _fxs:
     chromaticAberration: "Aberració cromàtica"
     glitch: "Glitch"

locales/cs-CZ.yml

@@ -1110,6 +1110,15 @@ information: "Informace"
 inMinutes: "Minut"
 inDays: "Dnů"
 widgets: "Widgety"
+presets: "Předvolba"
+_imageEditing:
+  _vars:
+    filename: "Název souboru"
+_imageFrameEditor:
+  header: "Nadpis"
+  font: "Písmo"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _chat:
   invitations: "Pozvat"
   noHistory: "Žádná historie"
@@ -1822,6 +1831,9 @@ _postForm:
   replyPlaceholder: "Odpovědět na tuto poznámku..."
   quotePlaceholder: "Citovat tuto poznámku..."
   channelPlaceholder: "Zveřejnit příspěvek do kanálu..."
+  _howToUse:
+    visibility_title: "Viditelnost"
+    menu_title: "Menu"
   _placeholders:
     a: "Co máte v plánu?"
     b: "Co se děje kolem vás?"

locales/de-DE.yml

@@ -1371,6 +1371,16 @@ defaultImageCompressionLevel_description: "Ein niedrigerer Wert erhält die Bild
 inMinutes: "Minute(n)"
 inDays: "Tag(en)"
 widgets: "Widgets"
+presets: "Vorlage"
+_imageEditing:
+  _vars:
+    filename: "Dateiname"
+_imageFrameEditor:
+  header: "Kopfzeile"
+  font: "Schriftart"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "Nicht gespeicherte Änderungen verwerfen?"
 _order:
   newest: "Neueste zuerst"
   oldest: "Älteste zuerst"
@@ -2480,6 +2490,9 @@ _postForm:
   replyPlaceholder: "Dieser Notiz antworten …"
   quotePlaceholder: "Diese Notiz zitieren …"
   channelPlaceholder: "In einen Kanal senden"
+  _howToUse:
+    visibility_title: "Sichtbarkeit"
+    menu_title: "Menü"
   _placeholders:
     a: "Was machst du momentan?"
     b: "Was ist um dich herum los?"

locales/el-GR.yml

@@ -289,6 +289,9 @@ renotes: "Κοινοποίηση σημειώματος"
 postForm: "Φόρμα δημοσίευσης"
 information: "Πληροφορίες"
 widgets: "Μαραφέτια"
+_imageEditing:
+  _vars:
+    filename: "Όνομα αρχείου"
 _chat:
   members: "Μέλη"
   home: "Κεντρικό"

locales/en-US.yml

@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "It may take some time until the upload is complete."
 uploadNFiles: "Upload {n} files"
 explore: "Explore"
 messageRead: "Read"
+readAllChatMessages: "Mark all messages as read"
 noMoreHistory: "There is no further history"
 startChat: "Start chat"
 nUsersRead: "read by {n}"
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "Push notifications are already enabled"
 pushNotificationNotSupported: "Your browser or instance does not support push notifications"
 sendPushNotificationReadMessage: "Delete push notifications once they have been read"
 sendPushNotificationReadMessageCaption: "This may increase the power consumption of your device."
+pleaseAllowPushNotification: "Please enable push notifications in your browser"
+browserPushNotificationDisabled: "Failed to acquire permission to send notifications"
+browserPushNotificationDisabledDescription: "You do not have permission to send notifications from {serverName}. Please allow notifications in your browser settings and try again."
 windowMaximize: "Maximize"
 windowMinimize: "Minimize"
 windowRestore: "Restore"
@@ -1396,6 +1400,50 @@ scheduled: "Scheduled"
 widgets: "Widgets"
 deviceInfo: "Device information"
 deviceInfoDescription: "When making technical inquiries, including the following information may help resolve the issue."
+youAreAdmin: "You are admin"
+frame: "Frame"
+presets: "Preset"
+zeroPadding: "Zero padding"
+_imageEditing:
+  _vars:
+    caption: "File caption"
+    filename: "Filename"
+    filename_without_ext: "Filename without extension"
+    year: "Year of photography"
+    month: "Month of photogrphy"
+    day: "Date of photography"
+    hour: "Time the photo was taken (hour)"
+    minute: "Time the photo was taken (minute)"
+    second: "Time the photo was taken (second)"
+    camera_model: "Camera Name"
+    camera_lens_model: "Lens model"
+    camera_mm: "Focal length"
+    camera_mm_35: "Focal length (in 35 mm format)"
+    camera_f: "Aperture (f-number)"
+    camera_s: "Shutter speed"
+    camera_iso: "ISO"
+    gps_lat: "Latitude"
+    gps_long: "Longitude"
+_imageFrameEditor:
+  title: "Edit frame"
+  tip: "You can decorate images by adding labels that include frames and metadata."
+  header: "Header"
+  footer: "Footer"
+  borderThickness: "Frame width"
+  labelThickness: "Label width"
+  labelScale: "Label scale"
+  centered: "Centered"
+  captionMain: "Caption (Big)"
+  captionSub: "Caption (Small)"
+  availableVariables: "Supported variables"
+  withQrCode: "QR Code"
+  backgroundColor: "Background color"
+  textColor: "Text color"
+  font: "Font"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "Discard unsaved changes?"
+  failedToLoadImage: "Failed to load image"
 _compression:
   _quality:
     high: "High quality"
@@ -1498,6 +1546,8 @@ _settings:
   showUrlPreview: "Show URL preview"
   showAvailableReactionsFirstInNote: "Show available reactions at the top."
   showPageTabBarBottom: "Show page tab bar at the bottom"
+  emojiPaletteBanner: "You can register presets as palettes to display prominently in the emoji picker or customize the appearance of the picker."
+  enableAnimatedImages: "Enable animated images"
   _chat:
     showSenderName: "Show sender's name"
     sendOnEnter: "Press Enter to send"
@@ -1515,6 +1565,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "A profile name must be set to enable auto backup."
   autoPreferencesBackupIsNotEnabledForThisDevice: "Settings auto backup is not enabled on this device."
   backupFound: "Settings backup is found"
+  forceBackup: "Force a backup of settings"
 _accountSettings:
   requireSigninToViewContents: "Require sign-in to view contents"
   requireSigninToViewContentsDescription1: "Require login to view all notes and other content you have created. This will have the effect of preventing crawlers from collecting your information."
@@ -2530,6 +2581,20 @@ _postForm:
   replyPlaceholder: "Reply to this note..."
   quotePlaceholder: "Quote this note..."
   channelPlaceholder: "Post to a channel..."
+  showHowToUse: "Show how to use this form"
+  _howToUse:
+    content_title: "Body"
+    content_description: "Enter the content you wish to post here."
+    toolbar_title: "Toolbars"
+    toolbar_description: "You can attach files or poll, add annotations or hashtags, and insert emojis or mentions."
+    account_title: "Account menu"
+    account_description: "You can switch between accounts for posting, or view a list of drafts and scheduled posts saved to your account."
+    visibility_title: "Visibility"
+    visibility_description: "You can configure the visibility of your notes."
+    menu_title: "Menu"
+    menu_description: "You can save current content to drafts, schedule posts, set reactions, and perform other actions."
+    submit_title: "Post button"
+    submit_description: "Post your notes by pressing this button. You can also post using Ctrl + Enter / Cmd + Enter."
   _placeholders:
     a: "What are you up to?"
     b: "What's happening around you?"
@@ -2807,6 +2872,8 @@ _abuseReport:
     notifiedWebhook: "Webhook to use"
     deleteConfirm: "Are you sure that you want to delete the notification recipient?"
 _moderationLogTypes:
+  clearQueue: "Clear queue"
+  promoteQueue: "Promote queue"
   createRole: "Role created"
   deleteRole: "Role deleted"
   updateRole: "Role updated"
@@ -3223,11 +3290,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "Size of the secondary dot"
   polkadotSubDotDivisions: "Number of sub-dots."
   leaveBlankToAccountUrl: "Leave blank to use account URL"
+  failedToLoadImage: "Failed to load image"
 _imageEffector:
   title: "Effects"
   addEffect: "Add Effects"
   discardChangesConfirm: "Are you sure you want to leave? You have unsaved changes."
   nothingToConfigure: "No configurable options available"
+  failedToLoadImage: "Failed to load image"
   _fxs:
     chromaticAberration: "Chromatic Aberration"
     glitch: "Glitch"

locales/es-ES.yml

@@ -5,7 +5,7 @@ introMisskey: "¡Bienvenido/a! Misskey es un servicio de microblogging descentra
 poweredByMisskeyDescription: "{name} es uno de los servicios (también llamado instancia) que usa la plataforma de código abierto <b>Misskey</b>"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
-reset: "Reiniciar"
+reset: "Restablecer"
 notifications: "Notificaciones"
 username: "Nombre de usuario"
 password: "Contraseña"
@@ -43,7 +43,7 @@ favorite: "Añadir a favoritos"
 favorites: "Favoritos"
 unfavorite: "Quitar de favoritos"
 favorited: "Añadido a favoritos."
-alreadyFavorited: "Ya había sido añadido a favoritos"
+alreadyFavorited: "Ya añadido a favoritos."
 cantFavorite: "No se puede añadir a favoritos."
 pin: "Fijar al perfil"
 unpin: "Desfijar"
@@ -87,7 +87,7 @@ exportRequested: "Has solicitado la exportación. Puede llevar un tiempo. Cuando
 importRequested: "Has solicitado la importación. Puede llevar un tiempo."
 lists: "Listas"
 noLists: "No tienes ninguna lista"
-note: "Notas"
+note: "Nota"
 notes: "Notas"
 following: "Siguiendo"
 followers: "Seguidores"
@@ -129,7 +129,7 @@ clickToShow: "Haz clic para verlo"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
-reactions: "Reacción"
+reactions: "Reacciones"
 emojiPicker: "Selector de emojis"
 pinnedEmojisForReactionSettingDescription: "Puedes seleccionar reacciones para fijarlos en el selector"
 pinnedEmojisSettingDescription: "Puedes seleccionar emojis para fijarlos en el selector"
@@ -251,7 +251,7 @@ noUsers: "No hay usuarios"
 editProfile: "Editar perfil"
 noteDeleteConfirm: "¿Quieres borrar esta nota?"
 pinLimitExceeded: "Ya no se pueden fijar más notas"
-done: "Terminado"
+done: "Hecho"
 processing: "Procesando..."
 preprocessing: "Preparando"
 preview: "Vista previa"
@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "Subir el fichero puede tardar un tiempo."
 uploadNFiles: "Subir {n} archivos"
 explore: "Explorar"
 messageRead: "Ya leído"
+readAllChatMessages: "Marcar todos los mensajes como leídos"
 noMoreHistory: "El historial se ha acabado"
 startChat: "Nuevo Chat"
 nUsersRead: "Leído por {n} personas"
@@ -915,7 +916,7 @@ lastCommunication: "Última comunicación"
 resolved: "Resuelto"
 unresolved: "Sin resolver"
 breakFollow: "Eliminar seguidor"
-breakFollowConfirm: "¿Quieres dejar de seguir?"
+breakFollowConfirm: "¿De verdad quieres eliminar a este seguidor?"
 itsOn: "¡Está encendido!"
 itsOff: "¡Está apagado!"
 on: "Activado"
@@ -985,7 +986,7 @@ typeToConfirm: "Ingrese {x} para confirmar"
 deleteAccount: "Borrar cuenta"
 document: "Documento"
 numberOfPageCache: "Cantidad de páginas cacheadas"
-numberOfPageCacheDescription: "Al aumentar el número mejora la conveniencia pero tambien puede aumentar la carga y la memoria a usarse"
+numberOfPageCacheDescription: "Al aumentar el número mejora la conveniencia pero también puede aumentar la carga y la memoria a usarse"
 logoutConfirm: "¿Cerrar sesión?"
 logoutWillClearClientData: "Al cerrar la sesión, la información de configuración del cliente se borra del navegador. Para garantizar que la información de configuración se pueda restaurar al volver a iniciar sesión, active la copia de seguridad automática de la configuración."
 lastActiveDate: "Utilizado por última vez el"
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "Notificaciones emergentes ya activadas"
 pushNotificationNotSupported: "El navegador o la instancia no admiten notificaciones push"
 sendPushNotificationReadMessage: "Eliminar las notificaciones push después de leer las notificaciones y los mensajes"
 sendPushNotificationReadMessageCaption: "La notificación \"{emptyPushNotificationMessage}\" aparecerá momentáneamente. Esto puede aumentar el consumo de batería del dispositivo."
+pleaseAllowPushNotification: "Por favor, permita las notificaciones y la configuración del navegador."
+browserPushNotificationDisabled: "No se ha podido obtener permiso para enviar notificaciones."
+browserPushNotificationDisabledDescription: "No tienes permiso para enviar notificaciones desde {serverName}. Permite las notificaciones en la configuración de tu navegador y vuelve a intentarlo."
 windowMaximize: "Maximizar"
 windowMinimize: "Minimizar"
 windowRestore: "Regresar"
@@ -1153,7 +1157,7 @@ initialAccountSetting: "Configración inicial de su cuenta"
 youFollowing: "Siguiendo"
 preventAiLearning: "Rechazar el uso en el Aprendizaje de Máquinas. (IA Generativa)"
 preventAiLearningDescription: "Pedirle a las arañas (crawlers) no usar los textos publicados o imágenes en el aprendizaje automático (IA Predictiva / Generativa). Ésto se logra añadiendo una marca respuesta HTML con la cadena \"noai\" al cantenido. Una prevención total no podría lograrse sólo usando ésta marca, ya que puede ser simplemente ignorada."
-options: "Opción"
+options: "Opciones"
 specifyUser: "Especificar usuario"
 lookupConfirm: "¿Quiere informarse?"
 openTagPageConfirm: "¿Quieres abrir la página de etiquetas?"
@@ -1263,7 +1267,7 @@ addMfmFunction: "Añadir función MFM"
 enableQuickAddMfmFunction: "Activar acceso rápido para añadir funciones MFM"
 bubbleGame: "Bubble Game"
 sfx: "Efectos de sonido"
-soundWillBePlayed: "Se reproducirán efectos sonoros"
+soundWillBePlayed: "Con música y efectos sonoros"
 showReplay: "Ver reproducción"
 replay: "Reproducir"
 replaying: "Reproduciendo"
@@ -1390,12 +1394,56 @@ thankYouForTestingBeta: "¡Gracias por tu colaboración en la prueba de la versi
 createUserSpecifiedNote: "Mencionar al usuario (Nota Directa)"
 schedulePost: "Programar una nota"
 scheduleToPostOnX: "Programar una nota para {x}"
-scheduledToPostOnX: "La nota está programada para {x}."
+scheduledToPostOnX: "La nota está programada para el {x}."
-schedule: "Programado"
+schedule: "Programar"
 scheduled: "Programado"
 widgets: "Widgets"
 deviceInfo: "Información del dispositivo"
 deviceInfoDescription: "Al realizar consultas técnicas, incluir la siguiente información puede ayudar a resolver el problema."
+youAreAdmin: "Eres administrador."
+frame: "Marco"
+presets: "Predefinido"
+zeroPadding: "Relleno cero"
+_imageEditing:
+  _vars:
+    caption: "Título del archivo"
+    filename: "Nombre de archivo"
+    filename_without_ext: "Nombre del archivo sin la extensión"
+    year: "Año de rodaje"
+    month: "Mes de rodaje"
+    day: "Día de rodaje"
+    hour: "Hora"
+    minute: "Minuto"
+    second: "Segundo"
+    camera_model: "Nombre de la cámara"
+    camera_lens_model: "Modelo de lente"
+    camera_mm: "Distancia focal"
+    camera_mm_35: "Distancia Focal (Equivalente a formato de 35mm)"
+    camera_f: "Apertura de diafragma"
+    camera_s: "Velocidad de Obturación"
+    camera_iso: "Sensibilidad ISO"
+    gps_lat: "Latitud"
+    gps_long: "Longitud"
+_imageFrameEditor:
+  title: "Edición de Fotograma"
+  tip: "Decora tus imágenes con marcos y etiquetas que contengan metadatos."
+  header: "Cabezal"
+  footer: "Pie de página"
+  borderThickness: "Ancho del borde"
+  labelThickness: "Ancho de la etiqueta"
+  labelScale: "Escala de la Etiqueta"
+  centered: "Alinear al centro"
+  captionMain: "Pie de foto (Grande)"
+  captionSub: "Pie de foto (Pequeño)"
+  availableVariables: "Variables disponibles"
+  withQrCode: "Código QR"
+  backgroundColor: "Color de fondo"
+  textColor: "Color del texto"
+  font: "Fuente"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "¿Descartar cambios no guardados?"
+  failedToLoadImage: "Error al cargar la imagen"
 _compression:
   _quality:
     high: "Calidad alta"
@@ -1498,6 +1546,8 @@ _settings:
   showUrlPreview: "Mostrar la vista previa de la URL"
   showAvailableReactionsFirstInNote: "Mostrar las reacciones disponibles en la parte superior."
   showPageTabBarBottom: "Mostrar la barra de pestañas de la página en la parte inferior."
+  emojiPaletteBanner: "Puedes registrar ajustes preestablecidos como paletas para que se muestren permanentemente en el selector de emojis, o personalizar el método de visualización del selector."
+  enableAnimatedImages: "Habilitar imágenes animadas"
   _chat:
     showSenderName: "Mostrar el nombre del remitente"
     sendOnEnter: "Intro para enviar"
@@ -1506,6 +1556,8 @@ _preferencesProfile:
   profileNameDescription: "Establece un nombre que identifique al dispositivo"
   profileNameDescription2: "Por ejemplo: \"PC Principal\",\"Teléfono\""
   manageProfiles: "Administrar perfiles"
+  shareSameProfileBetweenDevicesIsNotRecommended: "No recomendamos compartir el mismo perfil en varios dispositivos."
+  useSyncBetweenDevicesOptionIfYouWantToSyncSetting: "Si hay ajustes que deseas sincronizar en varios dispositivos, activa la opción «Sincronizar en varios dispositivos» individualmente para cada uno de ellos."
 _preferencesBackup:
   autoBackup: "Respaldo automático"
   restoreFromBackup: "Restaurar desde copia de seguridad"
@@ -1515,6 +1567,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "Se debe establecer un nombre de perfil para activar la copia de seguridad automática."
   autoPreferencesBackupIsNotEnabledForThisDevice: "La copia de seguridad automática de los ajustes no está activada en este dispositivo."
   backupFound: "Copia de seguridad de los ajustes encontrada "
+  forceBackup: "Forzar una copia de seguridad de la configuración"
 _accountSettings:
   requireSigninToViewContents: "Se requiere iniciar sesión para ver el contenido"
   requireSigninToViewContentsDescription1: "Requiere iniciar sesión para ver todas las notas y otros contenidos que hayas creado. Se espera que esto evite que los rastreadores recopilen información."
@@ -1552,7 +1605,7 @@ _bubbleGame:
     score: "Puntos"
     scoreYen: "Cantidad de dinero ganada"
     highScore: "Puntuación más alta"
-    maxChain: "Número máximo de cadenas"
+    maxChain: "Número máximo de combos"
     yen: "{yen} Yenes"
     estimatedQty: "{qty} Piezas"
     scoreSweets: "{onigiriQtyWithUnit} Onigiris"
@@ -1986,7 +2039,7 @@ _role:
   isConditionalRole: "Esto es un rol condicional"
   isPublic: "Publicar rol"
   descriptionOfIsPublic: "Cualquiera puede ver los usuarios asignados a este rol. También, el perfil del usuario mostrará este rol."
-  options: "Opción"
+  options: "Opciones"
   policies: "Política"
   baseRole: "Rol base"
   useBaseValue: "Usar los valores del rol base"
@@ -2097,7 +2150,7 @@ _accountDelete:
   accountDelete: "Eliminar Cuenta"
   mayTakeTime: "La eliminación de la cuenta es un proceso que precisa de carga. Puede pasar un tiempo hasta que se complete si es mucho el contenido creado y los archivos subidos."
   sendEmail: "Cuando se termine de borrar la cuenta, se enviará un correo a la dirección usada para el registro."
-  requestAccountDelete: "Pedir la eliminación de la cuenta."
+  requestAccountDelete: "Solicitar la eliminación de la cuenta."
   started: "El proceso de eliminación ha comenzado."
   inProgress: "La eliminación está en proceso."
 _ad:
@@ -2470,7 +2523,7 @@ _widgets:
   digitalClock: "Reloj digital"
   unixClock: "Reloj UNIX"
   federation: "Federación"
-  instanceCloud: "Nube de palabras de la instancia"
+  instanceCloud: "Nube de Instancias Federadas"
   postForm: "Formulario"
   slideshow: "Diapositivas"
   button: "Botón"
@@ -2495,7 +2548,7 @@ _poll:
   noOnlyOneChoice: "Se necesitan al menos 2 opciones"
   choiceN: "Opción {n}"
   noMore: "No se pueden agregar más"
-  canMultipleVote: "Permitir más de una respuesta"
+  canMultipleVote: "Permitir seleccionar varias opciones"
   expiration: "Termina el"
   infinite: "Sin límite de tiempo"
   at: "Elegir fecha y hora"
@@ -2530,6 +2583,20 @@ _postForm:
   replyPlaceholder: "Responder a esta nota"
   quotePlaceholder: "Citar esta nota"
   channelPlaceholder: "Publicar en el canal"
+  showHowToUse: "Mostrar el tutorial  de este formulario"
+  _howToUse:
+    content_title: "Cuerpo"
+    content_description: "Introduce aquí el contenido que deseas publicar."
+    toolbar_title: "Barras de herramientas"
+    toolbar_description: "Puedes adjuntar archivos o realizar encuestas, añadir anotaciones o hashtags e insertar emojis o menciones."
+    account_title: "Menú de la cuenta"
+    account_description: "Puedes cambiar entre cuentas para publicar o ver una lista de borradores y publicaciones programadas guardadas en tu cuenta."
+    visibility_title: "Visibilidad"
+    visibility_description: "Puedes configurar la visibilidad de tus notas."
+    menu_title: "Menú"
+    menu_description: "Puedes realizar otras acciones, como guardar borradores, programar publicaciones y configurar reacciones."
+    submit_title: "Botón de publicar"
+    submit_description: "Publica tus notas pulsando este botón. También puedes publicar utilizando Ctrl + Intro / Cmd + Intro."
   _placeholders:
     a: "¿Qué haces?"
     b: "¿Te pasó algo?"
@@ -2564,7 +2631,7 @@ _exportOrImport:
   userLists: "Listas"
   excludeMutingUsers: "Excluir usuarios silenciados"
   excludeInactiveUsers: "Excluir usuarios inactivos"
-  withReplies: "Incluir respuestas de los usuarios importados en la línea de tiempo"
+  withReplies: "Si el archivo no incluye información sobre si las respuestas deben incluirse en la línea de tiempo, las respuestas realizadas por el importador deben incluirse en la línea de tiempo."
 _charts:
   federation: "Federación"
   apRequest: "Pedidos"
@@ -2807,6 +2874,8 @@ _abuseReport:
     notifiedWebhook: "Webhook a utilizar"
     deleteConfirm: "¿Estás seguro de que deseas borrar el destinatario del informe de moderación?"
 _moderationLogTypes:
+  clearQueue: "Borrar la cola de trabajos"
+  promoteQueue: "Reintentar el trabajo en la cola"
   createRole: "Rol creado"
   deleteRole: "Rol eliminado"
   updateRole: "Rol actualizado"
@@ -2959,7 +3028,7 @@ _reversi:
   loopedMap: "Mapa en bucle"
   canPutEverywhere: "Las fichas se pueden poner a cualquier lugar\n"
   timeLimitForEachTurn: "Tiempo límite por jugada."
-  freeMatch: "Partida libre."
+  freeMatch: "Partida libre"
   lookingForPlayer: "Buscando oponente"
   gameCanceled: "La partida ha sido cancelada."
   shareToTlTheGameWhenStart: "Compartir la partida en la línea de tiempo cuando comience "
@@ -3223,11 +3292,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "Tamaño del círculo secundario."
   polkadotSubDotDivisions: "Número de subpuntos."
   leaveBlankToAccountUrl: "Si dejas este campo en blanco, se utilizará la URL de tu cuenta."
+  failedToLoadImage: "Error al cargar la imagen"
 _imageEffector:
   title: "Efecto"
   addEffect: "Añadir Efecto"
   discardChangesConfirm: "¿Ignorar cambios y salir?"
   nothingToConfigure: "No hay opciones configurables disponibles."
+  failedToLoadImage: "Error al cargar la imagen"
   _fxs:
     chromaticAberration: "Aberración Cromática"
     glitch: "Glitch"

locales/fr-FR.yml

@@ -1274,6 +1274,15 @@ information: "Informations"
 inMinutes: "min"
 inDays: "j"
 widgets: "Widgets"
+presets: "Préréglage"
+_imageEditing:
+  _vars:
+    filename: "Nom du fichier"
+_imageFrameEditor:
+  header: "Entête"
+  font: "Police de caractères"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _chat:
   invitations: "Inviter"
   noHistory: "Pas d'historique"
@@ -2037,6 +2046,9 @@ _postForm:
   replyPlaceholder: "Répondre à cette note ..."
   quotePlaceholder: "Citez cette note ..."
   channelPlaceholder: "Publier au canal…"
+  _howToUse:
+    visibility_title: "Visibilité"
+    menu_title: "Menu"
   _placeholders:
     a: "Quoi de neuf ?"
     b: "Il s'est passé quelque chose ?"

locales/id-ID.yml

@@ -240,6 +240,8 @@ blockedInstances: "Instansi terblokir"
 blockedInstancesDescription: "Daftar nama host dari instansi yang diperlukan untuk diblokir. Instansi yang didaftarkan tidak akan dapat berkomunikasi dengan instansi ini."
 silencedInstances: "Instansi yang disenyapkan"
 silencedInstancesDescription: "Daftar nama host dari instansi yang ingin kamu senyapkan. Semua akun dari instansi yang terdaftar akan diperlakukan sebagai disenyapkan. Hal ini membuat akun hanya dapat membuat permintaan mengikuti, dan tidak dapat menyebutkan akun lokal apabila tidak mengikuti. Hal ini tidak akan mempengaruhi instansi yang diblokir."
+mediaSilencedInstances: "Server dengan media dibisukan"
+mediaSilencedInstancesDescription: "Masukkan host server yang medianya ingin Anda bisukan, pisahkan dengan baris baru. Semua berkas dari akun di server ini akan dianggap sebagai sensitif dan emoji kustom tidak akan tersedia. Ini tidak akan membengaruhi server yang diblokir."
 federationAllowedHosts: "Server yang membolehkan federasi"
 muteAndBlock: "Bisukan / Blokir"
 mutedUsers: "Pengguna yang dibisukan"
@@ -398,7 +400,7 @@ enableHcaptcha: "Nyalakan hCaptcha"
 hcaptchaSiteKey: "Site Key"
 hcaptchaSecretKey: "Secret Key"
 mcaptcha: "mCaptcha"
-enableMcaptcha: "Nyalakan mCaptcha"
+enableMcaptcha: ""
 mcaptchaSiteKey: "Site key"
 mcaptchaSecretKey: "Secret Key"
 mcaptchaInstanceUrl: "URL instansi mCaptcha"
@@ -1288,6 +1290,15 @@ advice: "Saran"
 inMinutes: "menit"
 inDays: "hari"
 widgets: "Widget"
+presets: "Prasetel"
+_imageEditing:
+  _vars:
+    filename: "Nama berkas"
+_imageFrameEditor:
+  header: "Header"
+  font: "Font"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans-serif"
 _chat:
   invitations: "Undang"
   history: "Riwayat obrolan"
@@ -2240,6 +2251,9 @@ _postForm:
   replyPlaceholder: "Balas ke catatan ini..."
   quotePlaceholder: "Kutip catatan ini..."
   channelPlaceholder: "Posting ke kanal"
+  _howToUse:
+    visibility_title: "Visibilitas"
+    menu_title: "Menu"
   _placeholders:
     a: "Sedang apa kamu saat ini?"
     b: "Apa yang terjadi di sekitarmu?"

locales/index.d.ts

@@ -747,7 +747,7 @@ export interface Locale extends ILocale {
      */
     "flagShowTimelineRepliesDescription": string;
     /**
-     * フォロー中ユーザーからのフォロリクを自動承認
+     * フォロー中ユーザーからのフォロー申請を自動承認
      */
     "autoAcceptFollowed": string;
     /**
@@ -1226,6 +1226,10 @@ export interface Locale extends ILocale {
      * 既読
      */
     "messageRead": string;
+    /**
+     * すべてのメッセージを既読にする
+     */
+    "readAllChatMessages": string;
     /**
      * これより過去の履歴はありません
      */
@@ -4106,6 +4110,18 @@ export interface Locale extends ILocale {
      * 端末の電池消費量が増加する可能性があります。
      */
     "sendPushNotificationReadMessageCaption": string;
+    /**
+     * ブラウザの通知設定を許可してください
+     */
+    "pleaseAllowPushNotification": string;
+    /**
+     * 通知の送信権限の取得に失敗しました
+     */
+    "browserPushNotificationDisabled": string;
+    /**
+     * {serverName}から通知を送信する権限がありません。ブラウザの設定から通知を許可して再度お試しください。
+     */
+    "browserPushNotificationDisabledDescription": ParameterizedString<"serverName">;
     /**
      * 最大化
      */
@@ -5605,6 +5621,176 @@ export interface Locale extends ILocale {
      * 技術的なお問い合わせの際に、以下の情報を併記すると問題の解決に役立つことがあります。
      */
     "deviceInfoDescription": string;
+    /**
+     * あなたは管理者です
+     */
+    "youAreAdmin": string;
+    /**
+     * フレーム
+     */
+    "frame": string;
+    /**
+     * プリセット
+     */
+    "presets": string;
+    /**
+     * ゼロ埋め
+     */
+    "zeroPadding": string;
+    "_imageEditing": {
+        "_vars": {
+            /**
+             * ファイルのキャプション
+             */
+            "caption": string;
+            /**
+             * ファイル名
+             */
+            "filename": string;
+            /**
+             * 拡張子無しファイル名
+             */
+            "filename_without_ext": string;
+            /**
+             * 撮影年
+             */
+            "year": string;
+            /**
+             * 撮影月
+             */
+            "month": string;
+            /**
+             * 撮影日
+             */
+            "day": string;
+            /**
+             * 撮影した時刻(時)
+             */
+            "hour": string;
+            /**
+             * 撮影した時刻(分)
+             */
+            "minute": string;
+            /**
+             * 撮影した時刻(秒)
+             */
+            "second": string;
+            /**
+             * カメラ名
+             */
+            "camera_model": string;
+            /**
+             * レンズ名
+             */
+            "camera_lens_model": string;
+            /**
+             * 焦点距離
+             */
+            "camera_mm": string;
+            /**
+             * 焦点距離(35mm判換算)
+             */
+            "camera_mm_35": string;
+            /**
+             * 絞り
+             */
+            "camera_f": string;
+            /**
+             * シャッタースピード
+             */
+            "camera_s": string;
+            /**
+             * ISO感度
+             */
+            "camera_iso": string;
+            /**
+             * 緯度
+             */
+            "gps_lat": string;
+            /**
+             * 経度
+             */
+            "gps_long": string;
+        };
+    };
+    "_imageFrameEditor": {
+        /**
+         * フレームの編集
+         */
+        "title": string;
+        /**
+         * 画像にフレームやメタデータを含んだラベルを追加して装飾できます。
+         */
+        "tip": string;
+        /**
+         * ヘッダー
+         */
+        "header": string;
+        /**
+         * フッター
+         */
+        "footer": string;
+        /**
+         * フチの幅
+         */
+        "borderThickness": string;
+        /**
+         * ラベルの幅
+         */
+        "labelThickness": string;
+        /**
+         * ラベルのスケール
+         */
+        "labelScale": string;
+        /**
+         * 中央揃え
+         */
+        "centered": string;
+        /**
+         * キャプション(大)
+         */
+        "captionMain": string;
+        /**
+         * キャプション(小)
+         */
+        "captionSub": string;
+        /**
+         * 利用可能な変数
+         */
+        "availableVariables": string;
+        /**
+         * 二次元コード
+         */
+        "withQrCode": string;
+        /**
+         * 背景色
+         */
+        "backgroundColor": string;
+        /**
+         * 文字色
+         */
+        "textColor": string;
+        /**
+         * フォント
+         */
+        "font": string;
+        /**
+         * セリフ
+         */
+        "fontSerif": string;
+        /**
+         * サンセリフ
+         */
+        "fontSansSerif": string;
+        /**
+         * 保存せずに終了しますか？
+         */
+        "quitWithoutSaveConfirm": string;
+        /**
+         * 画像の読み込みに失敗しました
+         */
+        "failedToLoadImage": string;
+    };
     "_compression": {
         "_quality": {
             /**
@@ -5997,6 +6183,14 @@ export interface Locale extends ILocale {
          * ページのタブバーを下部に表示
          */
         "showPageTabBarBottom": string;
+        /**
+         * 絵文字ピッカーに固定表示するプリセットをパレットとして登録したり、ピッカーの表示方法をカスタマイズしたりできます。
+         */
+        "emojiPaletteBanner": string;
+        /**
+         * アニメーション画像を有効にする
+         */
+        "enableAnimatedImages": string;
         "_chat": {
             /**
              * 送信者の名前を表示
@@ -6025,6 +6219,14 @@ export interface Locale extends ILocale {
          * プロファイルの管理
          */
         "manageProfiles": string;
+        /**
+         * 複数のデバイスで同一のプロファイルを共有することは推奨しません。
+         */
+        "shareSameProfileBetweenDevicesIsNotRecommended": string;
+        /**
+         * 複数のデバイスで同期したい設定項目が存在する場合は、個別に「複数のデバイスで同期」オプションを有効にしてください。
+         */
+        "useSyncBetweenDevicesOptionIfYouWantToSyncSetting": string;
     };
     "_preferencesBackup": {
         /**
@@ -6059,6 +6261,10 @@ export interface Locale extends ILocale {
          * 設定のバックアップが見つかりました
          */
         "backupFound": string;
+        /**
+         * 設定の強制バックアップ
+         */
+        "forceBackup": string;
     };
     "_accountSettings": {
         /**
@@ -9836,6 +10042,60 @@ export interface Locale extends ILocale {
          * チャンネルに投稿...
          */
         "channelPlaceholder": string;
+        /**
+         * フォームの説明を表示
+         */
+        "showHowToUse": string;
+        "_howToUse": {
+            /**
+             * 本文
+             */
+            "content_title": string;
+            /**
+             * 投稿する内容を入力します。
+             */
+            "content_description": string;
+            /**
+             * ツールバー
+             */
+            "toolbar_title": string;
+            /**
+             * ファイルやアンケートの添付、注釈やハッシュタグの設定、絵文字やメンションの挿入などが行えます。
+             */
+            "toolbar_description": string;
+            /**
+             * アカウントメニュー
+             */
+            "account_title": string;
+            /**
+             * 投稿するアカウントを切り替えたり、アカウントに保存した下書き・予約投稿を一覧できます。
+             */
+            "account_description": string;
+            /**
+             * 公開範囲
+             */
+            "visibility_title": string;
+            /**
+             * ノートを公開する範囲の設定が行えます。
+             */
+            "visibility_description": string;
+            /**
+             * メニュー
+             */
+            "menu_title": string;
+            /**
+             * 下書きへの保存、投稿の予約、リアクションの設定など、その他のアクションが行えます。
+             */
+            "menu_description": string;
+            /**
+             * 投稿ボタン
+             */
+            "submit_title": string;
+            /**
+             * ノートを投稿します。Ctrl + Enter / Cmd + Enter でも投稿できます。
+             */
+            "submit_description": string;
+        };
         "_placeholders": {
             /**
              * いまどうしてる？
@@ -10890,6 +11150,14 @@ export interface Locale extends ILocale {
         };
     };
     "_moderationLogTypes": {
+        /**
+         * ジョブキューをクリア
+         */
+        "clearQueue": string;
+        /**
+         * キューのジョブを再試行
+         */
+        "promoteQueue": string;
         /**
          * ロールを作成
          */
@@ -12318,7 +12586,7 @@ export interface Locale extends ILocale {
     "defaultPreset": string;
     "_watermarkEditor": {
         /**
-         * 画像にクレジット情報などのウォーターマークを追加することができます。
+         * 画像にクレジット情報などのウォーターマークを追加できます。
          */
         "tip": string;
         /**
@@ -12433,6 +12701,10 @@ export interface Locale extends ILocale {
          * 空欄にするとアカウントのURLになります
          */
         "leaveBlankToAccountUrl": string;
+        /**
+         * 画像の読み込みに失敗しました
+         */
+        "failedToLoadImage": string;
     };
     "_imageEffector": {
         /**
@@ -12451,6 +12723,10 @@ export interface Locale extends ILocale {
          * 設定項目はありません
          */
         "nothingToConfigure": string;
+        /**
+         * 画像の読み込みに失敗しました
+         */
+        "failedToLoadImage": string;
         "_fxs": {
             /**
              * 色収差

locales/it-IT.yml

@@ -144,7 +144,7 @@ markAsSensitive: "Segna come esplicito"
 unmarkAsSensitive: "Non segnare come esplicito "
 enterFileName: "Nome del file"
 mute: "Silenziare"
-unmute: "Riattiva l'audio"
+unmute: "Dai voce"
 renoteMute: "Silenziare le Rinota"
 renoteUnmute: "Non silenziare le Rinota"
 block: "Bloccare"
@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "Il caricamento del file può richiedere tempo."
 uploadNFiles: "Caricare {n} file singolarmente"
 explore: "Esplora"
 messageRead: "Visualizzato"
+readAllChatMessages: "Segna tutti i messaggi come già letti"
 noMoreHistory: "Non c'è più cronologia da visualizzare"
 startChat: "Inizia a chattare"
 nUsersRead: "Letto da {n} persone"
@@ -525,7 +526,7 @@ style: "Stile"
 drawer: "Drawer"
 popup: "Popup"
 showNoteActionsOnlyHover: "Mostra le azioni delle Note solo al passaggio del mouse"
-showReactionsCount: "Visualizza il numero di reazioni su una nota"
+showReactionsCount: "Visualizza la quantità di reazioni su una nota"
 noHistory: "Nessuna cronologia"
 signinHistory: "Storico degli accessi al profilo"
 enableAdvancedMfm: "Attivare i Misskey Flavoured Markdown (MFM) avanzati"
@@ -690,11 +691,11 @@ emptyToDisableSmtpAuth: "Lasciare i campi vuoti se non c'è autenticazione SMTP"
 smtpSecure: "Usare SSL/TLS implicito per le connessioni SMTP"
 smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
 testEmail: "Verifica il funzionamento"
-wordMute: "Filtri parole"
+wordMute: "Parole silenziate"
 wordMuteDescription: "Contrae le Note con la parola o la frase specificata. Permette di espandere le Note, cliccandole."
-hardWordMute: "Filtro parole forte"
+hardWordMute: "Filtro per parole"
 showMutedWord: "Elenca le parole silenziate"
-hardWordMuteDescription: "Nasconde le Note con la parola o la frase specificata. A differenza delle parole silenziate, la Nota non verrà federata."
+hardWordMuteDescription: "Ignora le Note con la parola o la frase specificata. A differenza delle parole silenziate, la Nota non verrà federata."
 regexpError: "errore regex"
 regexpErrorDescription: "Si è verificato un errore nell'espressione regolare alla riga {line} della parola muta {tab}:"
 instanceMute: "Silenziare l'istanza"
@@ -755,19 +756,19 @@ i18nInfo: "Misskey è tradotto in diverse lingue da volontari. Anche tu puoi con
 manageAccessTokens: "Gestisci token di accesso"
 accountInfo: "Informazioni profilo"
 notesCount: "Conteggio note"
-repliesCount: "Numero di risposte inviate"
+repliesCount: "Quantità di risposte"
-renotesCount: "Numero di note che hai ricondiviso"
+renotesCount: "Quantità di Note ricondivise"
-repliedCount: "Numero di risposte ricevute"
+repliedCount: "Quantità di risposte"
-renotedCount: "Numero delle tue note ricondivise"
+renotedCount: "Quantità di tue Note ricondivise"
-followingCount: "Numero di Following"
+followingCount: "Quantità di Following"
-followersCount: "Numero di profili che ti seguono"
+followersCount: "Quantità di Follower"
-sentReactionsCount: "Numero di reazioni inviate"
+sentReactionsCount: "Quantità di reazioni"
-receivedReactionsCount: "Numero di reazioni ricevute"
+receivedReactionsCount: "Quantità di reazioni ricevute"
-pollVotesCount: "Numero di voti inviati"
+pollVotesCount: "Quantità di voti"
-pollVotedCount: "Numero di voti ricevuti"
+pollVotedCount: "Quantità di voti ricevuti"
 yes: "Sì"
 no: "No"
-driveFilesCount: "Numero di file nel Drive"
+driveFilesCount: "Quantità di file nel Drive"
 driveUsage: "Utilizzazione del Drive"
 noCrawle: "Rifiuta l'indicizzazione dai robot."
 noCrawleDescription: "Richiedi che i motori di ricerca non indicizzino la tua pagina di profilo, le tue note, pagine, ecc."
@@ -781,7 +782,7 @@ verificationEmailSent: "Una mail di verifica è stata inviata. Si prega di acced
 notSet: "Non impostato"
 emailVerified: "Il tuo indirizzo email è stato verificato"
 noteFavoritesCount: "Conteggio note tra i preferiti"
-pageLikesCount: "Numero di pagine che ti piacciono"
+pageLikesCount: "Quantità di pagine che ti piacciono"
 pageLikedCount: "Numero delle tue pagine che hanno ricevuto \"Mi piace\""
 contact: "Contatti"
 useSystemFont: "Usa il carattere predefinito del sistema"
@@ -826,9 +827,9 @@ currentVersion: "Versione attuale"
 latestVersion: "Ultima versione"
 youAreRunningUpToDateClient: "Stai usando la versione più recente del client."
 newVersionOfClientAvailable: "Una nuova versione del tuo client è disponibile."
-usageAmount: "In uso"
+usageAmount: "Quantità utilizzata"
 capacity: "Capacità"
-inUse: "In uso"
+inUse: "Usata da"
 editCode: "Modifica codice"
 apply: "Applica"
 receiveAnnouncementFromInstance: "Ricevi i messaggi informativi dall'istanza"
@@ -947,7 +948,7 @@ tablet: "Tablet"
 auto: "Automatico"
 themeColor: "Colore del tema"
 size: "Dimensioni"
-numberOfColumn: "Numero di colonne"
+numberOfColumn: "Quantità di colonne"
 searchByGoogle: "Cerca"
 instanceDefaultLightTheme: "Istanza, tema luminoso predefinito."
 instanceDefaultDarkTheme: "Istanza, tema scuro predefinito."
@@ -984,7 +985,7 @@ isSystemAccount: "Si tratta di un profilo creato e gestito automaticamente dal s
 typeToConfirm: "Digita {x} per continuare"
 deleteAccount: "Eliminazione profilo"
 document: "Documentazione"
-numberOfPageCache: "Numero di pagine cache"
+numberOfPageCache: "Quantità di pagine in cache"
 numberOfPageCacheDescription: "Aumenta l'usabilità, ma aumenta anche il carico e l'utilizzo della memoria."
 logoutConfirm: "Vuoi davvero uscire da Misskey? "
 logoutWillClearClientData: "All'uscita, la configurazione del client viene rimossa dal browser. Per ripristinarla quando si effettua nuovamente l'accesso, abilitare il backup automatico."
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "Le notifiche push sono già attivate"
 pushNotificationNotSupported: "Il client o il server non supporta le notifiche push"
 sendPushNotificationReadMessage: "Eliminare le notifiche push dopo la relativa lettura"
 sendPushNotificationReadMessageCaption: "Se possibile, verrà mostrata brevemente una notifica con il testo \"{emptyPushNotificationMessage}\". Potrebbe influire negativamente sulla durata della batteria."
+pleaseAllowPushNotification: "Per favore, acconsenti alla ricezione di notifiche nel browser"
+browserPushNotificationDisabled: "Non è stato possibile ottenere il consenso alla ricezione di notifche"
+browserPushNotificationDisabledDescription: "Non hai concesso a {serverName} di spedire notifiche. Per favore, acconsenti alla ricezione nelle impostazioni del browser e riprova."
 windowMaximize: "Ingrandisci"
 windowMinimize: "Contrai finestra"
 windowRestore: "Ripristina"
@@ -1032,7 +1036,7 @@ cannotLoad: "Caricamento impossibile"
 numberOfProfileView: "Visualizzazioni profilo"
 like: "Mi piace!"
 unlike: "Non mi piace"
-numberOfLikes: "Numero di Like"
+numberOfLikes: "Quantità di Like"
 show: "Visualizza"
 neverShow: "Non mostrare più"
 remindMeLater: "Rimanda"
@@ -1178,7 +1182,7 @@ createInviteCode: "Genera codice di invito"
 createWithOptions: "Genera con opzioni"
 createCount: "Conteggio inviti"
 inviteCodeCreated: "Inviti generati"
-inviteLimitExceeded: "Hai raggiunto il numero massimo di codici invito generabili."
+inviteLimitExceeded: "Hai raggiunto la quantità massima di codici invito generabili."
 createLimitRemaining: "Inviti generabili: {limit} rimanenti"
 inviteLimitResetCycle: "Alle {time}, il limite verrà ripristinato a {limit}"
 expirationDate: "Scadenza"
@@ -1346,7 +1350,7 @@ preferenceSyncConflictChoiceCancel: "Annulla la sincronizzazione"
 paste: "Incolla"
 emojiPalette: "Tavolozza emoji"
 postForm: "Finestra di pubblicazione"
-textCount: "Il numero di caratteri"
+textCount: "Quantità di caratteri"
 information: "Informazioni"
 chat: "Chat"
 directMessage: "Chattare insieme"
@@ -1396,6 +1400,50 @@ scheduled: "Pianificata"
 widgets: "Riquadri"
 deviceInfo: "Informazioni sul dispositivo"
 deviceInfoDescription: "Se ci contatti per ricevere supporto tecnico, ti preghiamo di includere le seguenti informazioni per aiutarci a risolvere il tuo problema."
+youAreAdmin: "Sei un amministratore"
+frame: "Cornice"
+presets: "Preimpostato"
+zeroPadding: "Al vivo"
+_imageEditing:
+  _vars:
+    caption: "Didascalia dell'immagine"
+    filename: "Nome dell'allegato"
+    filename_without_ext: "Nome file senza estensione"
+    year: "Anno di scatto"
+    month: "Mese dello scatto"
+    day: "Giorno dello scatto"
+    hour: "Ora dello scatto"
+    minute: "Minuto dello scatto"
+    second: "Secondi dello scatto"
+    camera_model: "Modello di fotocamera"
+    camera_lens_model: "Modello della lente"
+    camera_mm: "Lunghezza focale"
+    camera_mm_35: "Lunghezza focale (equivalente a 35 mm)"
+    camera_f: "Diaframma"
+    camera_s: "Velocità otturatore"
+    camera_iso: "Sensibilità ISO"
+    gps_lat: "Latitudine"
+    gps_long: "Longitudine"
+_imageFrameEditor:
+  title: "Modifica fotogramma"
+  tip: "Puoi decorare le immagini aggiungendo etichette con cornici e metadati."
+  header: "Intestazione"
+  footer: "Piè di pagina"
+  borderThickness: "Larghezza del bordo"
+  labelThickness: "Spessore etichetta"
+  labelScale: "Dimensione etichetta"
+  centered: "Allinea al centro"
+  captionMain: "Didascalia (grande)"
+  captionSub: "Didascalia (piccola)"
+  availableVariables: "Variabili disponibili"
+  withQrCode: "QR Code"
+  backgroundColor: "Colore dello sfondo"
+  textColor: "Colore del testo"
+  font: "Tipo di carattere"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans serif"
+  quitWithoutSaveConfirm: "Uscire senza salvare?"
+  failedToLoadImage: "Impossibile caricare l'immagine"
 _compression:
   _quality:
     high: "Alta qualità"
@@ -1406,8 +1454,8 @@ _compression:
     medium: "Taglia media"
     small: "Taglia piccola"
 _order:
-  newest: "Prima i più recenti"
+  newest: "Più recenti"
-  oldest: "Meno recenti prima"
+  oldest: "Meno recenti"
 _chat:
   messages: "Messaggi"
   noMessagesYet: "Ancora nessun messaggio"
@@ -1498,6 +1546,8 @@ _settings:
   showUrlPreview: "Mostra anteprima dell'URL"
   showAvailableReactionsFirstInNote: "Mostra le reazioni disponibili in alto"
   showPageTabBarBottom: "Visualizza le schede della pagina nella parte inferiore"
+  emojiPaletteBanner: "Puoi salvare i le emoji predefinite da appuntare in alto nel raccoglitore emoji come tavolozza e personalizzare in che modo visualizzare il raccoglitore."
+  enableAnimatedImages: "Attivare le immagini animate"
   _chat:
     showSenderName: "Mostra il nome del mittente"
     sendOnEnter: "Invio spedisce"
@@ -1506,6 +1556,8 @@ _preferencesProfile:
   profileNameDescription: "Impostare il nome che indentifica questo dispositivo."
   profileNameDescription2: "Es: \"PC principale\" o \"Cellulare\""
   manageProfiles: "Gestione profili"
+  shareSameProfileBetweenDevicesIsNotRecommended: "Si sconsiglia di condividere lo stesso profilo su più dispositivi."
+  useSyncBetweenDevicesOptionIfYouWantToSyncSetting: "Se intendi sincronizzare solo alcuni parametri di configurazione su più dispositivi, devi attivare  l'opzione \"Sincronizzazione tra dispositivi\" per ogni parametro interessato."
 _preferencesBackup:
   autoBackup: "Backup automatico"
   restoreFromBackup: "Ripristinare da backup"
@@ -1515,6 +1567,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "Per abilitare i backup automatici, è necessario indicare il nome del profilo."
   autoPreferencesBackupIsNotEnabledForThisDevice: "Su questo dispositivo non è stato attivato il backup automatico delle preferenze."
   backupFound: "Esiste il Backup delle preferenze"
+  forceBackup: "Backup forzato delle impostazioni"
 _accountSettings:
   requireSigninToViewContents: "Per vedere il contenuto, è necessaria l'iscrizione"
   requireSigninToViewContentsDescription1: "Richiedere l'iscrizione per visualizzare tutte le Note e gli altri contenuti che hai creato. Probabilmente l'effetto è impedire la raccolta di informazioni da parte dei bot crawler."
@@ -2522,7 +2575,7 @@ _visibility:
   followersDescription: "Visibile solo ai tuoi follower"
   specified: "Nota diretta"
   specifiedDescription: "Visibile solo ai profili menzionati"
-  disableFederation: "Senza federazione"
+  disableFederation: "Gestisci la federazione"
   disableFederationDescription: "Non spedire attività alle altre istanze remote"
 _postForm:
   quitInspiteOfThereAreUnuploadedFilesConfirm: "Alcuni file non sono stati caricati. Vuoi annullare l'operazione?"
@@ -2530,6 +2583,20 @@ _postForm:
   replyPlaceholder: "Rispondi a questa nota..."
   quotePlaceholder: "Cita questa nota..."
   channelPlaceholder: "Pubblica sul canale..."
+  showHowToUse: "Mostra il tutorial"
+  _howToUse:
+    content_title: "Testo"
+    content_description: "Inserisci il contenuto che desideri pubblicare."
+    toolbar_title: "Barra degli Strumenti"
+    toolbar_description: "Puoi allegare file e sondaggi, aggiungere Note, hashtag, inserire emoji e menzioni."
+    account_title: "Menu profilo"
+    account_description: "Puoi cambiare il profilo col quale vuoi pubblicare, elencare bozze e pianificare le Note."
+    visibility_title: "Visibilità"
+    visibility_description: "Puoi impostare il grado di visibilità delle Note."
+    menu_title: "Menù"
+    menu_description: "Puoi svolgere varie azioni, come salvare in bozza, pianificare le annotazioni, regolare le reazioni ricevute e altro."
+    submit_title: "Bottone invia"
+    submit_description: "Pubblica la Nota. Funziona anche con \"Ctrl + Invio\", oppure \"Cmd + Invio\"."
   _placeholders:
     a: "Come va?"
     b: "Hai qualcosa da raccontare? Inizia pure..."
@@ -2807,6 +2874,8 @@ _abuseReport:
     notifiedWebhook: "Webhook da usare"
     deleteConfirm: "Vuoi davvero rimuovere il destinatario della notifica?"
 _moderationLogTypes:
+  clearQueue: "Ha cancellato la coda di Attività"
+  promoteQueue: "Ripeti le attività in coda"
   createRole: "Crea un Ruolo"
   deleteRole: "Elimina un Ruolo"
   updateRole: "Modifica un ruolo"
@@ -3121,7 +3190,7 @@ _bootErrors:
 _search:
   searchScopeAll: "Tutte"
   searchScopeLocal: "Locale"
-  searchScopeServer: "Specifiche del server"
+  searchScopeServer: "Server specifico"
   searchScopeUser: "Profilo specifico"
   pleaseEnterServerHost: "Inserire il nome host"
   pleaseSelectUser: "Per favore, seleziona un profilo"
@@ -3201,6 +3270,7 @@ _watermarkEditor:
   title: "Modifica la filigrana"
   cover: "Coprire tutto"
   repeat: "Disposizione"
+  preserveBoundingRect: "Fai in modo da non eccedere durante la rotazione"
   opacity: "Opacità"
   scale: "Dimensioni"
   text: "Testo"
@@ -3222,11 +3292,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "Dimensione del punto secondario"
   polkadotSubDotDivisions: "Quantità di punti secondari"
   leaveBlankToAccountUrl: "Il valore vuoto indica la URL dell'account"
+  failedToLoadImage: "Impossibile caricare l'immagine"
 _imageEffector:
   title: "Effetto"
   addEffect: "Aggiungi effetto"
   discardChangesConfirm: "Scarta le modifiche ed esci?"
   nothingToConfigure: "Nessuna impostazione configurabile."
+  failedToLoadImage: "Impossibile caricare l'immagine"
   _fxs:
     chromaticAberration: "Aberrazione cromatica"
     glitch: "Glitch"

locales/ja-JP.yml

@@ -182,7 +182,7 @@ flagAsCat: "にゃああああああああああああああ！！！！！！
 flagAsCatDescription: "にゃにゃにゃ？？"
 flagShowTimelineReplies: "タイムラインにノートへの返信を表示する"
 flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーのノート以外にもそのユーザーの他のノートへの返信を表示します。"
-autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認"
+autoAcceptFollowed: "フォロー中ユーザーからのフォロー申請を自動承認"
 addAccount: "アカウントを追加"
 reloadAccountsList: "アカウントリストの情報を更新"
 loginFailed: "ログインに失敗しました"
@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "アップロードが完了するまで時間がか
 uploadNFiles: "{n}個のファイルをアップロード"
 explore: "みつける"
 messageRead: "既読"
+readAllChatMessages: "すべてのメッセージを既読にする"
 noMoreHistory: "これより過去の履歴はありません"
 startChat: "メッセージを送る"
 nUsersRead: "{n}人が読みました"
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "プッシュ通知は有効です"
 pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知に非対応"
 sendPushNotificationReadMessage: "通知が既読になったらプッシュ通知を削除する"
 sendPushNotificationReadMessageCaption: "端末の電池消費量が増加する可能性があります。"
+pleaseAllowPushNotification: "ブラウザの通知設定を許可してください"
+browserPushNotificationDisabled: "通知の送信権限の取得に失敗しました"
+browserPushNotificationDisabledDescription: "{serverName}から通知を送信する権限がありません。ブラウザの設定から通知を許可して再度お試しください。"
 windowMaximize: "最大化"
 windowMinimize: "最小化"
 windowRestore: "元に戻す"
@@ -1396,6 +1400,52 @@ scheduled: "予約"
 widgets: "ウィジェット"
 deviceInfo: "デバイス情報"
 deviceInfoDescription: "技術的なお問い合わせの際に、以下の情報を併記すると問題の解決に役立つことがあります。"
+youAreAdmin: "あなたは管理者です"
+frame: "フレーム"
+presets: "プリセット"
+zeroPadding: "ゼロ埋め"
+
+_imageEditing:
+  _vars:
+    caption: "ファイルのキャプション"
+    filename: "ファイル名"
+    filename_without_ext: "拡張子無しファイル名"
+    year: "撮影年"
+    month: "撮影月"
+    day: "撮影日"
+    hour: "撮影した時刻(時)"
+    minute: "撮影した時刻(分)"
+    second: "撮影した時刻(秒)"
+    camera_model: "カメラ名"
+    camera_lens_model: "レンズ名"
+    camera_mm: "焦点距離"
+    camera_mm_35: "焦点距離(35mm判換算)"
+    camera_f: "絞り"
+    camera_s: "シャッタースピード"
+    camera_iso: "ISO感度"
+    gps_lat: "緯度"
+    gps_long: "経度"
+
+_imageFrameEditor:
+  title: "フレームの編集"
+  tip: "画像にフレームやメタデータを含んだラベルを追加して装飾できます。"
+  header: "ヘッダー"
+  footer: "フッター"
+  borderThickness: "フチの幅"
+  labelThickness: "ラベルの幅"
+  labelScale: "ラベルのスケール"
+  centered: "中央揃え"
+  captionMain: "キャプション(大)"
+  captionSub: "キャプション(小)"
+  availableVariables: "利用可能な変数"
+  withQrCode: "二次元コード"
+  backgroundColor: "背景色"
+  textColor: "文字色"
+  font: "フォント"
+  fontSerif: "セリフ"
+  fontSansSerif: "サンセリフ"
+  quitWithoutSaveConfirm: "保存せずに終了しますか？"
+  failedToLoadImage: "画像の読み込みに失敗しました"
 
 _compression:
   _quality:
@@ -1503,6 +1553,8 @@ _settings:
   showUrlPreview: "URLプレビューを表示する"
   showAvailableReactionsFirstInNote: "利用できるリアクションを先頭に表示"
   showPageTabBarBottom: "ページのタブバーを下部に表示"
+  emojiPaletteBanner: "絵文字ピッカーに固定表示するプリセットをパレットとして登録したり、ピッカーの表示方法をカスタマイズしたりできます。"
+  enableAnimatedImages: "アニメーション画像を有効にする"
 
   _chat:
     showSenderName: "送信者の名前を表示"
@@ -1513,6 +1565,8 @@ _preferencesProfile:
   profileNameDescription: "このデバイスを識別する名前を設定してください。"
   profileNameDescription2: "例: 「メインPC」、「スマホ」など"
   manageProfiles: "プロファイルの管理"
+  shareSameProfileBetweenDevicesIsNotRecommended: "複数のデバイスで同一のプロファイルを共有することは推奨しません。"
+  useSyncBetweenDevicesOptionIfYouWantToSyncSetting: "複数のデバイスで同期したい設定項目が存在する場合は、個別に「複数のデバイスで同期」オプションを有効にしてください。"
 
 _preferencesBackup:
   autoBackup: "自動バックアップ"
@@ -1523,6 +1577,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "自動バックアップを有効にするにはプロファイル名の設定が必要です。"
   autoPreferencesBackupIsNotEnabledForThisDevice: "このデバイスで設定の自動バックアップは有効になっていません。"
   backupFound: "設定のバックアップが見つかりました"
+  forceBackup: "設定の強制バックアップ"
 
 _accountSettings:
   requireSigninToViewContents: "コンテンツの表示にログインを必須にする"
@@ -2589,6 +2644,20 @@ _postForm:
   replyPlaceholder: "このノートに返信..."
   quotePlaceholder: "このノートを引用..."
   channelPlaceholder: "チャンネルに投稿..."
+  showHowToUse: "フォームの説明を表示"
+  _howToUse:
+    content_title: "本文"
+    content_description: "投稿する内容を入力します。"
+    toolbar_title: "ツールバー"
+    toolbar_description: "ファイルやアンケートの添付、注釈やハッシュタグの設定、絵文字やメンションの挿入などが行えます。"
+    account_title: "アカウントメニュー"
+    account_description: "投稿するアカウントを切り替えたり、アカウントに保存した下書き・予約投稿を一覧できます。"
+    visibility_title: "公開範囲"
+    visibility_description: "ノートを公開する範囲の設定が行えます。"
+    menu_title: "メニュー"
+    menu_description: "下書きへの保存、投稿の予約、リアクションの設定など、その他のアクションが行えます。"
+    submit_title: "投稿ボタン"
+    submit_description: "ノートを投稿します。Ctrl + Enter / Cmd + Enter でも投稿できます。"
   _placeholders:
     a: "いまどうしてる？"
     b: "何かありましたか？"
@@ -2886,6 +2955,8 @@ _abuseReport:
     deleteConfirm: "通知先を削除しますか？"
 
 _moderationLogTypes:
+  clearQueue: "ジョブキューをクリア"
+  promoteQueue: "キューのジョブを再試行"
   createRole: "ロールを作成"
   deleteRole: "ロールを削除"
   updateRole: "ロールを更新"
@@ -3298,7 +3369,7 @@ _userLists:
 watermark: "ウォーターマーク"
 defaultPreset: "デフォルトのプリセット"
 _watermarkEditor:
-  tip: "画像にクレジット情報などのウォーターマークを追加することができます。"
+  tip: "画像にクレジット情報などのウォーターマークを追加できます。"
   quitWithoutSaveConfirm: "保存せずに終了しますか？"
   driveFileTypeWarn: "このファイルは対応していません"
   driveFileTypeWarnDescription: "画像ファイルを選択してください"
@@ -3327,12 +3398,14 @@ _watermarkEditor:
   polkadotSubDotRadius: "サブドットの大きさ"
   polkadotSubDotDivisions: "サブドットの数"
   leaveBlankToAccountUrl: "空欄にするとアカウントのURLになります"
+  failedToLoadImage: "画像の読み込みに失敗しました"
 
 _imageEffector:
   title: "エフェクト"
   addEffect: "エフェクトを追加"
   discardChangesConfirm: "変更を破棄して終了しますか？"
   nothingToConfigure: "設定項目はありません"
+  failedToLoadImage: "画像の読み込みに失敗しました"
 
   _fxs:
     chromaticAberration: "色収差"

locales/ja-KS.yml

@@ -220,6 +220,7 @@ silenceThisInstance: "サーバーサイレンスすんで？"
 mediaSilenceThisInstance: "サーバーをメディアサイレンス"
 operations: "操作"
 software: "ソフトウェア"
+softwareName: "ソフトウェア名"
 version: "バージョン"
 metadata: "メタデータ"
 withNFiles: "{n}個のファイル"
@@ -252,6 +253,7 @@ noteDeleteConfirm: "このノートをほかしてええか？"
 pinLimitExceeded: "これ以上ピン留めできひん"
 done: "でけた"
 processing: "処理しとる"
+preprocessing: "準備中"
 preview: "プレビュー"
 default: "デフォルト"
 defaultValueIs: "デフォルト: {value}"
@@ -299,13 +301,14 @@ uploadFromUrlRequested: "アップロードしたい言うといたで"
 uploadFromUrlMayTakeTime: "アップロード終わるんにちょい時間かかるかもしれへんわ。"
 explore: "みつける"
 messageRead: "もう読んだ"
+readAllChatMessages: "メッセージを全部読んだことにしとく"
 noMoreHistory: "これより昔のんはあらへんで"
 startChat: "チャットを始めよか"
 nUsersRead: "{n}人が読んでもうた"
 agreeTo: "{0}に同意したで"
 agree: "せやな"
-agreeBelow: "下記に同意したる"
+agreeBelow: "下記に同意するわ"
-basicNotesBeforeCreateAccount: "よう読んでやってや"
+basicNotesBeforeCreateAccount: "よう読んどいてや"
 termsOfService: "使うための決め事"
 start: "始める"
 home: "ホーム"
@@ -325,12 +328,13 @@ dark: "ダーク"
 lightThemes: "デイゲーム"
 darkThemes: "ナイトゲーム"
 syncDeviceDarkMode: "デバイスのダークモードと一緒にする"
-switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」がオンになってるで。同期をオフにして手動でモードを切り替えることにします？"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」がオンになってるで。同期切って手動でモード切り替える？"
 drive: "ドライブ"
 fileName: "ファイル名"
 selectFile: "ファイル選んでや"
 selectFiles: "ファイル選んでや"
 selectFolder: "フォルダ選んでや"
+unselectFolder: "フォルダーの選択を解除"
 selectFolders: "フォルダ選んでや"
 fileNotSelected: "ファイルが選択されてへんで"
 renameFile: "ファイル名をいらう"
@@ -421,14 +425,13 @@ antennaSource: "受信ソース(このソースは食われへん)"
 antennaKeywords: "受信キーワード"
 antennaExcludeKeywords: "除外キーワード"
 antennaExcludeBots: "Botアカウントを除外"
-antennaKeywordsDescription: "スペースで区切ったるとAND指定で、改行で区切ったるとOR指定や"
+antennaKeywordsDescription: "スペースで区切ったらAND指定で、改行で区切ったらOR指定や"
 notifyAntenna: "新しいノートを通知すんで"
 withFileAntenna: "なんか添付されたノートだけ"
 excludeNotesInSensitiveChannel: "センシティブなチャンネルのノートは入れんとくわ"
 enableServiceworker: "ブラウザにプッシュ通知が行くようにする"
 antennaUsersDescription: "ユーザー名を改行で区切ったってな"
 caseSensitive: "大文字と小文字は別もんや"
-withReplies: "返信も入れたって"
 connectedTo: "次のアカウントに繋がっとるで"
 notesAndReplies: "投稿と返信"
 withFiles: "ファイル付いとる"
@@ -471,9 +474,9 @@ newPasswordIs: "今度のパスワードは「{password}」や"
 reduceUiAnimation: "UIの動きやアニメーションを少なする"
 share: "わけわけ"
 notFound: "見つからへんね"
-notFoundDescription: "言われたURLにはまるページはなかったで。"
+notFoundDescription: "言われたURLのページはなかったで。"
 uploadFolder: "とりあえずアップロードしたやつ置いとく所"
-markAsReadAllNotifications: "通知はもう全て読んだわっ"
+markAsReadAllNotifications: "通知はもう全部読んだわ"
 markAsReadAllUnreadNotes: "投稿は全て読んだわっ"
 markAsReadAllTalkMessages: "チャットはもうぜんぶ読んだわっ"
 help: "ヘルプ"
@@ -554,7 +557,7 @@ showFeaturedNotesInTimeline: "タイムラインにおすすめのノートを
 objectStorage: "オブジェクトストレージ"
 useObjectStorage: "オブジェクトストレージを使う"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "参照に使うにURLやで。CDNやProxyを使用してるんならそのURL、S3: 'https://<bucket>.s3.amazonaws.com'、GCSとかなら: 'https://storage.googleapis.com/<bucket>'。"
+objectStorageBaseUrlDesc: "参照に使うURLやで。CDNやProxyを使用してるんならそのURL、S3: 'https://<bucket>.s3.amazonaws.com'、GCSとかなら: 'https://storage.googleapis.com/<bucket>'。"
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "使ってるサービスのbucket名を選んでな"
 objectStoragePrefix: "Prefix"
@@ -571,17 +574,19 @@ objectStorageSetPublicRead: "アップロードした時に'public-read'を設
 s3ForcePathStyleDesc: "s3ForcePathStyleを使たらバケット名をURLのホスト名やなくてパスの一部として必ず指定させるようになるで。セルフホストされたMinioとかを使うてるんやったら有効にせなあかん場合があるで。"
 serverLogs: "サーバーログ"
 deleteAll: "全部ほかす"
-showFixedPostForm: "タイムラインの上の方で投稿できるようにやってくれへん？"
+showFixedPostForm: "タイムラインの上の方で投稿できるようにするわ"
 showFixedPostFormInChannel: "タイムラインの上の方で投稿できるようにするわ(チャンネル)"
 withRepliesByDefaultForNewlyFollowed: "フォローする時、デフォルトで返信をタイムラインに含むようにしよか"
 newNoteRecived: "新しいノートがあるで"
+newNote: "新しいノートがあるで"
 sounds: "音"
 sound: "音"
+notificationSoundSettings: "通知音の設定"
 listen: "聴く"
 none: "なし"
 showInPage: "ページで表示"
 popout: "ポップアウト"
-volume: "やかましさ"
+volume: "音のでかさ"
 masterVolume: "全体のやかましさ"
 notUseSound: "音出さへん"
 useSoundOnlyWhenActive: "Misskeyがアクティブなときだけ音出す"
@@ -597,7 +602,7 @@ nothing: "あらへん"
 installedDate: "インストールした日時"
 lastUsedDate: "最後に使った日時"
 state: "状態"
-sort: "仕分ける"
+sort: "並び替え"
 ascendingOrder: "小さい順"
 descendingOrder: "大きい順"
 scratchpad: "スクラッチパッド"
@@ -657,9 +662,9 @@ useBlurEffectForModal: "モーダルにぼかし効果を使用"
 useFullReactionPicker: "フルフルのツッコミピッカーを使う"
 width: "幅"
 height: "高さ"
-large: "大"
+large: "でかい"
-medium: "中"
+medium: "ふつう"
-small: "小"
+small: "ちいさい"
 generateAccessToken: "アクセストークンの発行"
 permission: "権限"
 adminPermission: "管理者権限"
@@ -684,7 +689,7 @@ smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
 smtpSecureInfo: "STARTTLS使っとる時はオフにしてや。"
 testEmail: "配信テスト"
 wordMute: "ワードミュート"
-wordMuteDescription: "指定した語句が入ってるノートを最小化するで。最小化されたノートをクリックしたら、表示できるようになるで。"
+wordMuteDescription: "指定した語句が入ってるノートをちっさくするで。ちっさくなったノートをクリックしたら中身を見れるで。"
 hardWordMute: "ハードワードミュート"
 showMutedWord: "ミュートされたワードを表示するで"
 hardWordMuteDescription: "指定した語句が入ってるノートを隠すで。ワードミュートとちゃうて、ノートは完全に表示されんようになるで。"
@@ -718,7 +723,7 @@ behavior: "動作"
 sample: "サンプル"
 abuseReports: "通報"
 reportAbuse: "通報"
-reportAbuseRenote: "リノート苦情だすで？"
+reportAbuseRenote: "リノートの苦情出す"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "細かい通報理由を書いてなー。対象ノートがある時はそのURLも書いといてなー。"
 abuseReported: "無事内容が送信されたみたいやで。おおきに〜。"
@@ -768,6 +773,7 @@ lockedAccountInfo: "フォローを承認制にしとっても、ノートの公
 alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にするで"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にするで"
 disableShowingAnimatedImages: "アニメーション画像を再生せんとくで"
+disableShowingAnimatedImages_caption: "この設定を変えてもアニメーション画像が再生されへん時は、ブラウザとかOSのアクセシビリティ設定とか省電力設定の方が悪さしてるかもしれへんで。"
 highlightSensitiveMedia: "きわどいことをめっっちゃわかりやすくする"
 verificationEmailSent: "無事確認のメールを送れたで。メールに書いてあるリンクにアクセスして、設定を完了してなー。"
 notSet: "未設定"
@@ -877,7 +883,7 @@ startingperiod: "始めた期間"
 memo: "メモ"
 priority: "優先度"
 high: "高い"
-middle: "中"
+middle: "ふつう"
 low: "低い"
 emailNotConfiguredWarning: "メアドの設定がされてへんで。"
 ratio: "比率"
@@ -1014,6 +1020,9 @@ pushNotificationAlreadySubscribed: "プッシュ通知はオンになってる
 pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知に対応してないみたいやで。"
 sendPushNotificationReadMessage: "通知やメッセージが既読になったらプッシュ通知を消すで"
 sendPushNotificationReadMessageCaption: "あんたの端末の電池使う量が増えるかもしれん。"
+pleaseAllowPushNotification: "ブラウザの通知設定を許可してな"
+browserPushNotificationDisabled: "通知の送信権限が取れんかったわ"
+browserPushNotificationDisabledDescription: "今 {serverName} から通知を送るための権限が無いから、ブラウザの設定で通知を許可してもっかい試してな。"
 windowMaximize: "最大化"
 windowMinimize: "最小化"
 windowRestore: "元に戻す"
@@ -1050,6 +1059,7 @@ permissionDeniedError: "操作が拒否されてもうた。"
 permissionDeniedErrorDescription: "このアカウントはこれやったらアカンって。"
 preset: "プリセット"
 selectFromPresets: "プリセットから選ぶ"
+custom: "カスタム"
 achievements: "実績"
 gotInvalidResponseError: "サーバー黙っとるわ、知らんけど"
 gotInvalidResponseErrorDescription: "サーバーいま日曜日。またきて月曜日。"
@@ -1088,6 +1098,7 @@ prohibitedWordsDescription2: "スペースで区切るとAND指定、キーワ
 hiddenTags: "見えてへんハッシュタグ"
 hiddenTagsDescription: "設定したタグを最近流行りのとこに見えんようにすんで。複数設定するときは改行で区切ってな。"
 notesSearchNotAvailable: "なんかノート探せへん。"
+usersSearchNotAvailable: "ユーザーを探すことはできへんみたいや。"
 license: "ライセンス"
 unfavoriteConfirm: "ほんまに気に入らんの？"
 myClips: "自分のクリップ"
@@ -1239,6 +1250,7 @@ releaseToRefresh: "離したらリロード"
 refreshing: "リロードしとる"
 pullDownToRefresh: "引っ張ってリロードするで"
 useGroupedNotifications: "通知をグループ分けして出すで"
+emailVerificationFailedError: "メアド確認してたらなんか変なことなったわ。リンクの期限切れてるかもしれん。"
 cwNotationRequired: "「内容を隠す」んやったら注釈書かなアカンで。"
 doReaction: "ツッコむで"
 code: "コード"
@@ -1331,22 +1343,41 @@ unmuteX: "{x}のミュートやめたる"
 redisplayAllTips: "全部の「ヒントとコツ」をもっかい見して"
 hideAllTips: "「ヒントとコツ」は全部表示せんでええ"
 defaultImageCompressionLevel_description: "低くすると画質は保てるんやけど、ファイルサイズが増えるで。<br>高くするとファイルサイズは減らせるんやけど、画質が落ちるで。"
+defaultCompressionLevel_description: "低くすると品質は保てるんやけど、ファイルサイズが増えるで。<br>高くするとファイルサイズは減らせるんやけど、品質が落ちるで。"
 inMinutes: "分"
 inDays: "日"
 safeModeEnabled: "セーフモードがオンになってるで"
 pluginsAreDisabledBecauseSafeMode: "セーフモードがオンやから、プラグインは全部無効化されてるで。"
 customCssIsDisabledBecauseSafeMode: "セーフモードがオンやから、カスタムCSSは適用されてへんで。"
 themeIsDefaultBecauseSafeMode: "セーフモードがオンの間はデフォルトのテーマを使うで。セーフモードをオフにれば元に戻るで。"
+thankYouForTestingBeta: "ベータ版使うてくれておおきに！"
 widgets: "ウィジェット"
+deviceInfoDescription: "なんか技術的なことで分からんこと聞くときは、下の情報も一緒に書いてもらえると、こっちも分かりやすいし、はよ直ると思います。"
+youAreAdmin: "あんた、管理者やで"
+presets: "プリセット"
+_imageEditing:
+  _vars:
+    filename: "ファイル名"
+_imageFrameEditor:
+  tip: "画像にフレームとかメタデータを入れたラベルとかを付け足していい感じにできるで。"
+  header: "ヘッダー"
+  font: "フォント"
+  fontSerif: "セリフ"
+  fontSansSerif: "サンセリフ"
+  quitWithoutSaveConfirm: "保存せずに終わってもええんか？"
+  failedToLoadImage: "あかん、画像読み込まれへんわ"
 _chat:
   noMessagesYet: "まだメッセージはあらへんで"
-  individualChat_description: "特定のユーザーと一対一でチャットができるで。"
+  individualChat_description: "特定のユーザーとサシでチャットできるで。"
   roomChat_description: "複数人でチャットできるで。\nあと、個人チャットを許可してへんユーザーとでも、相手がええって言うならチャットできるで。"
   inviteUserToChat: "ユーザーを招待してチャットを始めてみ"
   invitations: "来てや"
   noInvitations: "招待はあらへんで"
   noHistory: "履歴はないわ。"
   noRooms: "ルームはあらへんで"
+  join: "入る"
+  ignore: "ほっとく"
+  leave: "グループから抜ける"
   members: "メンバーはん"
   home: "ホーム"
   send: "送信"
@@ -1389,11 +1420,13 @@ _settings:
   appearanceBanner: "好みに応じた、クライアントの見た目・表示方法に関わる設定ができるで。"
   soundsBanner: "クライアントで流すサウンドの設定ができるで。"
   makeEveryTextElementsSelectable: "全部のテキスト要素を選択できるようにする"
-  makeEveryTextElementsSelectable_description: "これをつけると、一部のシチュエーションでユーザビリティが低下するかもしれん。"
+  makeEveryTextElementsSelectable_description: "これをつけると、場面によったら使いにくくなるかもしれん。"
+  useStickyIcons: "アイコンがスクロールにひっつくようにする"
   enablePullToRefresh_description: "マウスやったら、ホイールを押し込みながらドラッグしてな。"
   realtimeMode_description: "サーバーと接続を確立して、リアルタイムでコンテンツを更新するで。通信量とバッテリーの消費が多くなるかもしれへん。"
-  contentsUpdateFrequency_description: "高いほどリアルタイムにコンテンツが更新されるんやけど、そのぶんパフォーマンスが低くなるし、通信量とバッテリーの消費も増えるねん。"
+  contentsUpdateFrequency_description: "高いほどリアルタイムにコンテンツが更新されるんやけど、そのぶんパフォーマンスが落ちるし、通信量とバッテリーの消費も増えるねん。"
   contentsUpdateFrequency_description2: "リアルタイムモードをつけてるんやったら、この設定がどうであれリアルタイムでコンテンツが更新されるで。"
+  emojiPaletteBanner: "絵文字ピッカーに置いとくプリセットをパレットっていうので登録したり、ピッカーの見た目を変えたりできるで。"
 _preferencesProfile:
   profileNameDescription: "このデバイスはなんて呼んだらええんや？"
 _preferencesBackup:
@@ -1487,7 +1520,7 @@ _initialTutorial:
     description: "ここでは、Misskeyのカンタンな使い方とか機能を確かめれんで。"
   _note:
     title: "ノートってなんや？"
-    description: "Misskeyでの投稿は「ノート」って呼ばれてんで。ノートは順々にタイムラインに載ってて、リアルタイムで新しくなってってんで。"
+    description: "Misskeyでの投稿は「ノート」って呼ばれてんで。ノートは順々にタイムラインに載ってて、リアルタイムで新しくなってくで。"
     reply: "返信もできるで。返信の返信もできるから、スレッドっぽく会話をそのまま続けれもするで。"
     renote: "そのノートを自分のタイムラインに流して共有できるで。テキスト入れて引用してもええな。"
     reaction: "ツッコミをつけることもできるで。細かいことは次のページや。"
@@ -1507,7 +1540,7 @@ _initialTutorial:
     social: "ホームタイムラインの投稿もローカルタイムラインのも一緒に見れるで。"
     global: "繋がってる他の全サーバーからの投稿が見れるで。"
     description2: "それぞれのタイムラインは、いつでも画面上で切り替えられんねん。覚えとき。"
-    description3: "その他にも、リストタイムラインとかチャンネルタイムラインとかがあんねん。詳しいのは{link}を見とき。"
+    description3: "その他にも、リストタイムラインとかチャンネルタイムラインとかがあんねん。詳しいのは{link}を見ときや。"
   _postNote:
     title: "ノートの投稿設定"
     description1: "Misskeyにノートを投稿するとき、いろんなオプションが付けれるで。投稿画面はこんな感じや。"
@@ -1543,7 +1576,7 @@ _timelineDescription:
   home: "ホームタイムラインは、あんたがフォローしとるアカウントの投稿だけ見れるで。"
   local: "ローカルタイムラインは、このサーバーにおる全員の投稿を見れるで。"
   social: "ソーシャルタイムラインは、ホームタイムラインの投稿もローカルタイムラインのも一緒に見れるで。"
-  global: "グローバルタイムラインは、繋がっとる他のサーバーの投稿、全部ひっくるめて見れんで。"
+  global: "グローバルタイムラインは、繋がっとる他のサーバーの投稿、全部ひっくるめて見れるで。"
 _serverRules:
   description: "新規登録前に見せる、サーバーのカンタンなルールを決めるで。内容は使うための決め事の要約がええと思うわ。"
 _serverSettings:
@@ -1563,7 +1596,7 @@ _serverSettings:
   inquiryUrl: "問い合わせ先URL"
   inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定するで。"
   openRegistration: "アカウントの作成をオープンにする"
-  openRegistrationWarning: "登録を解放するのはリスクが伴うで。サーバーをいっつも監視して、なんか起きたらすぐに対応できるんやったら、オンにしてもええと思う。"
+  openRegistrationWarning: "登録を解放するのはリスクあるで。サーバーをいっつも監視して、なんか起きたらすぐに対応できるんやったら、オンにしてもええと思うけどな。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "一定期間モデレーターがおらんかったら、スパムを防ぐためにこの設定は勝手に切られるで。"
   deliverSuspendedSoftwareDescription: "脆弱性とかの理由で、サーバーのソフトウェアの名前とバージョンの範囲を決めて配信を止められるで。このバージョン情報はサーバーが提供したものやから、信頼性は保証されへん。バージョン指定には semver の範囲指定が使えるねんけど、>= 2024.3.1と指定すると 2024.3.1-custom.0 みたいなカスタムバージョンが含まれへんから、>= 2024.3.1-0 みたいに prerelease を指定するとええかもしれへんな。"
   singleUserMode_description: "このサーバーを使うとるんが自分だけなんやったら、このモードを有効にすると動作がええ感じになるで。"
@@ -1958,7 +1991,7 @@ _signup:
   emailSent: "さっき入れたメアド({email})宛に確認メールを送ったで。メールに書かれたリンク押してアカウント作るの終わらしてな。\nメールの認証リンクの期限は30分や。"
 _accountDelete:
   accountDelete: "アカウントの削除"
-  mayTakeTime: "アカウント消すんはサーバーが重いんやって。やから作ったコンテンツとか上げたファイルの数が多いと消し終わるまでに時間がかかるかもしれへん。"
+  mayTakeTime: "アカウント消すんはサーバーに負荷かかるんやって。やから、作ったコンテンツとか上げたファイルの数が多いと消し終わるまでに時間がかかるかもしれんわ。"
   sendEmail: "アカウントの消し終わるときは、登録してたメアドに通知するで。"
   requestAccountDelete: "アカウント削除頼む"
   started: "削除処理が始まったで。"
@@ -2298,6 +2331,7 @@ _auth:
   scopeUser: "以下のユーザーとしていじってるで"
   pleaseLogin: "アプリにアクセスさせるんやったら、ログインしてや。"
   byClickingYouWillBeRedirectedToThisUrl: "アクセスを許したら、自動で下のURLに遷移するで"
+  alreadyAuthorized: "このアプリはもうアクセスを許可してるみたいやで。"
 _antennaSources:
   all: "みんなのノート"
   homeTimeline: "フォローしとるユーザーのノート"
@@ -2388,6 +2422,14 @@ _postForm:
   replyPlaceholder: "このノートに返信..."
   quotePlaceholder: "このノートを引用..."
   channelPlaceholder: "チャンネルに投稿..."
+  _howToUse:
+    toolbar_description: "ファイルとかアンケートを付けたり、注釈とかハッシュタグを書いたり、絵文字とかメンションとかを付け足したりできるで。"
+    account_description: "投稿するアカウントを変えたり、アカウントに保存した下書きとか予約投稿とかを見れるで。"
+    visibility_title: "公開範囲"
+    visibility_description: "ノートを誰に見せたいかはここで切り替えてな。"
+    menu_title: "メニュー"
+    menu_description: "下書きに保存したり、投稿の予約したり、リアクションの受け入れ設定とか…なんか色々できるで。"
+    submit_description: "ノートを投稿するときはここ押してな。Ctrl + Enter / Cmd + Enter でも投稿できるで。"
   _placeholders:
     a: "いまどないしとるん？"
     b: "何かあったん？"
@@ -2533,6 +2575,8 @@ _notification:
   youReceivedFollowRequest: "フォロー許可してほしいみたいやな"
   yourFollowRequestAccepted: "フォローさせてもろたで"
   pollEnded: "アンケートの結果が出たみたいや"
+  scheduledNotePosted: "予約ノートが投稿されたで"
+  scheduledNotePostFailed: "予約ノート投稿できんかったで"
   newNote: "さらの投稿"
   unreadAntennaNote: "アンテナ {name}"
   roleAssigned: "ロールが付与されたで"
@@ -2999,6 +3043,7 @@ _uploader:
   maxFileSizeIsX: "アップロードできるファイルサイズは{x}までやで。"
   tip: "ファイルはまだアップロードされてへんで。このダイアログで、アップロードする前に確認・リネーム・圧縮・クロッピングとかをできるで。準備が出来たら、「アップロード」ボタンを押してアップロードしてな。"
 _clientPerformanceIssueTip:
+  title: "バッテリーようさん食うなぁと思ったら"
   makeSureDisabledAdBlocker: "アドブロッカーを切ってみてや"
   makeSureDisabledAdBlocker_description: "アドブロッカーはパフォーマンスに影響があるかもしれへん。OSの機能とかブラウザの機能・アドオンとかでアドブロッカーが有効になってないか確認してや。"
   makeSureDisabledCustomCss: "カスタムCSSを無効にしてみてや"
@@ -3022,8 +3067,10 @@ _watermarkEditor:
   image: "画像"
   advanced: "高度"
   angle: "角度"
+  failedToLoadImage: "あかん、画像読み込まれへんわ"
 _imageEffector:
   discardChangesConfirm: "変更をせんで終わるか？"
+  failedToLoadImage: "あかん、画像読み込まれへんわ"
   _fxProps:
     angle: "角度"
     scale: "大きさ"
@@ -3040,4 +3087,5 @@ _drafts:
   noDrafts: "下書きはあらへん"
 _qr:
   showTabTitle: "表示"
+  shareText: "Fediverseでフォローしてな！"
   raw: "テキスト"

locales/kab-KAB.yml

@@ -57,6 +57,10 @@ searchByGoogle: "Nadi"
 file: "Ifuyla"
 account: "Imiḍan"
 replies: "Err"
+_imageFrameEditor:
+  font: "Tasefsit"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _email:
   _follow:
     title: "Yeṭṭafaṛ-ik·em-id"

locales/ko-GS.yml

@@ -651,6 +651,9 @@ renotes: "리노트"
 attach: "옇기"
 surrender: "아이예"
 information: "정보"
+_imageEditing:
+  _vars:
+    filename: "파일 이럼"
 _chat:
   invitations: "초대하기"
   noHistory: "기록이 없십니다"

locales/ko-KR.yml

@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "업로드가 완료될 때까지 시간이 소요될
 uploadNFiles: "{n}개의 파일을 업로"
 explore: "둘러보기"
 messageRead: "읽음"
+readAllChatMessages: "모든 메시지를 읽은 상태로 표시"
 noMoreHistory: "이것보다 과거의 기록이 없습니다"
 startChat: "채팅을 시작하기"
 nUsersRead: "{n}명이 읽음"
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "푸시 알림이 이미 켜져 있습니다"
 pushNotificationNotSupported: "브라우저나 서버에서 푸시 알림이 지원되지 않습니다"
 sendPushNotificationReadMessage: "푸시 알림이나 메시지를 읽은 뒤 푸시 알림을 삭제"
 sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」이라는 알림이 잠깐 표시됩니다. 기기의 전력 소비량이 증가할 수 있습니다."
+pleaseAllowPushNotification: "브라우저의 알림 설정을 허가해 주십시오."
+browserPushNotificationDisabled: "알림 송신 권한 얻기에 실패했습니다."
+browserPushNotificationDisabledDescription: "{serverName}에서의 알림 송신 권한이 없습니다. 브라우저의 설정에서 알림을 허가해 다시 시도해 주십시오."
 windowMaximize: "최대화"
 windowMinimize: "최소화"
 windowRestore: "복구"
@@ -1396,6 +1400,50 @@ scheduled: "예약"
 widgets: "위젯"
 deviceInfo: "장치 정보"
 deviceInfoDescription: "기술적 문의의 경우 아래의 정보를 병기하면 문제의 해결에 도움이 됩니다."
+youAreAdmin: "당신은 관리자입니다."
+frame: "프레임"
+presets: "프리셋"
+zeroPadding: "0으로 채우기"
+_imageEditing:
+  _vars:
+    caption: "파일 설명"
+    filename: "파일명"
+    filename_without_ext: "확장자가 없는 파일명"
+    year: "촬영한 해"
+    month: "촬영한 달"
+    day: "촬영한 날"
+    hour: "촬영한 시각(시)"
+    minute: "촬영한 시각(분)"
+    second: "촬영한 시각(초)"
+    camera_model: "카메라 이름"
+    camera_lens_model: "렌즈 이름"
+    camera_mm: "초점 거리"
+    camera_mm_35: "초점 거리(35m판 환산)"
+    camera_f: "조리개 조절"
+    camera_s: "셔터 속도"
+    camera_iso: "ISO 감도"
+    gps_lat: "위도"
+    gps_long: "경도"
+_imageFrameEditor:
+  title: "프레임 편집"
+  tip: "이미지에 프레임이나 메타 데이터를 포함한 라벨을 추가해 장식할 수 있습니다."
+  header: "헤더"
+  footer: "꼬리말"
+  borderThickness: "테두리의 폭"
+  labelThickness: "라벨의 폭"
+  labelScale: "라벨의 스케일"
+  centered: "중앙 정렬"
+  captionMain: "캡션(대)"
+  captionSub: "캡션(소)"
+  availableVariables: "이용 가능한 변수"
+  withQrCode: "QR 코드"
+  backgroundColor: "배경색"
+  textColor: "글꼴 색상"
+  font: "폰트"
+  fontSerif: "명조체"
+  fontSansSerif: "고딕체"
+  quitWithoutSaveConfirm: "보존하지 않고 종료하시겠습니까?"
+  failedToLoadImage: "이미지 로드에 실패했습니다."
 _compression:
   _quality:
     high: "고품질"
@@ -1498,6 +1546,8 @@ _settings:
   showUrlPreview: "URL 미리보기 표시"
   showAvailableReactionsFirstInNote: "이용 가능한 리액션을 선두로 표시"
   showPageTabBarBottom: "페이지의 탭 바를 아래쪽에 표시"
+  emojiPaletteBanner: "이모티콘 선택기에 고정 표시되는 프리셋을 팔레트로 등록하거나 선택기의 표시 방법을 커스터마이징할 수 있습니다."
+  enableAnimatedImages: "애니메이션 이미지 활성화"
   _chat:
     showSenderName: "발신자 이름 표시"
     sendOnEnter: "엔터로 보내기"
@@ -1515,6 +1565,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "자동 백업을 활성화하려면 프로필 이름을 설정해야 합니다."
   autoPreferencesBackupIsNotEnabledForThisDevice: "이 장치에서 설정 자동 백업이 활성화되어 있지 않습니다."
   backupFound: "설정 백업이 발견되었습니다"
+  forceBackup: "설정 강제 백업"
 _accountSettings:
   requireSigninToViewContents: "콘텐츠 열람을 위해 로그인을 필수로 설정하기"
   requireSigninToViewContentsDescription1: "자신이 작성한 모든 노트 등의 콘텐츠를 보기 위해 로그인을 필수로 설정합니다. 크롤러가 정보 수집하는 것을 방지하는 효과를 기대할 수 있습니다."
@@ -2530,6 +2581,20 @@ _postForm:
   replyPlaceholder: "이 노트에 답글..."
   quotePlaceholder: "이 노트를 인용..."
   channelPlaceholder: "채널에 게시하기..."
+  showHowToUse: "입력란의 설명 표시"
+  _howToUse:
+    content_title: "본문"
+    content_description: "게시할 내용을 입력합니다."
+    toolbar_title: "도구 모음"
+    toolbar_description: "파일이나 설문의 첨부, 주석이나 해시태그 설정, 이모티콘이나 멘션의 삽입 등을 할 수 있습니다."
+    account_title: "계정 메뉴"
+    account_description: "게시할 계정을 교체하거나, 계정에 보존한 초안 및 예약 게시물을 목록으로 볼 수 있습니다."
+    visibility_title: "공개 범위"
+    visibility_description: "노트 공개 범위의 설정을 할 수 있습니다."
+    menu_title: "메뉴"
+    menu_description: "초안의 보존, 게시 예약, 리액션의 설정 등 그 외의 액션을 할 수 있습니다."
+    submit_title: "게시 버튼"
+    submit_description: "노트를 게시합니다. Ctrl + Enter / Cmd + Enter로도 게시할 수 있습니다."
   _placeholders:
     a: "지금 무엇을 하고 있나요?"
     b: "무슨 일이 일어나고 있나요?"
@@ -2807,6 +2872,8 @@ _abuseReport:
     notifiedWebhook: "사용할 Webhook"
     deleteConfirm: "수신자를 삭제하시겠습니까?"
 _moderationLogTypes:
+  clearQueue: "작업 대기열 비우기"
+  promoteQueue: "큐의 작업을 재시도"
   createRole: "역할 생성"
   deleteRole: "역할 삭제"
   updateRole: "역할 수정"
@@ -3223,11 +3290,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "서브 물방울의 크기"
   polkadotSubDotDivisions: "서브 물방울의 수"
   leaveBlankToAccountUrl: "빈칸일 경우 계정의 URL로 됩니다."
+  failedToLoadImage: "이미지 로딩에 실패했습니다."
 _imageEffector:
   title: "이펙트"
   addEffect: "이펙트를 추가"
   discardChangesConfirm: "변경을 취소하고 종료하시겠습니까?"
   nothingToConfigure: "설정 항목이 없습니다."
+  failedToLoadImage: "이미지 로딩에 실패했습니다."
   _fxs:
     chromaticAberration: "색수차"
     glitch: "글리치"

locales/lo-LA.yml

@@ -393,6 +393,9 @@ file: "ໄຟລ໌"
 replies: "ຕອບ​ກັບ"
 renotes: "Renote"
 information: "ກ່ຽວກັບ"
+_imageEditing:
+  _vars:
+    filename: "ຊື່ໄຟລ໌"
 _chat:
   invitations: "ເຊີນ"
   noHistory: "​ບໍ່​ມີປະຫວັດ"
@@ -434,6 +437,9 @@ _visibility:
   home: "ໜ້າຫຼັກ"
   followers: "ຜູ້ຕິດຕາມ"
   specified: "ໂພສ Direct note"
+_postForm:
+  _howToUse:
+    menu_title: "ເມນູ"
 _profile:
   name: "ຊື່"
   username: "ຊື່ຜູ້ໃຊ້"

locales/nl-NL.yml

@@ -970,6 +970,9 @@ renotes: "Herdelen"
 followingOrFollower: "Gevolgd of volger"
 confirmShowRepliesAll: "Dit is een onomkeerbare operatie. Weet je zeker dat reacties op anderen van iedereen die je volgt, wil weergeven in je tijdlijn?"
 information: "Over"
+_imageEditing:
+  _vars:
+    filename: "Bestandsnaam"
 _chat:
   invitations: "Uitnodigen"
   noHistory: "Geen geschiedenis gevonden"
@@ -1020,6 +1023,10 @@ _visibility:
   home: "Startpagina"
   followers: "Volgers"
   specified: "Directe notities"
+_postForm:
+  _howToUse:
+    visibility_title: "Zichtbaarheid"
+    menu_title: "Menu"
 _profile:
   name: "Naam"
   username: "Gebruikersnaam"

locales/no-NO.yml

@@ -463,6 +463,12 @@ surrender: "Avbryt"
 information: "Informasjon"
 inMinutes: "Minutter"
 inDays: "Dager"
+_imageEditing:
+  _vars:
+    filename: "Filnavn"
+_imageFrameEditor:
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _chat:
   invitations: "Inviter"
   members: "Medlemmer"
@@ -650,6 +656,8 @@ _visibility:
   home: "Hjem"
   followers: "Følgere"
 _postForm:
+  _howToUse:
+    menu_title: "Meny"
   _placeholders:
     a: "Hva skjer?"
 _profile:

locales/pl-PL.yml

@@ -1043,6 +1043,15 @@ information: "Informacje"
 inMinutes: "minuta"
 inDays: "dzień"
 widgets: "Widżety"
+presets: "Konfiguracja"
+_imageEditing:
+  _vars:
+    filename: "Nazwa pliku"
+_imageFrameEditor:
+  header: "Nagłówek"
+  font: "Czcionka"
+  fontSerif: "Szeryfowa"
+  fontSansSerif: "Bezszeryfowa"
 _chat:
   invitations: "Zaproś"
   noHistory: "Brak historii"
@@ -1393,6 +1402,9 @@ _postForm:
   replyPlaceholder: "Odpowiedz na ten wpis..."
   quotePlaceholder: "Zacytuj ten wpis…"
   channelPlaceholder: "Publikuj na kanale..."
+  _howToUse:
+    visibility_title: "Widoczność"
+    menu_title: "Menu"
   _placeholders:
     a: "Co się dzieje?"
     b: "Co się wydarzyło?"

locales/pt-PT.yml

@@ -1390,6 +1390,17 @@ scheduledToPostOnX: "A nota está agendada para {x}"
 schedule: "Agendar"
 scheduled: "Agendado"
 widgets: "Widgets"
+presets: "Predefinições"
+_imageEditing:
+  _vars:
+    filename: "Nome do Ficheiro"
+_imageFrameEditor:
+  header: "Cabeçalho"
+  withQrCode: "Código QR"
+  font: "Fonte"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "Descartar mudanças?"
 _compression:
   _quality:
     high: "Qualidade alta"
@@ -2522,6 +2533,9 @@ _postForm:
   replyPlaceholder: "Responder a essa nota..."
   quotePlaceholder: "Citar essa nota..."
   channelPlaceholder: "Postar em canal..."
+  _howToUse:
+    visibility_title: "Visibilidade"
+    menu_title: "Menu\n"
   _placeholders:
     a: "Como vão as coisas?"
     b: "O que está rolando por aí?"

locales/ro-RO.yml

@@ -1215,6 +1215,10 @@ lastNDays: "Ultimele {n} zile"
 surrender: "Anulează"
 copyPreferenceId: "Copiază ID-ul preferințelor"
 information: "Despre"
+presets: "Presetate"
+_imageEditing:
+  _vars:
+    filename: "Nume fișier"
 _chat:
   invitations: "Invită"
   noHistory: "Nu există istoric"
@@ -1307,6 +1311,9 @@ _postForm:
   replyPlaceholder: "Răspunde la această notă..."
   quotePlaceholder: "Citează aceasta nota..."
   channelPlaceholder: "Postează pe un canal..."
+  _howToUse:
+    visibility_title: "Vizibilitate"
+    menu_title: "Meniu"
   _placeholders:
     a: "Ce mai faci?"
     b: "Ce se mai petrece in jurul tău?"

locales/ru-RU.yml

@@ -87,7 +87,7 @@ exportRequested: "Вы запросили экспорт. Это может за
 importRequested: "Вы запросили импорт. Это может занять некоторое время."
 lists: "Списки"
 noLists: "Нет ни одного списка"
-note: "Заметка"
+note: "Пост"
 notes: "Заметки"
 following: "Подписки"
 followers: "Подписчики"
@@ -122,7 +122,7 @@ inChannelRenote: "В канале"
 inChannelQuote: "Заметки в канале"
 renoteToChannel: "Репостнуть в канал"
 renoteToOtherChannel: "Репостнуть в другой канал"
-pinnedNote: "Закреплённая заметка"
+pinnedNote: "Закреплённый пост"
 pinned: "Закрепить в профиле"
 you: "Вы"
 clickToShow: "Нажмите для просмотра"
@@ -253,6 +253,7 @@ noteDeleteConfirm: "Вы хотите удалить эту заметку?"
 pinLimitExceeded: "Нельзя закрепить ещё больше заметок"
 done: "Готово"
 processing: "Обработка"
+preprocessing: "Подготовка..."
 preview: "Предпросмотр"
 default: "По умолчанию"
 defaultValueIs: "По умолчанию: {value}"
@@ -396,7 +397,7 @@ pinnedUsersDescription: "Перечислите по одному имени п
 pinnedPages: "Закрепленные страницы"
 pinnedPagesDescription: "Если хотите закрепить страницы на главной сайта, сюда можно добавить пути к ним, каждый в отдельной строке."
 pinnedClipId: "Идентификатор закреплённой подборки"
-pinnedNotes: "Закреплённая заметка"
+pinnedNotes: "Закреплённый пост"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Включить hCaptcha"
 hcaptchaSiteKey: "Ключ сайта"
@@ -1164,6 +1165,7 @@ installed: "Установлено"
 branding: "Бренд"
 enableServerMachineStats: "Опубликовать характеристики сервера"
 enableIdenticonGeneration: "Включить генерацию иконки пользователя"
+showRoleBadgesOfRemoteUsers: "Display the role badges assigned to remote users"
 turnOffToImprovePerformance: "Отключение этого параметра может повысить производительность."
 createInviteCode: "Создать код приглашения"
 createWithOptions: "Используйте параметры для создания"
@@ -1278,6 +1280,15 @@ information: "Описание"
 inMinutes: "мин"
 inDays: "сут"
 widgets: "Виджеты"
+presets: "Шаблоны"
+_imageEditing:
+  _vars:
+    filename: "Имя файла"
+_imageFrameEditor:
+  header: "Заголовок"
+  font: "Шрифт"
+  fontSerif: "Антиква (с засечками)"
+  fontSansSerif: "Гротеск (без засечек)"
 _chat:
   invitations: "Пригласить"
   noHistory: "История пока пуста"
@@ -2007,6 +2018,9 @@ _postForm:
   replyPlaceholder: "Ответ на заметку..."
   quotePlaceholder: "Пояснение к цитате..."
   channelPlaceholder: "Отправить в канал"
+  _howToUse:
+    visibility_title: "Видимость"
+    menu_title: "Меню"
   _placeholders:
     a: "Как дела?"
     b: "Что интересного вокруг?"

locales/sk-SK.yml

@@ -916,6 +916,14 @@ information: "Informácie"
 inMinutes: "min"
 inDays: "dní"
 widgets: "Widgety"
+_imageEditing:
+  _vars:
+    filename: "Názov súboru"
+_imageFrameEditor:
+  header: "Hlavička"
+  font: "Písmo"
+  fontSerif: "Pätkové"
+  fontSansSerif: "Bezpätkové"
 _chat:
   invitations: "Pozvať"
   noHistory: "Žiadna história"
@@ -1264,6 +1272,9 @@ _postForm:
   replyPlaceholder: "Odpoveď na túto poznámku..."
   quotePlaceholder: "Citovanie tejto poznámky..."
   channelPlaceholder: "Poslať do kanála..."
+  _howToUse:
+    visibility_title: "Viditeľnosť"
+    menu_title: "Menu"
   _placeholders:
     a: "Čo máte v pláne?"
     b: "Čo sa deje?"

locales/sv-SE.yml

@@ -559,6 +559,9 @@ tryAgain: "Försök igen senare"
 signinWithPasskey: "Logga in med nyckel"
 unknownWebAuthnKey: "Okänd nyckel"
 information: "Om"
+_imageEditing:
+  _vars:
+    filename: "Filnamn"
 _chat:
   invitations: "Inbjudan"
   members: "Medlemmar"
@@ -647,6 +650,9 @@ _visibility:
   home: "Hem"
   followers: "Följare"
   specified: "Direktnoter"
+_postForm:
+  _howToUse:
+    menu_title: "Meny"
 _profile:
   name: "Namn"
   username: "Användarnamn"

locales/th-TH.yml

@@ -1390,6 +1390,17 @@ scheduledToPostOnX: "มีการกำหนดเวลาให้โพ
 schedule: "กำหนดเวลา"
 scheduled: "กำหนดเวลา"
 widgets: "วิดเจ็ต"
+presets: "พรีเซ็ต"
+_imageEditing:
+  _vars:
+    filename: "ชื่อไฟล์"
+_imageFrameEditor:
+  header: "ส่วนหัว"
+  withQrCode: "QR โค้ด"
+  font: "แบบอักษร"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "ต้องการออกโดยไม่บันทึกหรือไม่?"
 _compression:
   _quality:
     high: "คุณภาพสูง"
@@ -2522,6 +2533,9 @@ _postForm:
   replyPlaceholder: "ตอบกลับโน้ตนี้..."
   quotePlaceholder: "อ้างโน้ตนี้..."
   channelPlaceholder: "โพสต์ลงช่อง..."
+  _howToUse:
+    visibility_title: "การมองเห็น"
+    menu_title: "เมนู"
   _placeholders:
     a: "ตอนนี้เป็นยังไงบ้าง?"
     b: "มีอะไรเกิดขึ้นหรือเปล่า?"

locales/tr-TR.yml

@@ -1379,6 +1379,16 @@ customCssIsDisabledBecauseSafeMode: "Güvenli mod etkin olduğu için özel CSS
 themeIsDefaultBecauseSafeMode: "Güvenli mod etkinken, varsayılan tema kullanılır. Güvenli modu devre dışı bırakmak bu değişiklikleri geri alır."
 thankYouForTestingBeta: "Beta sürümünü test ettiğin için teşekkür ederiz!"
 widgets: "Widget'lar"
+presets: "Ön ayar"
+_imageEditing:
+  _vars:
+    filename: "Dosya adı"
+_imageFrameEditor:
+  header: "Başlık"
+  font: "Yazı tipi"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  quitWithoutSaveConfirm: "Kaydedilmemiş değişiklikleri silmek ister misin?"
 _order:
   newest: "Önce yeni"
   oldest: "Önce eski"
@@ -2500,6 +2510,9 @@ _postForm:
   replyPlaceholder: "Bu notu yanıtla..."
   quotePlaceholder: "Bu notu alıntı yap..."
   channelPlaceholder: "Bir kanala gönder..."
+  _howToUse:
+    visibility_title: "Görünürlük"
+    menu_title: "Menü"
   _placeholders:
     a: "Ne yapıyorsun?"
     b: "Çevrende neler oluyor?"

locales/uk-UA.yml

@@ -922,6 +922,14 @@ information: "Інформація"
 inMinutes: "х"
 inDays: "д"
 widgets: "Віджети"
+_imageEditing:
+  _vars:
+    filename: "Ім'я файлу"
+_imageFrameEditor:
+  header: "Заголовок"
+  font: "Шрифт"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans serif"
 _chat:
   invitations: "Запросити"
   noHistory: "Історія порожня"
@@ -1462,6 +1470,9 @@ _postForm:
   replyPlaceholder: "Відповідь на цю нотатку..."
   quotePlaceholder: "Прокоментуйте цю нотатку..."
   channelPlaceholder: "Опублікувати в каналі"
+  _howToUse:
+    visibility_title: "Видимість"
+    menu_title: "Меню"
   _placeholders:
     a: "Чим займаєтесь?"
     b: "Що відбувається навколо вас?"

locales/uz-UZ.yml

@@ -837,6 +837,14 @@ replies: "Javob berish"
 renotes: "Qayta qayd etish"
 flip: "Teskari"
 information: "Haqida"
+_imageEditing:
+  _vars:
+    filename: "Fayl nomi"
+_imageFrameEditor:
+  header: "Sarlavha"
+  font: "Shrift"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _chat:
   invitations: "Taklif qilish"
   noHistory: "Tarix yo'q"
@@ -964,6 +972,10 @@ _visibility:
   home: "Bosh sahifa"
   followers: "Obunachilar"
   specified: "Bevosita"
+_postForm:
+  _howToUse:
+    visibility_title: "Ko'rinishi"
+    menu_title: "Menyu"
 _profile:
   name: "Ism"
   username: "Foydalanuvchi nomi"

locales/vi-VN.yml

@@ -1223,6 +1223,15 @@ migrateOldSettings_description: "Thông thường, quá trình này diễn ra t
 inMinutes: "phút"
 inDays: "ngày"
 widgets: "Tiện ích"
+presets: "Mẫu thiết lập"
+_imageEditing:
+  _vars:
+    filename: "Tên tập tin"
+_imageFrameEditor:
+  header: "Ảnh bìa"
+  font: "Phông chữ"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
 _chat:
   invitations: "Mời"
   noHistory: "Không có dữ liệu"
@@ -1859,6 +1868,9 @@ _postForm:
   replyPlaceholder: "Trả lời tút này"
   quotePlaceholder: "Trích dẫn tút này"
   channelPlaceholder: "Đăng lên một kênh"
+  _howToUse:
+    visibility_title: "Hiển thị"
+    menu_title: "Menu"
   _placeholders:
     a: "Bạn đang định làm gì?"
     b: "Hôm nay bạn có gì vui?"

locales/zh-CN.yml

@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "上传可能需要一些时间完成。"
 uploadNFiles: "上传 {n} 个文件"
 explore: "发现"
 messageRead: "已读"
+readAllChatMessages: "将所有消息标记为已读"
 noMoreHistory: "没有更多的历史记录"
 startChat: "开始聊天"
 nUsersRead: "{n}人已读"
@@ -1396,6 +1397,44 @@ scheduled: "定时"
 widgets: "小工具"
 deviceInfo: "设备信息"
 deviceInfoDescription: "咨询技术问题时，将以下信息一并发送有助于解决问题。"
+youAreAdmin: "你是管理员"
+presets: "预设值"
+zeroPadding: "填充 0"
+_imageEditing:
+  _vars:
+    caption: "文件标题"
+    filename: "文件名称"
+    filename_without_ext: "无扩展文件名"
+    year: "拍摄年"
+    month: "拍摄月"
+    day: "拍摄日"
+    hour: "拍摄时间（时）"
+    minute: "拍摄时间（分）"
+    second: "拍摄时间（秒）"
+    camera_model: "相机名称"
+    camera_lens_model: "镜头型号"
+    camera_mm: "焦距"
+    camera_f: "光圈"
+    camera_s: "快门速度"
+    camera_iso: "ISO"
+    gps_lat: "纬度"
+    gps_long: "经度"
+_imageFrameEditor:
+  header: "顶栏"
+  footer: "底部"
+  labelScale: "标签比例"
+  centered: "居中"
+  captionMain: "标题（大）"
+  captionSub: "标题（小）"
+  availableVariables: "可用变量"
+  withQrCode: "二维码"
+  backgroundColor: "背景色"
+  textColor: "文字色"
+  font: "字体"
+  fontSerif: "衬线字体"
+  fontSansSerif: "无衬线字体"
+  quitWithoutSaveConfirm: "不保存就退出吗？"
+  failedToLoadImage: "图片加载失败"
 _compression:
   _quality:
     high: "高质量"
@@ -1498,6 +1537,8 @@ _settings:
   showUrlPreview: "显示 URL 预览"
   showAvailableReactionsFirstInNote: "在顶部显示可用的回应"
   showPageTabBarBottom: "在下方显示页面标签栏"
+  emojiPaletteBanner: "可以将固定显示表情符号选择器的预设注册至调色板，也可以自定义表情符号选择器的显示方式。"
+  enableAnimatedImages: "启用动画图像"
   _chat:
     showSenderName: "显示发送者的名字"
     sendOnEnter: "回车键发送"
@@ -1506,6 +1547,8 @@ _preferencesProfile:
   profileNameDescription: "请指定用于识别此设备的名称"
   profileNameDescription2: "如「PC」、「手机」等"
   manageProfiles: "管理配置文件"
+  shareSameProfileBetweenDevicesIsNotRecommended: "不建议在多个设备间共用同一个配置文件。"
+  useSyncBetweenDevicesOptionIfYouWantToSyncSetting: "若想在多个设备间同步某些设置，请为每个设置打开「多设备间同步」选项。"
 _preferencesBackup:
   autoBackup: "自动备份"
   restoreFromBackup: "从备份恢复"
@@ -2530,6 +2573,20 @@ _postForm:
   replyPlaceholder: "回复这个帖子..."
   quotePlaceholder: "引用这个帖子..."
   channelPlaceholder: "发布到频道…"
+  showHowToUse: "显示窗口说明"
+  _howToUse:
+    content_title: "正文"
+    content_description: "在此输入要发布的内容。"
+    toolbar_title: "工具栏"
+    toolbar_description: "可在此添加文件和投票、设置注释和话题标签、插入表情符号和提及等。"
+    account_title: "账号菜单"
+    account_description: "可在此切换发帖用的账号、查看账户下保存的草稿及定时发送帖。"
+    visibility_title: "可见性"
+    visibility_description: "可在此设置帖子的公开范围。"
+    menu_title: "菜单"
+    menu_description: "可在此进行保存草稿、设置定时发帖、设置回应等其它操作。"
+    submit_title: "发帖按钮"
+    submit_description: "发布帖子。也可用 Ctrl + Enter / Cmd + Enter 来发帖。"
   _placeholders:
     a: "现在怎么样？"
     b: "想好发些什么了吗？"
@@ -3223,11 +3280,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "副波点的大小"
   polkadotSubDotDivisions: "副波点的数量"
   leaveBlankToAccountUrl: "留空则为账户 URL"
+  failedToLoadImage: "图片加载失败"
 _imageEffector:
   title: "效果"
   addEffect: "添加效果"
   discardChangesConfirm: "丢弃当前设置并退出？"
   nothingToConfigure: "还没有设置"
+  failedToLoadImage: "图片加载失败"
   _fxs:
     chromaticAberration: "色差"
     glitch: "故障"

locales/zh-TW.yml

@@ -302,6 +302,7 @@ uploadFromUrlMayTakeTime: "還需要一些時間才能完成上傳。"
 uploadNFiles: "上傳了 {n} 個檔案"
 explore: "探索"
 messageRead: "已讀"
+readAllChatMessages: "將所有訊息標記為已讀"
 noMoreHistory: "沒有更多歷史紀錄"
 startChat: "開始聊天"
 nUsersRead: "{n} 人已讀"
@@ -1022,6 +1023,9 @@ pushNotificationAlreadySubscribed: "推播通知啟用中"
 pushNotificationNotSupported: "瀏覽器或伺服器不支援推播通知"
 sendPushNotificationReadMessage: "如果已閱讀通知與訊息，就刪除推播通知"
 sendPushNotificationReadMessageCaption: "可能會導致裝置的電池消耗量增加。"
+pleaseAllowPushNotification: "請允許瀏覽器的通知設定"
+browserPushNotificationDisabled: "取得通知發送權限失敗"
+browserPushNotificationDisabledDescription: "您沒有權限從 {serverName} 發送通知。請在瀏覽器設定中允許通知，然後再試一次。"
 windowMaximize: "最大化"
 windowMinimize: "最小化"
 windowRestore: "復原"
@@ -1172,6 +1176,7 @@ installed: "已安裝"
 branding: "品牌宣傳"
 enableServerMachineStats: "公佈伺服器的機器資訊"
 enableIdenticonGeneration: "啟用生成使用者的 Identicon "
+showRoleBadgesOfRemoteUsers: "顯示授予遠端使用者的角色徽章"
 turnOffToImprovePerformance: "關閉時會提高性能。"
 createInviteCode: "建立邀請碼"
 createWithOptions: "使用選項建立"
@@ -1395,6 +1400,50 @@ scheduled: "排定"
 widgets: "小工具"
 deviceInfo: "硬體資訊"
 deviceInfoDescription: "在提出技術性諮詢時，若能同時提供以下資訊，將有助於解決問題。"
+youAreAdmin: "您是管理員"
+frame: "邊框"
+presets: "預設值"
+zeroPadding: "補零"
+_imageEditing:
+  _vars:
+    caption: "檔案標題"
+    filename: "檔案名稱"
+    filename_without_ext: "無副檔名的檔案名稱"
+    year: "拍攝年份"
+    month: "拍攝月份"
+    day: "拍攝日期"
+    hour: "拍攝時間（小時）"
+    minute: "拍攝時間（分鐘）"
+    second: "拍攝時間（秒）"
+    camera_model: "相機名稱"
+    camera_lens_model: "鏡頭型號"
+    camera_mm: "焦距"
+    camera_mm_35: "焦距（換算為 35mm 底片等效焦距）"
+    camera_f: "光圈"
+    camera_s: "快門速度"
+    camera_iso: "ISO 感光度"
+    gps_lat: "緯度"
+    gps_long: "經度"
+_imageFrameEditor:
+  title: "編輯邊框"
+  tip: "可以在圖片上添加包含邊框或 EXIF 的標籤來裝飾圖片。"
+  header: "標題"
+  footer: "頁尾"
+  borderThickness: "邊框寬度"
+  labelThickness: "標籤寬度"
+  labelScale: "標籤縮放比例"
+  centered: "置中對齊"
+  captionMain: "標題文字（大）"
+  captionSub: "標題文字（小）"
+  availableVariables: "可使用的變數"
+  withQrCode: "二維條碼"
+  backgroundColor: "背景顏色"
+  textColor: "文字顏色"
+  font: "字型"
+  fontSerif: "襯線體"
+  fontSansSerif: "無襯線體"
+  quitWithoutSaveConfirm: "不儲存就退出嗎？"
+  failedToLoadImage: "圖片載入失敗"
 _compression:
   _quality:
     high: "高品質"
@@ -1497,6 +1546,8 @@ _settings:
   showUrlPreview: "顯示網址預覽"
   showAvailableReactionsFirstInNote: "將可用的反應顯示在頂部"
   showPageTabBarBottom: "在底部顯示頁面的標籤列"
+  emojiPaletteBanner: "可以將固定顯示在表情符號選擇器的預設項目註冊為調色盤，或者自訂選擇器的顯示方式。"
+  enableAnimatedImages: "啟用動畫圖片"
   _chat:
     showSenderName: "顯示發送者的名稱"
     sendOnEnter: "按下 Enter 發送訊息"
@@ -1505,6 +1556,8 @@ _preferencesProfile:
   profileNameDescription: "設定一個名稱來識別此裝置。"
   profileNameDescription2: "例如：「主要個人電腦」、「智慧型手機」等"
   manageProfiles: "管理個人檔案"
+  shareSameProfileBetweenDevicesIsNotRecommended: "不建議在多個裝置上共用同一個設定檔。"
+  useSyncBetweenDevicesOptionIfYouWantToSyncSetting: "如果您希望在多個裝置之間同步某些設定項目，請分別啟用「跨裝置同步」選項。"
 _preferencesBackup:
   autoBackup: "自動備份"
   restoreFromBackup: "從備份還原"
@@ -1514,6 +1567,7 @@ _preferencesBackup:
   youNeedToNameYourProfileToEnableAutoBackup: "要啟用自動備份，必須設定檔案名稱。"
   autoPreferencesBackupIsNotEnabledForThisDevice: "此裝置未啟用自動備份設定。"
   backupFound: "找到設定的備份"
+  forceBackup: "強制備份設定"
 _accountSettings:
   requireSigninToViewContents: "須登入以顯示內容"
   requireSigninToViewContentsDescription1: "必須登入才會顯示您建立的貼文等內容。可望有效防止資訊被爬蟲蒐集。"
@@ -2529,6 +2583,20 @@ _postForm:
   replyPlaceholder: "回覆此貼文..."
   quotePlaceholder: "引用此貼文..."
   channelPlaceholder: "發佈到頻道"
+  showHowToUse: "顯示表單說明"
+  _howToUse:
+    content_title: "內文"
+    content_description: "請輸入要發布的內容。"
+    toolbar_title: "工具列"
+    toolbar_description: "可以附加檔案或票選活動、設定註解與標籤、插入表情符號或提及等。"
+    account_title: "帳號選單"
+    account_description: "可以切換要發布的帳號，並查看該帳號所儲存的草稿與預約發布列表。"
+    visibility_title: "可見性"
+    visibility_description: "可以設定貼文的公開範圍。"
+    menu_title: "選單"
+    menu_description: "可以進行其他操作，例如儲存為草稿、預約發佈貼文、或設定反應等。\n"
+    submit_title: "貼文按鈕"
+    submit_description: "發布貼文。也可以使用 Ctrl + Enter 或 Cmd + Enter 來發布。"
   _placeholders:
     a: "今天過得如何？"
     b: "有什麼新鮮事嗎？"
@@ -2638,7 +2706,7 @@ _pages:
   hideTitleWhenPinned: "被置頂於個人資料時隱藏頁面標題"
   font: "字型"
   fontSerif: "襯線體"
-  fontSansSerif: "黑體"
+  fontSansSerif: "無襯線體"
   eyeCatchingImageSet: "設定封面影像"
   eyeCatchingImageRemove: "刪除封面影像"
   chooseBlock: "新增方塊"
@@ -2806,6 +2874,8 @@ _abuseReport:
     notifiedWebhook: "使用的 Webhook"
     deleteConfirm: "確定要刪除通知對象嗎？"
 _moderationLogTypes:
+  clearQueue: "清除佇列"
+  promoteQueue: "重新嘗試排程中的工作"
   createRole: "新增角色"
   deleteRole: "刪除角色 "
   updateRole: "更新角色設定"
@@ -3222,11 +3292,13 @@ _watermarkEditor:
   polkadotSubDotRadius: "子圓點的尺寸"
   polkadotSubDotDivisions: "子圓點的數量"
   leaveBlankToAccountUrl: "若留空則使用帳戶的 URL"
+  failedToLoadImage: "圖片載入失敗"
 _imageEffector:
   title: "特效"
   addEffect: "新增特效"
   discardChangesConfirm: "捨棄更改並退出嗎？"
   nothingToConfigure: "無可設定的項目"
+  failedToLoadImage: "圖片載入失敗"
   _fxs:
     chromaticAberration: "色差"
     glitch: "異常雜訊效果"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2025.10.2",
+	"version": "2025.11.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@10.18.2",
+	"packageManager": "pnpm@10.20.0",
 	"workspaces": [
 		"packages/frontend-shared",
 		"packages/frontend",
@@ -53,30 +53,31 @@
 		"lodash": "4.17.21"
 	},
 	"dependencies": {
-		"cssnano": "7.1.1",
+		"cssnano": "7.1.2",
-		"esbuild": "0.25.10",
+		"esbuild": "0.25.11",
 		"execa": "9.6.0",
 		"fast-glob": "3.3.3",
 		"glob": "11.0.3",
 		"ignore-walk": "8.0.0",
 		"js-yaml": "4.1.0",
 		"postcss": "8.5.6",
-		"tar": "7.5.1",
+		"tar": "7.5.2",
 		"terser": "5.44.0",
 		"typescript": "5.9.3"
 	},
 	"devDependencies": {
+		"@eslint/js": "9.39.0",
 		"@misskey-dev/eslint-plugin": "2.1.0",
 		"@types/js-yaml": "4.0.9",
-		"@types/node": "22.18.10",
+		"@types/node": "24.9.2",
-		"@typescript-eslint/eslint-plugin": "8.46.1",
+		"@typescript-eslint/eslint-plugin": "8.46.2",
-		"@typescript-eslint/parser": "8.46.1",
+		"@typescript-eslint/parser": "8.46.2",
 		"cross-env": "10.1.0",
-		"cypress": "15.4.0",
+		"cypress": "15.5.0",
-		"eslint": "9.37.0",
+		"eslint": "9.39.0",
-		"globals": "16.4.0",
+		"globals": "16.5.0",
 		"ncp": "2.0.0",
-		"pnpm": "10.18.2",
+		"pnpm": "10.20.0",
 		"start-server-and-test": "2.1.2"
 	},
 	"optionalDependencies": {
@@ -85,6 +86,10 @@
 	"pnpm": {
 		"overrides": {
 			"@aiscript-dev/aiscript-languageserver": "-"
-		}
+		},
+		"ignoredBuiltDependencies": [
+			"@sentry-internal/node-cpu-profiler",
+			"exifreader"
+		]
 	}
 }

packages/backend/jest.config.unit.cjs

@@ -7,6 +7,7 @@ const base = require('./jest.config.cjs')
 
 module.exports = {
 	...base,
+	globalSetup: "<rootDir>/test/jest.setup.unit.cjs",
 	testMatch: [
 		"<rootDir>/test/unit/**/*.ts",
 		"<rootDir>/src/**/*.test.ts",

packages/backend/jest.js

@@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename);
 
 const args = [];
 args.push(...[
-	...semver.satisfies(process.version, '^20.17.0 || ^22.0.0') ? ['--no-experimental-require-module'] : [],
+	...semver.satisfies(process.version, '^20.17.0 || ^22.0.0 || ^24.10.0') ? ['--no-experimental-require-module'] : [],
 	'--experimental-vm-modules',
 	'--experimental-import-meta-resolve',
 	path.join(__dirname, 'node_modules/jest/bin/jest.js'),

packages/backend/migration/1761569941833-add-channel-muting.js

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddChannelMuting1761569941833 {
+    name = 'AddChannelMuting1761569941833'
+
+    /**
+     * @param {QueryRunner} queryRunner
+     */
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "channel_muting" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "channelId" character varying(32) NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE, CONSTRAINT "PK_aec842e98f332ebd8e12f85bad6" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_34415e3062ae7a94617496e81c" ON "channel_muting" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_4d534d7177fc59879d942e96d0" ON "channel_muting" ("channelId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_6dd314e96806b7df65ddadff72" ON "channel_muting" ("expiresAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_b96870ed326ccc7fa243970965" ON "channel_muting" ("userId", "channelId") `);
+        await queryRunner.query(`ALTER TABLE "note" ADD "renoteChannelId" character varying(32)`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteChannelId" IS '[Denormalized]'`);
+        await queryRunner.query(`ALTER TABLE "channel_muting" ADD CONSTRAINT "FK_34415e3062ae7a94617496e81c5" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "channel_muting" ADD CONSTRAINT "FK_4d534d7177fc59879d942e96d03" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    /**
+     * @param {QueryRunner} queryRunner
+     */
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "channel_muting" DROP CONSTRAINT "FK_4d534d7177fc59879d942e96d03"`);
+        await queryRunner.query(`ALTER TABLE "channel_muting" DROP CONSTRAINT "FK_34415e3062ae7a94617496e81c5"`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteChannelId" IS '[Denormalized]'`);
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "renoteChannelId"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b96870ed326ccc7fa243970965"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_6dd314e96806b7df65ddadff72"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_4d534d7177fc59879d942e96d0"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_34415e3062ae7a94617496e81c"`);
+        await queryRunner.query(`DROP TABLE "channel_muting"`);
+    }
+}

packages/backend/package.json

@@ -4,7 +4,7 @@
 	"private": true,
 	"type": "module",
 	"engines": {
-		"node": "^22.15.0"
+		"node": "^22.15.0 || ^24.10.0"
 	},
 	"scripts": {
 		"start": "node ./built/boot/entry.js",
@@ -39,17 +39,17 @@
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
-		"@swc/core-darwin-arm64": "1.13.20",
+		"@swc/core-darwin-arm64": "1.14.0",
-		"@swc/core-darwin-x64": "1.13.20",
+		"@swc/core-darwin-x64": "1.14.0",
 		"@swc/core-freebsd-x64": "1.3.11",
-		"@swc/core-linux-arm-gnueabihf": "1.13.20",
+		"@swc/core-linux-arm-gnueabihf": "1.14.0",
-		"@swc/core-linux-arm64-gnu": "1.13.20",
+		"@swc/core-linux-arm64-gnu": "1.14.0",
-		"@swc/core-linux-arm64-musl": "1.13.20",
+		"@swc/core-linux-arm64-musl": "1.14.0",
-		"@swc/core-linux-x64-gnu": "1.13.20",
+		"@swc/core-linux-x64-gnu": "1.14.0",
-		"@swc/core-linux-x64-musl": "1.13.20",
+		"@swc/core-linux-x64-musl": "1.14.0",
-		"@swc/core-win32-arm64-msvc": "1.13.20",
+		"@swc/core-win32-arm64-msvc": "1.14.0",
-		"@swc/core-win32-ia32-msvc": "1.13.20",
+		"@swc/core-win32-ia32-msvc": "1.14.0",
-		"@swc/core-win32-x64-msvc": "1.13.20",
+		"@swc/core-win32-x64-msvc": "1.14.0",
 		"@tensorflow/tfjs": "4.22.0",
 		"@tensorflow/tfjs-node": "4.22.0",
 		"bufferutil": "4.0.9",
@@ -69,31 +69,31 @@
 		"utf-8-validate": "6.0.5"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.908.0",
+		"@aws-sdk/client-s3": "3.922.0",
-		"@aws-sdk/lib-storage": "3.908.0",
+		"@aws-sdk/lib-storage": "3.922.0",
 		"@discordapp/twemoji": "16.0.1",
 		"@fastify/accepts": "5.0.3",
 		"@fastify/cookie": "11.0.2",
 		"@fastify/cors": "10.1.0",
 		"@fastify/express": "4.0.2",
 		"@fastify/http-proxy": "10.0.2",
-		"@fastify/multipart": "9.2.1",
+		"@fastify/multipart": "9.3.0",
-		"@fastify/static": "8.2.0",
+		"@fastify/static": "8.3.0",
 		"@fastify/view": "10.0.2",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
-		"@misskey-dev/summaly": "5.2.4",
+		"@misskey-dev/summaly": "5.2.5",
-		"@napi-rs/canvas": "0.1.80",
+		"@napi-rs/canvas": "0.1.81",
-		"@nestjs/common": "11.1.6",
+		"@nestjs/common": "11.1.8",
-		"@nestjs/core": "11.1.6",
+		"@nestjs/core": "11.1.8",
-		"@nestjs/testing": "11.1.6",
+		"@nestjs/testing": "11.1.8",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "8.55.0",
+		"@sentry/node": "10.22.0",
-		"@sentry/profiling-node": "8.55.0",
+		"@sentry/profiling-node": "10.22.0",
 		"@simplewebauthn/server": "12.0.0",
 		"@sinonjs/fake-timers": "11.3.1",
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.7.8",
-		"@swc/core": "1.13.5",
+		"@swc/core": "1.14.0",
 		"@twemoji/parser": "16.0.0",
 		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
@@ -103,7 +103,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.3",
-		"bullmq": "5.61.0",
+		"bullmq": "5.63.0",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.6.2",
@@ -117,15 +117,15 @@
 		"fastify": "5.6.1",
 		"fastify-raw-body": "5.0.0",
 		"feed": "4.2.2",
-		"file-type": "19.6.0",
+		"file-type": "21.0.0",
 		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.4",
-		"got": "14.5.0",
+		"got": "14.6.1",
-		"happy-dom": "20.0.7",
+		"happy-dom": "20.0.10",
 		"hpagent": "1.2.0",
 		"htmlescape": "1.1.1",
 		"http-link-header": "1.1.3",
-		"ioredis": "5.8.1",
+		"ioredis": "5.8.2",
 		"ip-cidr": "4.0.2",
 		"ipaddr.js": "2.2.0",
 		"is-svg": "5.1.0",
@@ -135,7 +135,7 @@
 		"jsonld": "8.3.3",
 		"jsrsasign": "11.1.0",
 		"juice": "11.0.3",
-		"meilisearch": "0.53.0",
+		"meilisearch": "0.54.0",
 		"mfm-js": "0.25.0",
 		"microformats-parser": "2.0.4",
 		"mime-types": "2.1.35",
@@ -145,7 +145,7 @@
 		"nanoid": "5.1.6",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "7.0.9",
+		"nodemailer": "7.0.10",
 		"nsfwjs": "4.2.0",
 		"oauth": "0.10.2",
 		"oauth2orize": "1.12.0",
@@ -191,16 +191,16 @@
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
 		"@nestjs/platform-express": "10.4.20",
-		"@sentry/vue": "9.46.0",
+		"@sentry/vue": "10.22.0",
 		"@simplewebauthn/types": "12.0.0",
 		"@swc/jest": "0.2.39",
 		"@types/accepts": "1.3.7",
-		"@types/archiver": "6.0.3",
+		"@types/archiver": "6.0.4",
 		"@types/bcryptjs": "2.4.6",
 		"@types/body-parser": "1.19.6",
 		"@types/color-convert": "2.0.4",
 		"@types/content-disposition": "0.5.9",
-		"@types/fluent-ffmpeg": "2.1.27",
+		"@types/fluent-ffmpeg": "2.1.28",
 		"@types/htmlescape": "1.1.3",
 		"@types/http-link-header": "1.0.7",
 		"@types/jest": "29.5.14",
@@ -210,14 +210,14 @@
 		"@types/jsrsasign": "10.5.15",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "22.18.10",
+		"@types/node": "24.9.2",
-		"@types/nodemailer": "6.4.20",
+		"@types/nodemailer": "6.4.21",
 		"@types/oauth": "0.9.6",
 		"@types/oauth2orize": "1.11.5",
 		"@types/oauth2orize-pkce": "0.1.2",
-		"@types/pg": "8.15.5",
+		"@types/pg": "8.15.6",
 		"@types/pug": "2.0.10",
-		"@types/qrcode": "1.5.5",
+		"@types/qrcode": "1.5.6",
 		"@types/random-seed": "0.3.5",
 		"@types/ratelimiter": "3.4.6",
 		"@types/rename": "1.0.7",
@@ -231,8 +231,8 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.4",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.46.1",
+		"@typescript-eslint/eslint-plugin": "8.46.2",
-		"@typescript-eslint/parser": "8.46.1",
+		"@typescript-eslint/parser": "8.46.2",
 		"aws-sdk-client-mock": "4.1.0",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.32.0",

packages/backend/src/core/ChannelFollowingService.ts

@@ -6,7 +6,7 @@
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
 import Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
-import type { ChannelFollowingsRepository } from '@/models/_.js';
+import type { ChannelFollowingsRepository, ChannelsRepository, MiUser } from '@/models/_.js';
 import { MiChannel } from '@/models/_.js';
 import { IdService } from '@/core/IdService.js';
 import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
@@ -23,6 +23,8 @@ export class ChannelFollowingService implements OnModuleInit {
 		private redisClient: Redis.Redis,
 		@Inject(DI.redisForSub)
 		private redisForSub: Redis.Redis,
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
 		@Inject(DI.channelFollowingsRepository)
 		private channelFollowingsRepository: ChannelFollowingsRepository,
 		private idService: IdService,
@@ -45,6 +47,50 @@ export class ChannelFollowingService implements OnModuleInit {
 	onModuleInit() {
 	}
 
+	/**
+	 * フォローしているチャンネルの一覧を取得する.
+	 * @param params
+	 * @param [opts]
+	 * @param	{(boolean|undefined)} [opts.idOnly=false] チャンネルIDのみを取得するかどうか. ID以外のフィールドに値がセットされなくなり、他テーブルとのJOINも一切されなくなるので注意.
+	 * @param {(boolean|undefined)} [opts.joinUser=undefined] チャンネルオーナーのユーザ情報をJOINするかどうか(falseまたは省略時はJOINしない).
+	 * @param {(boolean|undefined)} [opts.joinBannerFile=undefined] バナー画像のドライブファイルをJOINするかどうか(falseまたは省略時はJOINしない).
+	 */
+	@bindThis
+	public async list(
+		params: {
+			requestUserId: MiUser['id'],
+		},
+		opts?: {
+			idOnly?: boolean;
+			joinUser?: boolean;
+			joinBannerFile?: boolean;
+		},
+	): Promise<MiChannel[]> {
+		if (opts?.idOnly) {
+			const q = this.channelFollowingsRepository.createQueryBuilder('channel_following')
+				.select('channel_following.followeeId')
+				.where('channel_following.followerId = :userId', { userId: params.requestUserId });
+
+			return q
+				.getRawMany<{ channel_following_followeeId: string }>()
+				.then(xs => xs.map(x => ({ id: x.channel_following_followeeId } as MiChannel)));
+		} else {
+			const q = this.channelsRepository.createQueryBuilder('channel')
+				.innerJoin('channel_following', 'channel_following', 'channel_following.followeeId = channel.id')
+				.where('channel_following.followerId = :userId', { userId: params.requestUserId });
+
+			if (opts?.joinUser) {
+				q.innerJoinAndSelect('channel.user', 'user');
+			}
+
+			if (opts?.joinBannerFile) {
+				q.leftJoinAndSelect('channel.banner', 'drive_file');
+			}
+
+			return q.getMany();
+		}
+	}
+
 	@bindThis
 	public async follow(
 		requestUser: MiLocalUser,

packages/backend/src/core/ChannelMutingService.ts

@@ -0,0 +1,224 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import Redis from 'ioredis';
+import { Brackets, In } from 'typeorm';
+import { DI } from '@/di-symbols.js';
+import type { ChannelMutingRepository, ChannelsRepository, MiChannel, MiChannelMuting, MiUser } from '@/models/_.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
+import { bindThis } from '@/decorators.js';
+import { RedisKVCache } from '@/misc/cache.js';
+
+@Injectable()
+export class ChannelMutingService {
+	public mutingChannelsCache: RedisKVCache<Set<string>>;
+
+	constructor(
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
+		@Inject(DI.redisForSub)
+		private redisForSub: Redis.Redis,
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
+		@Inject(DI.channelMutingRepository)
+		private channelMutingRepository: ChannelMutingRepository,
+		private idService: IdService,
+		private globalEventService: GlobalEventService,
+	) {
+		this.mutingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'channelMutingChannels', {
+			lifetime: 1000 * 60 * 30, // 30m
+			memoryCacheLifetime: 1000 * 60, // 1m
+			fetcher: (userId) => this.channelMutingRepository.find({
+				where: { userId: userId },
+				select: ['channelId'],
+			}).then(xs => new Set(xs.map(x => x.channelId))),
+			toRedisConverter: (value) => JSON.stringify(Array.from(value)),
+			fromRedisConverter: (value) => new Set(JSON.parse(value)),
+		});
+
+		this.redisForSub.on('message', this.onMessage);
+	}
+
+	/**
+	 * ミュートしているチャンネルの一覧を取得する.
+	 * @param params
+	 * @param [opts]
+	 * @param	{(boolean|undefined)} [opts.idOnly=false] チャンネルIDのみを取得するかどうか. ID以外のフィールドに値がセットされなくなり、他テーブルとのJOINも一切されなくなるので注意.
+	 * @param {(boolean|undefined)} [opts.joinUser=undefined] チャンネルオーナーのユーザ情報をJOINするかどうか(falseまたは省略時はJOINしない).
+	 * @param {(boolean|undefined)} [opts.joinBannerFile=undefined] バナー画像のドライブファイルをJOINするかどうか(falseまたは省略時はJOINしない).
+	 */
+	@bindThis
+	public async list(
+		params: {
+			requestUserId: MiUser['id'],
+		},
+		opts?: {
+			idOnly?: boolean;
+			joinUser?: boolean;
+			joinBannerFile?: boolean;
+		},
+	): Promise<MiChannel[]> {
+		if (opts?.idOnly) {
+			const q = this.channelMutingRepository.createQueryBuilder('channel_muting')
+				.select('channel_muting.channelId')
+				.where('channel_muting.userId = :userId', { userId: params.requestUserId })
+				.andWhere(new Brackets(qb => {
+					qb.where('channel_muting.expiresAt IS NULL')
+						.orWhere('channel_muting.expiresAt > :now', { now: new Date() });
+				}));
+
+			return q
+				.getRawMany<{ channel_muting_channelId: string }>()
+				.then(xs => xs.map(x => ({ id: x.channel_muting_channelId } as MiChannel)));
+		} else {
+			const q = this.channelsRepository.createQueryBuilder('channel')
+				.innerJoin('channel_muting', 'channel_muting', 'channel_muting.channelId = channel.id')
+				.where('channel_muting.userId = :userId', { userId: params.requestUserId })
+				.andWhere(new Brackets(qb => {
+					qb.where('channel_muting.expiresAt IS NULL')
+						.orWhere('channel_muting.expiresAt > :now', { now: new Date() });
+				}));
+
+			if (opts?.joinUser) {
+				q.innerJoinAndSelect('channel.user', 'user');
+			}
+
+			if (opts?.joinBannerFile) {
+				q.leftJoinAndSelect('channel.banner', 'drive_file');
+			}
+
+			return q.getMany();
+		}
+	}
+
+	/**
+	 * 期限切れのチャンネルミュート情報を取得する.
+	 *
+	 * @param [opts]
+	 * @param {(boolean|undefined)} [opts.joinUser=undefined] チャンネルミュートを設定したユーザ情報をJOINするかどうか(falseまたは省略時はJOINしない).
+	 * @param {(boolean|undefined)} [opts.joinChannel=undefined] ミュート先のチャンネル情報をJOINするかどうか(falseまたは省略時はJOINしない).
+	 */
+	public async findExpiredMutings(opts?: {
+		joinUser?: boolean;
+		joinChannel?: boolean;
+	}): Promise<MiChannelMuting[]> {
+		const now = new Date();
+		const q = this.channelMutingRepository.createQueryBuilder('channel_muting')
+			.where('channel_muting.expiresAt < :now', { now });
+
+		if (opts?.joinUser) {
+			q.innerJoinAndSelect('channel_muting.user', 'user');
+		}
+
+		if (opts?.joinChannel) {
+			q.leftJoinAndSelect('channel_muting.channel', 'channel');
+		}
+
+		return q.getMany();
+	}
+
+	/**
+	 * 既にミュートされているかどうかをキャッシュから取得する.
+	 * @param params
+	 * @param params.requestUserId
+	 */
+	@bindThis
+	public async isMuted(params: {
+		requestUserId: MiUser['id'],
+		targetChannelId: MiChannel['id'],
+	}): Promise<boolean> {
+		const mutedChannels = await this.mutingChannelsCache.get(params.requestUserId);
+		return (mutedChannels?.has(params.targetChannelId) ?? false);
+	}
+
+	/**
+	 * チャンネルをミュートする.
+	 * @param params
+	 * @param {(Date|null|undefined)} [params.expiresAt] ミュートの有効期限. nullまたは省略時は無期限.
+	 */
+	@bindThis
+	public async mute(params: {
+		requestUserId: MiUser['id'],
+		targetChannelId: MiChannel['id'],
+		expiresAt?: Date | null,
+	}): Promise<void> {
+		await this.channelMutingRepository.insert({
+			id: this.idService.gen(),
+			userId: params.requestUserId,
+			channelId: params.targetChannelId,
+			expiresAt: params.expiresAt,
+		});
+
+		this.globalEventService.publishInternalEvent('muteChannel', {
+			userId: params.requestUserId,
+			channelId: params.targetChannelId,
+		});
+	}
+
+	/**
+	 * チャンネルのミュートを解除する.
+	 * @param params
+	 */
+	@bindThis
+	public async unmute(params: {
+		requestUserId: MiUser['id'],
+		targetChannelId: MiChannel['id'],
+	}): Promise<void> {
+		await this.channelMutingRepository.delete({
+			userId: params.requestUserId,
+			channelId: params.targetChannelId,
+		});
+
+		this.globalEventService.publishInternalEvent('unmuteChannel', {
+			userId: params.requestUserId,
+			channelId: params.targetChannelId,
+		});
+	}
+
+	/**
+	 * 期限切れのチャンネルミュート情報を削除する.
+	 */
+	@bindThis
+	public async eraseExpiredMutings(): Promise<void> {
+		const expiredMutings = await this.findExpiredMutings();
+		await this.channelMutingRepository.delete({ id: In(expiredMutings.map(x => x.id)) });
+
+		const userIds = [...new Set(expiredMutings.map(x => x.userId))];
+		for (const userId of userIds) {
+			this.mutingChannelsCache.refresh(userId).then();
+		}
+	}
+
+	@bindThis
+	private async onMessage(_: string, data: string): Promise<void> {
+		const obj = JSON.parse(data);
+
+		if (obj.channel === 'internal') {
+			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			switch (type) {
+				case 'muteChannel': {
+					this.mutingChannelsCache.refresh(body.userId).then();
+					break;
+				}
+				case 'unmuteChannel': {
+					this.mutingChannelsCache.delete(body.userId).then();
+					break;
+				}
+			}
+		}
+	}
+
+	@bindThis
+	public dispose(): void {
+		this.mutingChannelsCache.dispose();
+	}
+
+	@bindThis
+	public onApplicationShutdown(signal?: string | undefined): void {
+		this.dispose();
+	}
+}

packages/backend/src/core/CoreModule.ts

@@ -15,6 +15,7 @@ import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { UserSearchService } from '@/core/UserSearchService.js';
 import { WebhookTestService } from '@/core/WebhookTestService.js';
 import { FlashService } from '@/core/FlashService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { AccountMoveService } from './AccountMoveService.js';
 import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
@@ -225,6 +226,7 @@ const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: Fe
 const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', useExisting: FanoutTimelineService };
 const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
 const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
+const $ChannelMutingService: Provider = { provide: 'ChannelMutingService', useExisting: ChannelMutingService };
 const $ChatService: Provider = { provide: 'ChatService', useExisting: ChatService };
 const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
 const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
@@ -378,6 +380,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FanoutTimelineService,
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
+		ChannelMutingService,
 		ChatService,
 		RegistryApiService,
 		ReversiService,
@@ -527,6 +530,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FanoutTimelineService,
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
+		$ChannelMutingService,
 		$ChatService,
 		$RegistryApiService,
 		$ReversiService,
@@ -677,6 +681,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FanoutTimelineService,
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
+		ChannelMutingService,
 		ChatService,
 		RegistryApiService,
 		ReversiService,
@@ -824,6 +829,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FanoutTimelineService,
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
+		$ChannelMutingService,
 		$ChatService,
 		$RegistryApiService,
 		$ReversiService,

packages/backend/src/core/FanoutTimelineEndpointService.ts

@@ -19,6 +19,8 @@ import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+import { isChannelRelated } from '@/misc/is-channel-related.js';
 
 type NoteFilter = (note: MiNote) => boolean;
 
@@ -35,6 +37,7 @@ type TimelineOptions = {
 	ignoreAuthorFromBlock?: boolean;
 	ignoreAuthorFromMute?: boolean;
 	ignoreAuthorFromInstanceBlock?: boolean;
+	ignoreAuthorChannelFromMute?: boolean;
 	excludeNoFiles?: boolean;
 	excludeReplies?: boolean;
 	excludePureRenotes: boolean;
@@ -55,6 +58,7 @@ export class FanoutTimelineEndpointService {
 		private cacheService: CacheService,
 		private fanoutTimelineService: FanoutTimelineService,
 		private utilityService: UtilityService,
+		private channelMutingService: ChannelMutingService,
 	) {
 	}
 
@@ -111,11 +115,13 @@ export class FanoutTimelineEndpointService {
 					userIdsWhoMeMutingRenotes,
 					userIdsWhoBlockingMe,
 					userMutedInstances,
+					userMutedChannels,
 				] = await Promise.all([
 					this.cacheService.userMutingsCache.fetch(ps.me.id),
 					this.cacheService.renoteMutingsCache.fetch(ps.me.id),
 					this.cacheService.userBlockedCache.fetch(ps.me.id),
 					this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)),
+					this.channelMutingService.mutingChannelsCache.fetch(me.id),
 				]);
 
 				const parentFilter = filter;
@@ -126,6 +132,7 @@ export class FanoutTimelineEndpointService {
 					if (isUserRelated(note.renote, userIdsWhoMeMuting, ps.ignoreAuthorFromMute)) return false;
 					if (!ps.ignoreAuthorFromMute && isRenote(note) && !isQuote(note) && userIdsWhoMeMutingRenotes.has(note.userId)) return false;
 					if (isInstanceMuted(note, userMutedInstances)) return false;
+					if (isChannelRelated(note, userMutedChannels, ps.ignoreAuthorChannelFromMute)) return false;
 
 					return parentFilter(note);
 				};

packages/backend/src/core/FileInfoService.ts

@@ -20,8 +20,8 @@ import { AiService } from '@/core/AiService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import type { PredictionType } from 'nsfwjs';
 import { isMimeImage } from '@/misc/is-mime-image.js';
+import type { PredictionType } from 'nsfwjs';
 
 export type FileInfo = {
 	size: number;
@@ -339,7 +339,7 @@ export class FileInfoService {
 	}
 
 	@bindThis
-	public fixMime(mime: string | fileType.MimeType): string {
+	public fixMime(mime: string): string {
 		// see https://github.com/misskey-dev/misskey/pull/10686
 		if (mime === 'audio/x-flac') {
 			return 'audio/flac';

packages/backend/src/core/GlobalEventService.ts

@@ -255,6 +255,8 @@ export interface InternalEventTypes {
 	metaUpdated: { before?: MiMeta; after: MiMeta; };
 	followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
 	unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
+	muteChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
+	unmuteChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
 	updateUserProfile: MiUserProfile;
 	mute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
 	unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };

packages/backend/src/core/NoteCreateService.ts

@@ -604,6 +604,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			replyUserHost: data.reply ? data.reply.userHost : null,
 			renoteUserId: data.renote ? data.renote.userId : null,
 			renoteUserHost: data.renote ? data.renote.userHost : null,
+			renoteChannelId: data.renote ? data.renote.channelId : null,
 			userHost: user.host,
 		});
 

packages/backend/src/core/PageService.ts

@@ -29,7 +29,7 @@ export interface PageBody {
 	variables: Array<Record<string, any>>;
 	script: string;
 	eyeCatchingImage?: MiDriveFile | null;
-	font: string;
+	font: 'serif' | 'sans-serif';
 	alignCenter: boolean;
 	hideTitleWhenPinned: boolean;
 }
@@ -141,7 +141,7 @@ export class PageService {
 				eyeCatchingImageId: body.eyeCatchingImage === undefined ? undefined : (body.eyeCatchingImage?.id ?? null),
 			});
 
-			console.log("page.content", page.content);
+			console.log('page.content', page.content);
 
 			if (body.content != null) {
 				const beforeReferencedNotes = this.collectReferencedNotes(page.content);

packages/backend/src/core/UtilityService.ts

@@ -133,6 +133,7 @@ export class UtilityService {
 
 	@bindThis
 	public isFederationAllowedHost(host: string): boolean {
+		if (this.isSelfHost(host)) return true;
 		if (this.meta.federation === 'none') return false;
 		if (this.meta.federation === 'specified' && !this.meta.federationHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`))) return false;
 		if (this.isBlockedHost(this.meta.blockedHosts, host)) return false;

packages/backend/src/core/WebhookTestService.ts

@@ -106,6 +106,7 @@ function generateDummyNote(override?: Partial<MiNote>): MiNote {
 		replyUserHost: null,
 		renoteUserId: null,
 		renoteUserHost: null,
+		renoteChannelId: null,
 		...override,
 	};
 }

packages/backend/src/core/entities/ChannelEntityService.ts

@@ -4,36 +4,40 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
+import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NotesRepository } from '@/models/_.js';
+import type {
+	ChannelFavoritesRepository,
+	ChannelFollowingsRepository, ChannelMutingRepository,
+	ChannelsRepository,
+	DriveFilesRepository,
+	MiDriveFile,
+	MiNote,
+	NotesRepository,
+} from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
-import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiChannel } from '@/models/Channel.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
 import { DriveFileEntityService } from './DriveFileEntityService.js';
 import { NoteEntityService } from './NoteEntityService.js';
-import { In } from 'typeorm';
 
 @Injectable()
 export class ChannelEntityService {
 	constructor(
 		@Inject(DI.channelsRepository)
 		private channelsRepository: ChannelsRepository,
-
 		@Inject(DI.channelFollowingsRepository)
 		private channelFollowingsRepository: ChannelFollowingsRepository,
-
 		@Inject(DI.channelFavoritesRepository)
 		private channelFavoritesRepository: ChannelFavoritesRepository,
-
+		@Inject(DI.channelMutingRepository)
+		private channelMutingRepository: ChannelMutingRepository,
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
-
 		@Inject(DI.driveFilesRepository)
 		private driveFilesRepository: DriveFilesRepository,
-
 		private noteEntityService: NoteEntityService,
 		private driveFileEntityService: DriveFileEntityService,
 		private idService: IdService,
@@ -45,31 +49,59 @@ export class ChannelEntityService {
 		src: MiChannel['id'] | MiChannel,
 		me?: { id: MiUser['id'] } | null | undefined,
 		detailed?: boolean,
+		opts?: {
+			bannerFiles?: Map<MiDriveFile['id'], MiDriveFile>;
+			followings?: Set<MiChannel['id']>;
+			favorites?: Set<MiChannel['id']>;
+			muting?: Set<MiChannel['id']>;
+			pinnedNotes?: Map<MiNote['id'], MiNote>;
+		},
 	): Promise<Packed<'Channel'>> {
 		const channel = typeof src === 'object' ? src : await this.channelsRepository.findOneByOrFail({ id: src });
-		const meId = me ? me.id : null;
 
-		const banner = channel.bannerId ? await this.driveFilesRepository.findOneBy({ id: channel.bannerId }) : null;
+		let bannerFile: MiDriveFile | null = null;
+		if (channel.bannerId) {
+			bannerFile = opts?.bannerFiles?.get(channel.bannerId)
+				?? await this.driveFilesRepository.findOneByOrFail({ id: channel.bannerId });
+		}
 
-		const isFollowing = meId ? await this.channelFollowingsRepository.exists({
+		let isFollowing = false;
+		let isFavorited = false;
+		let isMuting = false;
+		if (me) {
+			isFollowing = opts?.followings?.has(channel.id) ?? await this.channelFollowingsRepository.exists({
 				where: {
-				followerId: meId,
+					followerId: me.id,
 					followeeId: channel.id,
 				},
-		}) : false;
+			});
 
-		const isFavorited = meId ? await this.channelFavoritesRepository.exists({
+			isFavorited = opts?.favorites?.has(channel.id) ?? await this.channelFavoritesRepository.exists({
 				where: {
-				userId: meId,
+					userId: me.id,
 					channelId: channel.id,
 				},
-		}) : false;
+			});
 
-		const pinnedNotes = channel.pinnedNoteIds.length > 0 ? await this.notesRepository.find({
+			isMuting = opts?.muting?.has(channel.id) ?? await this.channelMutingRepository.exists({
 				where: {
-				id: In(channel.pinnedNoteIds),
+					userId: me.id,
+					channelId: channel.id,
 				},
-		}) : [];
+			});
+		}
+
+		const pinnedNotes = Array.of<MiNote>();
+		if (channel.pinnedNoteIds.length > 0) {
+			pinnedNotes.push(
+				...(
+					opts?.pinnedNotes
+						// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+						? channel.pinnedNoteIds.map(it => opts.pinnedNotes!.get(it)).filter(it => it != null)
+						: await this.notesRepository.findBy({ id: In(channel.pinnedNoteIds) })
+				),
+			);
+		}
 
 		return {
 			id: channel.id,
@@ -78,7 +110,8 @@ export class ChannelEntityService {
 			name: channel.name,
 			description: channel.description,
 			userId: channel.userId,
-			bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner) : null,
+			bannerUrl: bannerFile ? this.driveFileEntityService.getPublicUrl(bannerFile) : null,
+			bannerId: channel.bannerId,
 			pinnedNoteIds: channel.pinnedNoteIds,
 			color: channel.color,
 			isArchived: channel.isArchived,
@@ -90,6 +123,7 @@ export class ChannelEntityService {
 			...(me ? {
 				isFollowing,
 				isFavorited,
+				isMuting,
 				hasUnreadNote: false, // 後方互換性のため
 			} : {}),
 
@@ -98,5 +132,72 @@ export class ChannelEntityService {
 			} : {}),
 		};
 	}
+
+	@bindThis
+	public async packMany(
+		src: MiChannel['id'][] | MiChannel[],
+		me?: { id: MiUser['id'] } | null | undefined,
+		detailed?: boolean,
+	): Promise<Packed<'Channel'>[]> {
+		// IDのみの要素がある場合、DBからオブジェクトを取得して補う
+		const channels = src.filter(it => typeof it === 'object') as MiChannel[];
+		channels.push(
+			...(await this.channelsRepository.find({
+				where: {
+					id: In(src.filter(it => typeof it !== 'object') as MiChannel['id'][]),
+				},
+			})),
+		);
+		channels.sort((a, b) => a.id.localeCompare(b.id));
+
+		const bannerFiles = await this.driveFilesRepository
+			.findBy({
+				id: In(channels.map(it => it.bannerId).filter(it => it != null)),
+			})
+			.then(it => new Map(it.map(it => [it.id, it])));
+
+		const followings = me
+			? await this.channelFollowingsRepository
+				.findBy({
+					followerId: me.id,
+					followeeId: In(channels.map(it => it.id)),
+				})
+				.then(it => new Set(it.map(it => it.followeeId)))
+			: new Set<MiChannel['id']>();
+
+		const favorites = me
+			? await this.channelFavoritesRepository
+				.findBy({
+					userId: me.id,
+					channelId: In(channels.map(it => it.id)),
+				})
+				.then(it => new Set(it.map(it => it.channelId)))
+			: new Set<MiChannel['id']>();
+
+		const muting = me
+			? await this.channelMutingRepository
+				.findBy({
+					userId: me.id,
+					channelId: In(channels.map(it => it.id)),
+				})
+				.then(it => new Set(it.map(it => it.channelId)))
+			: new Set<MiChannel['id']>();
+
+		const pinnedNotes = await this.notesRepository
+			.find({
+				where: {
+					id: In(channels.flatMap(it => it.pinnedNoteIds)),
+				},
+			})
+			.then(it => new Map(it.map(it => [it.id, it])));
+
+		return Promise.all(channels.map(it => this.pack(it, me, detailed, {
+			bannerFiles,
+			followings,
+			favorites,
+			muting,
+			pinnedNotes,
+		})));
+	}
 }
 

packages/backend/src/di-symbols.ts

@@ -70,6 +70,7 @@ export const DI = {
 	channelsRepository: Symbol('channelsRepository'),
 	channelFollowingsRepository: Symbol('channelFollowingsRepository'),
 	channelFavoritesRepository: Symbol('channelFavoritesRepository'),
+	channelMutingRepository: Symbol('channelMutingRepository'),
 	registryItemsRepository: Symbol('registryItemsRepository'),
 	webhooksRepository: Symbol('webhooksRepository'),
 	systemWebhooksRepository: Symbol('systemWebhooksRepository'),

packages/backend/src/misc/is-channel-related.ts

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { MiNote } from '@/models/Note.js';
+import { Packed } from '@/misc/json-schema.js';
+
+/**
+ * {@link note}が{@link channelIds}のチャンネルに関連するかどうかを判定し、関連する場合はtrueを返します。
+ * 関連するというのは、{@link channelIds}のチャンネルに向けての投稿であるか、またはそのチャンネルの投稿をリノート・引用リノートした投稿であるかを指します。
+ *
+ * @param note 確認対象のノート
+ * @param channelIds 確認対象のチャンネルID一覧
+ * @param ignoreAuthor trueの場合、ノートの所属チャンネルが{@link channelIds}に含まれていても無視します（デフォルトはfalse）
+ */
+export function isChannelRelated(note: MiNote | Packed<'Note'>, channelIds: Set<string>, ignoreAuthor = false): boolean {
+	// ノートの所属チャンネルが確認対象のチャンネルID一覧に含まれている場合
+	if (!ignoreAuthor && note.channelId && channelIds.has(note.channelId)) {
+		return true;
+	}
+
+	const renoteChannelId = note.renote?.channelId;
+	if (renoteChannelId != null && renoteChannelId !== note.channelId && channelIds.has(renoteChannelId)) {
+		return true;
+	}
+
+	// NOTE: リプライはchannelIdのチェックだけでOKなはずなので見てない(チャンネルのノートにチャンネル外からのリプライまたはその逆はないはずなので）
+
+	return false;
+}

packages/backend/src/models/ChannelMuting.ts

@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
+import { id } from './util/id.js';
+import { MiUser } from './User.js';
+import { MiChannel } from './Channel.js';
+
+@Entity('channel_muting')
+@Index(['userId', 'channelId'], {})
+export class MiChannelMuting {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column({
+		...id(),
+	})
+	public userId: MiUser['id'];
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user: MiUser | null;
+
+	@Index()
+	@Column({
+		...id(),
+	})
+	public channelId: MiChannel['id'];
+
+	@ManyToOne(type => MiChannel, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public channel: MiChannel | null;
+
+	@Index()
+	@Column('timestamp with time zone', {
+		nullable: true,
+	})
+	public expiresAt: Date | null;
+}

packages/backend/src/models/Note.ts

@@ -248,6 +248,14 @@ export class MiNote {
 	})
 	public renoteUserHost: string | null;
 
+	@Column({
+		...id(),
+		nullable: true,
+		comment: '[Denormalized]',
+	})
+	public renoteChannelId: MiChannel['id'] | null;
+	//#endregion
+
 	constructor(data: Partial<MiNote>) {
 		if (data == null) return;
 

packages/backend/src/models/Page.ts

@@ -47,7 +47,7 @@ export class MiPage {
 	@Column('varchar', {
 		length: 32,
 	})
-	public font: string;
+	public font: 'serif' | 'sans-serif';
 
 	@Index()
 	@Column({

packages/backend/src/models/RepositoryModule.ts

@@ -21,6 +21,7 @@ import {
 	MiChannel,
 	MiChannelFavorite,
 	MiChannelFollowing,
+	MiChannelMuting,
 	MiClip,
 	MiClipFavorite,
 	MiClipNote,
@@ -429,6 +430,12 @@ const $channelFavoritesRepository: Provider = {
 	inject: [DI.db],
 };
 
+const $channelMutingRepository: Provider = {
+	provide: DI.channelMutingRepository,
+	useFactory: (db: DataSource) => db.getRepository(MiChannelMuting).extend(miRepository as MiRepository<MiChannelMuting>),
+	inject: [DI.db],
+};
+
 const $registryItemsRepository: Provider = {
 	provide: DI.registryItemsRepository,
 	useFactory: (db: DataSource) => db.getRepository(MiRegistryItem).extend(miRepository as MiRepository<MiRegistryItem>),
@@ -597,6 +604,7 @@ const $reversiGamesRepository: Provider = {
 		$channelsRepository,
 		$channelFollowingsRepository,
 		$channelFavoritesRepository,
+		$channelMutingRepository,
 		$registryItemsRepository,
 		$webhooksRepository,
 		$systemWebhooksRepository,
@@ -674,6 +682,7 @@ const $reversiGamesRepository: Provider = {
 		$channelsRepository,
 		$channelFollowingsRepository,
 		$channelFavoritesRepository,
+		$channelMutingRepository,
 		$registryItemsRepository,
 		$webhooksRepository,
 		$systemWebhooksRepository,

packages/backend/src/models/_.ts

@@ -32,6 +32,7 @@ import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiChannel } from '@/models/Channel.js';
 import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
 import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
+import { MiChannelMuting } from "@/models/ChannelMuting.js";
 import { MiChatApproval } from '@/models/ChatApproval.js';
 import { MiChatMessage } from '@/models/ChatMessage.js';
 import { MiChatRoom } from '@/models/ChatRoom.js';
@@ -172,6 +173,7 @@ export {
 	MiBlocking,
 	MiChannelFollowing,
 	MiChannelFavorite,
+	MiChannelMuting,
 	MiClip,
 	MiClipNote,
 	MiClipFavorite,
@@ -251,6 +253,7 @@ export type AuthSessionsRepository = Repository<MiAuthSession> & MiRepository<Mi
 export type BlockingsRepository = Repository<MiBlocking> & MiRepository<MiBlocking>;
 export type ChannelFollowingsRepository = Repository<MiChannelFollowing> & MiRepository<MiChannelFollowing>;
 export type ChannelFavoritesRepository = Repository<MiChannelFavorite> & MiRepository<MiChannelFavorite>;
+export type ChannelMutingRepository = Repository<MiChannelMuting> & MiRepository<MiChannelMuting>;
 export type ClipsRepository = Repository<MiClip> & MiRepository<MiClip>;
 export type ClipNotesRepository = Repository<MiClipNote> & MiRepository<MiClipNote>;
 export type ClipFavoritesRepository = Repository<MiClipFavorite> & MiRepository<MiClipFavorite>;

packages/backend/src/models/json-schema/channel.ts

@@ -40,6 +40,11 @@ export const packedChannelSchema = {
 			format: 'url',
 			nullable: true, optional: false,
 		},
+		bannerId: {
+			type: 'string',
+			nullable: true, optional: false,
+			format: 'id',
+		},
 		pinnedNoteIds: {
 			type: 'array',
 			nullable: false, optional: false,
@@ -80,6 +85,10 @@ export const packedChannelSchema = {
 			type: 'boolean',
 			optional: true, nullable: false,
 		},
+		isMuting: {
+			type: 'boolean',
+			optional: true, nullable: false,
+		},
 		pinnedNotes: {
 			type: 'array',
 			optional: true, nullable: false,

packages/backend/src/models/json-schema/page.ts

@@ -174,6 +174,7 @@ export const packedPageSchema = {
 		font: {
 			type: 'string',
 			optional: false, nullable: false,
+			enum: ['serif', 'sans-serif'],
 		},
 		script: {
 			type: 'string',

packages/backend/src/postgres.ts

@@ -25,6 +25,7 @@ import { MiAuthSession } from '@/models/AuthSession.js';
 import { MiBlocking } from '@/models/Blocking.js';
 import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
 import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
+import { MiChannelMuting } from "@/models/ChannelMuting.js";
 import { MiClip } from '@/models/Clip.js';
 import { MiClipNote } from '@/models/ClipNote.js';
 import { MiClipFavorite } from '@/models/ClipFavorite.js';
@@ -239,6 +240,7 @@ export const entities = [
 	MiChannel,
 	MiChannelFollowing,
 	MiChannelFavorite,
+	MiChannelMuting,
 	MiRegistryItem,
 	MiAd,
 	MiPasswordResetRequest,

packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts

@@ -4,14 +4,13 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { MutingsRepository } from '@/models/_.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import { UserMutingService } from '@/core/UserMutingService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
-import type * as Bull from 'bullmq';
 
 @Injectable()
 export class CheckExpiredMutingsProcessorService {
@@ -22,6 +21,7 @@ export class CheckExpiredMutingsProcessorService {
 		private mutingsRepository: MutingsRepository,
 
 		private userMutingService: UserMutingService,
+		private channelMutingService: ChannelMutingService,
 		private queueLoggerService: QueueLoggerService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('check-expired-mutings');
@@ -41,6 +41,8 @@ export class CheckExpiredMutingsProcessorService {
 			await this.userMutingService.unmute(expired);
 		}
 
+		await this.channelMutingService.eraseExpiredMutings();
+
 		this.logger.succ('All expired mutings checked.');
 	}
 }

packages/backend/src/queue/processors/CleanRemoteNotesProcessorService.ts

@@ -51,6 +51,17 @@ export class CleanRemoteNotesProcessorService {
 		skipped: boolean;
 		transientErrors: number;
 	}> {
+		const getConfig = () => {
+			return {
+				enabled: this.meta.enableRemoteNotesCleaning,
+				maxDuration: this.meta.remoteNotesCleaningMaxProcessingDurationInMinutes * 60 * 1000, // Convert minutes to milliseconds
+				// The date limit for the newest note to be considered for deletion.
+				// All notes newer than this limit will always be retained.
+				newestLimit: this.idService.gen(Date.now() - (1000 * 60 * 60 * 24 * this.meta.remoteNotesCleaningExpiryDaysForEachNotes)),
+			};
+		};
+
+		const initialConfig = getConfig();
 		if (!this.meta.enableRemoteNotesCleaning) {
 			this.logger.info('Remote notes cleaning is disabled, skipping...');
 			return {
@@ -64,13 +75,9 @@ export class CleanRemoteNotesProcessorService {
 
 		this.logger.info('cleaning remote notes...');
 
-		const maxDuration = this.meta.remoteNotesCleaningMaxProcessingDurationInMinutes * 60 * 1000; // Convert minutes to milliseconds
 		const startAt = Date.now();
 
 		//#region queries
-		// The date limit for the newest note to be considered for deletion.
-		// All notes newer than this limit will always be retained.
-		const newestLimit = this.idService.gen(Date.now() - (1000 * 60 * 60 * 24 * this.meta.remoteNotesCleaningExpiryDaysForEachNotes));
 
 		// The condition for removing the notes.
 		// The note must be:
@@ -92,7 +99,7 @@ export class CleanRemoteNotesProcessorService {
 		const minId = (await this.notesRepository.createQueryBuilder('note')
 			.select('MIN(note.id)', 'minId')
 			.where({
-				id: LessThan(newestLimit),
+				id: LessThan(initialConfig.newestLimit),
 				userHost: Not(IsNull()),
 				replyId: IsNull(),
 				renoteId: IsNull(),
@@ -155,12 +162,12 @@ export class CleanRemoteNotesProcessorService {
 		// | fff | fff    | TRUE        |
 		// | ggg | ggg    | FALSE       |
 		//
-		const candidateNotesQuery = this.db.createQueryBuilder()
+		const candidateNotesQuery = ({ limit }: { limit: number }) => this.db.createQueryBuilder()
 			.select(`"${candidateNotesCteName}"."id"`, 'id')
 			.addSelect('unremovable."id" IS NULL', 'isRemovable')
 			.addSelect(`BOOL_OR("${candidateNotesCteName}"."isBase")`, 'isBase')
 			.addCommonTableExpression(
-				`((SELECT "base".* FROM (${candidateNotesQueryBase.orderBy('note.id', 'ASC').limit(currentLimit).getQuery()}) AS "base") UNION ${candidateNotesQueryInductive.getQuery()})`,
+				`((SELECT "base".* FROM (${candidateNotesQueryBase.orderBy('note.id', 'ASC').limit(limit).getQuery()}) AS "base") UNION ${candidateNotesQueryInductive.getQuery()})`,
 				candidateNotesCteName,
 				{ recursive: true },
 			)
@@ -178,6 +185,11 @@ export class CleanRemoteNotesProcessorService {
 		let lowThroughputWarned = false;
 		let transientErrors = 0;
 		for (;;) {
+			const { enabled, maxDuration, newestLimit } = getConfig();
+			if (!enabled) {
+				this.logger.info('Remote notes cleaning is disabled, processing stopped...');
+				break;
+			}
 			//#region check time
 			const batchBeginAt = Date.now();
 
@@ -205,13 +217,38 @@ export class CleanRemoteNotesProcessorService {
 			let noteIds = null;
 
 			try {
-				noteIds = await candidateNotesQuery.setParameters(
+				noteIds = await candidateNotesQuery({ limit: currentLimit }).setParameters(
 					{ newestLimit, cursorLeft },
 				).getRawMany<{ id: MiNote['id'], isRemovable: boolean, isBase: boolean }>();
 			} catch (e) {
-				if (currentLimit > minimumLimit && e instanceof QueryFailedError && e.driverError?.code === '57014') {
+				if (e instanceof QueryFailedError && e.driverError?.code === '57014') {
-					// Statement timeout (maybe suddenly hit a large note tree), reduce the limit and try again
+					// Statement timeout (maybe suddenly hit a large note tree), if possible, reduce the limit and try again
-					// continuous failures will eventually converge to currentLimit == minimumLimit and then throw
+					// if not possible, skip the current batch of notes and find the next root note
+					if (currentLimit <= minimumLimit) {
+						job.log('Local note tree complexity is too high, finding next root note...');
+
+						const idWindow = await this.notesRepository.createQueryBuilder('note')
+							.select('id')
+							.where('note.id > :cursorLeft')
+							.andWhere(removalCriteria)
+							.andWhere({ replyId: IsNull(), renoteId: IsNull() })
+							.orderBy('note.id', 'ASC')
+							.limit(minimumLimit + 1)
+							.setParameters({ cursorLeft, newestLimit })
+							.getRawMany<{ id?: MiNote['id'] }>();
+
+						job.log(`Skipped note IDs: ${idWindow.slice(0, minimumLimit).map(id => id.id).join(', ')}`);
+
+						const lastId = idWindow.at(minimumLimit)?.id;
+
+						if (!lastId) {
+							job.log('No more notes to clean.');
+							break;
+						}
+
+						cursorLeft = lastId;
+						continue;
+					}
 					currentLimit = Math.max(minimumLimit, Math.floor(currentLimit * 0.25));
 					continue;
 				}

packages/backend/src/server/api/StreamingApiServerService.ts

@@ -15,6 +15,7 @@ import { CacheService } from '@/core/CacheService.js';
 import { MiLocalUser } from '@/models/User.js';
 import { UserService } from '@/core/UserService.js';
 import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { AuthenticateService, AuthenticationError } from './AuthenticateService.js';
 import MainStreamConnection from './stream/Connection.js';
 import { ChannelsService } from './stream/ChannelsService.js';
@@ -39,6 +40,7 @@ export class StreamingApiServerService {
 		private notificationService: NotificationService,
 		private usersService: UserService,
 		private channelFollowingService: ChannelFollowingService,
+		private channelMutingService: ChannelMutingService,
 	) {
 	}
 
@@ -97,6 +99,7 @@ export class StreamingApiServerService {
 				this.notificationService,
 				this.cacheService,
 				this.channelFollowingService,
+				this.channelMutingService,
 				user, app,
 			);
 

packages/backend/src/server/api/endpoint-list.ts

@@ -143,6 +143,9 @@ export * as 'channels/timeline' from './endpoints/channels/timeline.js';
 export * as 'channels/unfavorite' from './endpoints/channels/unfavorite.js';
 export * as 'channels/unfollow' from './endpoints/channels/unfollow.js';
 export * as 'channels/update' from './endpoints/channels/update.js';
+export * as 'channels/mute/create' from './endpoints/channels/mute/create.js';
+export * as 'channels/mute/delete' from './endpoints/channels/mute/delete.js';
+export * as 'channels/mute/list' from './endpoints/channels/mute/list.js';
 export * as 'charts/active-users' from './endpoints/charts/active-users.js';
 export * as 'charts/ap-request' from './endpoints/charts/ap-request.js';
 export * as 'charts/drive' from './endpoints/charts/drive.js';

packages/backend/src/server/api/endpoints/antennas/notes.ts

@@ -5,6 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
+import { Brackets } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { NotesRepository, AntennasRepository } from '@/models/_.js';
 import { QueryService } from '@/core/QueryService.js';
@@ -14,6 +15,7 @@ import { IdService } from '@/core/IdService.js';
 import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -69,6 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queryService: QueryService,
 		private fanoutTimelineService: FanoutTimelineService,
 		private globalEventService: GlobalEventService,
+		private channelMutingService: ChannelMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -108,6 +111,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
+			// -- ミュートされたチャンネル対策
+			const mutingChannelIds = await this.channelMutingService
+				.list({ requestUserId: me.id }, { idOnly: true })
+				.then(x => x.map(x => x.id));
+			if (mutingChannelIds.length > 0) {
+				query.andWhere(new Brackets(qb => {
+					qb.orWhere('note.channelId IS NULL');
+					qb.orWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+				}));
+				query.andWhere(new Brackets(qb => {
+					qb.orWhere('note.renoteChannelId IS NULL');
+					qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+				}));
+			}
+
 			// NOTE: センシティブ除外の設定はこのエンドポイントでは無視する。
 			// https://github.com/misskey-dev/misskey/pull/15346#discussion_r1929950255
 

packages/backend/src/server/api/endpoints/channels/create.ts

@@ -46,7 +46,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		name: { type: 'string', minLength: 1, maxLength: 128 },
-		description: { type: 'string', nullable: true, minLength: 1, maxLength: 2048 },
+		description: { type: 'string', nullable: true, maxLength: 2048 },
 		bannerId: { type: 'string', format: 'misskey:id', nullable: true },
 		color: { type: 'string', minLength: 1, maxLength: 16 },
 		isSensitive: { type: 'boolean', nullable: true },

packages/backend/src/server/api/endpoints/channels/mute/create.ts

@@ -0,0 +1,90 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { ChannelsRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { ApiError } from '@/server/api/error.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+
+export const meta = {
+	tags: ['channels', 'mute'],
+
+	requireCredential: true,
+	prohibitMoved: true,
+
+	kind: 'write:channels',
+
+	errors: {
+		noSuchChannel: {
+			message: 'No such Channel.',
+			code: 'NO_SUCH_CHANNEL',
+			id: '7174361e-d58f-31d6-2e7c-6fb830786a3f',
+		},
+
+		alreadyMuting: {
+			message: 'You are already muting that user.',
+			code: 'ALREADY_MUTING_CHANNEL',
+			id: '5a251978-769a-da44-3e89-3931e43bb592',
+		},
+
+		expiresAtIsPast: {
+			message: 'Cannot set past date to "expiresAt".',
+			code: 'EXPIRES_AT_IS_PAST',
+			id: '42b32236-df2c-a45f-fdbf-def67268f749',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		channelId: { type: 'string', format: 'misskey:id' },
+		expiresAt: {
+			type: 'integer',
+			nullable: true,
+			description: 'A Unix Epoch timestamp that must lie in the future. `null` means an indefinite mute.',
+		},
+	},
+	required: ['channelId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
+		private channelMutingService: ChannelMutingService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			// Check if exists the channel
+			const targetChannel = await this.channelsRepository.findOneBy({ id: ps.channelId });
+			if (!targetChannel) {
+				throw new ApiError(meta.errors.noSuchChannel);
+			}
+
+			// Check if already muting
+			const exist = await this.channelMutingService.isMuted({
+				requestUserId: me.id,
+				targetChannelId: targetChannel.id,
+			});
+			if (exist) {
+				throw new ApiError(meta.errors.alreadyMuting);
+			}
+
+			// Check if expiresAt is past
+			if (ps.expiresAt && ps.expiresAt <= Date.now()) {
+				throw new ApiError(meta.errors.expiresAtIsPast);
+			}
+
+			await this.channelMutingService.mute({
+				requestUserId: me.id,
+				targetChannelId: targetChannel.id,
+				expiresAt: ps.expiresAt ? new Date(ps.expiresAt) : null,
+			});
+		});
+	}
+}

packages/backend/src/server/api/endpoints/channels/mute/delete.ts

@@ -0,0 +1,73 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { ChannelsRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+import { ApiError } from '@/server/api/error.js';
+
+export const meta = {
+	tags: ['channels', 'mute'],
+
+	requireCredential: true,
+	prohibitMoved: true,
+
+	kind: 'write:channels',
+
+	errors: {
+		noSuchChannel: {
+			message: 'No such Channel.',
+			code: 'NO_SUCH_CHANNEL',
+			id: 'e7998769-6e94-d9c2-6b8f-94a527314aba',
+		},
+
+		notMuting: {
+			message: 'You are not muting that channel.',
+			code: 'NOT_MUTING_CHANNEL',
+			id: '14d55962-6ea8-d990-1333-d6bef78dc2ab',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		channelId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['channelId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
+		private channelMutingService: ChannelMutingService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			// Check if exists the channel
+			const targetChannel = await this.channelsRepository.findOneBy({ id: ps.channelId });
+			if (!targetChannel) {
+				throw new ApiError(meta.errors.noSuchChannel);
+			}
+
+			// Check muting
+			const exist = await this.channelMutingService.isMuted({
+				requestUserId: me.id,
+				targetChannelId: targetChannel.id,
+			});
+			if (!exist) {
+				throw new ApiError(meta.errors.notMuting);
+			}
+
+			await this.channelMutingService.unmute({
+				requestUserId: me.id,
+				targetChannelId: targetChannel.id,
+			});
+		});
+	}
+}

packages/backend/src/server/api/endpoints/channels/mute/list.ts

@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
+
+export const meta = {
+	tags: ['channels', 'mute'],
+
+	requireCredential: true,
+	prohibitMoved: true,
+
+	kind: 'read:channels',
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'Channel',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private channelMutingService: ChannelMutingService,
+		private channelEntityService: ChannelEntityService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const mutings = await this.channelMutingService.list({
+				requestUserId: me.id,
+			});
+			return await this.channelEntityService.packMany(mutings, me);
+		});
+	}
+}

packages/backend/src/server/api/endpoints/channels/timeline.ts

@@ -13,6 +13,7 @@ import { DI } from '@/di-symbols.js';
 import { IdService } from '@/core/IdService.js';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
 import { MiLocalUser } from '@/models/User.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -70,6 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queryService: QueryService,
 		private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
 		private activeUsersChart: ActiveUsersChart,
+		private channelMutingService: ChannelMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -98,6 +100,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				useDbFallback: true,
 				redisTimelines: [`channelTimeline:${channel.id}`],
 				excludePureRenotes: false,
+				ignoreAuthorChannelFromMute: true,
 				dbFallback: async (untilId, sinceId, limit) => {
 					return await this.getFromDb({ untilId, sinceId, limit, channelId: channel.id }, me);
 				},
@@ -122,6 +125,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('note.channel', 'channel');
 
 		this.queryService.generateBaseNoteFilteringQuery(query, me);
+
+		if (me) {
+			const mutingChannelIds = await this.channelMutingService
+				.list({ requestUserId: me.id }, { idOnly: true })
+				.then(x => x.map(x => x.id).filter(x => x !== ps.channelId));
+			if (mutingChannelIds.length > 0) {
+				query.andWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+				query.andWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+			}
+		}
 		//#endregion
 
 		return await query.limit(ps.limit).getMany();

packages/backend/src/server/api/endpoints/channels/update.ts

@@ -50,7 +50,7 @@ export const paramDef = {
 	properties: {
 		channelId: { type: 'string', format: 'misskey:id' },
 		name: { type: 'string', minLength: 1, maxLength: 128 },
-		description: { type: 'string', nullable: true, minLength: 1, maxLength: 2048 },
+		description: { type: 'string', nullable: true, maxLength: 2048 },
 		bannerId: { type: 'string', format: 'misskey:id', nullable: true },
 		isArchived: { type: 'boolean', nullable: true },
 		pinnedNoteIds: {

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -18,6 +18,8 @@ import { QueryService } from '@/core/QueryService.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
 import { MiLocalUser } from '@/models/User.js';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -46,7 +48,7 @@ export const meta = {
 		bothWithRepliesAndWithFiles: {
 			message: 'Specifying both withReplies and withFiles is not supported',
 			code: 'BOTH_WITH_REPLIES_AND_WITH_FILES',
-			id: 'dfaa3eb7-8002-4cb7-bcc4-1095df46656f'
+			id: 'dfaa3eb7-8002-4cb7-bcc4-1095df46656f',
 		},
 	},
 } as const;
@@ -79,9 +81,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
-		@Inject(DI.channelFollowingsRepository)
-		private channelFollowingsRepository: ChannelFollowingsRepository,
-
 		private noteEntityService: NoteEntityService,
 		private roleService: RoleService,
 		private activeUsersChart: ActiveUsersChart,
@@ -89,6 +88,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private cacheService: CacheService,
 		private queryService: QueryService,
 		private userFollowingService: UserFollowingService,
+		private channelMutingService: ChannelMutingService,
+		private channelFollowingService: ChannelFollowingService,
 		private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -196,11 +197,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		withReplies: boolean,
 	}, me: MiLocalUser) {
 		const followees = await this.userFollowingService.getFollowees(me.id);
-		const followingChannels = await this.channelFollowingsRepository.find({
+
-			where: {
+		const mutingChannelIds = await this.channelMutingService
-				followerId: me.id,
+			.list({ requestUserId: me.id }, { idOnly: true })
-			},
+			.then(x => x.map(x => x.id));
-		});
+		const followingChannelIds = await this.channelFollowingService
+			.list({ requestUserId: me.id }, { idOnly: true })
+			.then(x => x.map(x => x.id).filter(x => !mutingChannelIds.includes(x)));
 
 		const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
 			.andWhere(new Brackets(qb => {
@@ -219,9 +222,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('reply.user', 'replyUser')
 			.leftJoinAndSelect('renote.user', 'renoteUser');
 
-		if (followingChannels.length > 0) {
+		if (followingChannelIds.length > 0) {
-			const followingChannelIds = followingChannels.map(x => x.followeeId);
-
 			query.andWhere(new Brackets(qb => {
 				qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
 				qb.orWhere('note.channelId IS NULL');
@@ -230,6 +231,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			query.andWhere('note.channelId IS NULL');
 		}
 
+		if (mutingChannelIds.length > 0) {
+			query.andWhere(new Brackets(qb => {
+				qb.orWhere('note.renoteChannelId IS NULL');
+				qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+			}));
+		}
+
 		if (!ps.withReplies) {
 			query.andWhere(new Brackets(qb => {
 				qb

packages/backend/src/server/api/endpoints/notes/local-timeline.ts

@@ -15,6 +15,7 @@ import { IdService } from '@/core/IdService.js';
 import { QueryService } from '@/core/QueryService.js';
 import { MiLocalUser } from '@/models/User.js';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -76,6 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private idService: IdService,
 		private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
 		private queryService: QueryService,
+		private channelMutingService: ChannelMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -157,7 +159,19 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		if (me) this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
+		if (me) {
+			this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
+
+			const mutedChannelIds = await this.channelMutingService
+				.list({ requestUserId: me.id }, { idOnly: true })
+				.then(x => x.map(x => x.id));
+			if (mutedChannelIds.length > 0) {
+				query.andWhere(new Brackets(qb => {
+					qb.orWhere('note.renoteChannelId IS NULL')
+						.orWhere('note.renoteChannelId NOT IN (:...mutedChannelIds)', { mutedChannelIds });
+				}));
+			}
+		}
 
 		if (ps.withFiles) {
 			query.andWhere('note.fileIds != \'{}\'');

packages/backend/src/server/api/endpoints/notes/timeline.ts

@@ -5,7 +5,7 @@
 
 import { Brackets } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
-import type { NotesRepository, ChannelFollowingsRepository, MiMeta } from '@/models/_.js';
+import type { NotesRepository, MiMeta } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { QueryService } from '@/core/QueryService.js';
 import ActiveUsersChart from '@/core/chart/charts/active-users.js';
@@ -16,6 +16,8 @@ import { CacheService } from '@/core/CacheService.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
 import { MiLocalUser } from '@/models/User.js';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -61,15 +63,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
-		@Inject(DI.channelFollowingsRepository)
-		private channelFollowingsRepository: ChannelFollowingsRepository,
-
 		private noteEntityService: NoteEntityService,
 		private activeUsersChart: ActiveUsersChart,
 		private idService: IdService,
 		private cacheService: CacheService,
 		private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
 		private userFollowingService: UserFollowingService,
+		private channelMutingService: ChannelMutingService,
+		private channelFollowingService: ChannelFollowingService,
 		private queryService: QueryService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -140,11 +141,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 	private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; }, me: MiLocalUser) {
 		const followees = await this.userFollowingService.getFollowees(me.id);
-		const followingChannels = await this.channelFollowingsRepository.find({
+
-			where: {
+		const mutingChannelIds = await this.channelMutingService
-				followerId: me.id,
+			.list({ requestUserId: me.id }, { idOnly: true })
-			},
+			.then(x => x.map(x => x.id));
-		});
+		const followingChannelIds = await this.channelFollowingService
+			.list({ requestUserId: me.id }, { idOnly: true })
+			.then(x => x.map(x => x.id).filter(x => !mutingChannelIds.includes(x)));
 
 		//#region Construct query
 		const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
@@ -154,15 +157,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('reply.user', 'replyUser')
 			.leftJoinAndSelect('renote.user', 'renoteUser');
 
-		if (followees.length > 0 && followingChannels.length > 0) {
+		if (followees.length > 0 && followingChannelIds.length > 0) {
 			// ユーザー・チャンネルともにフォローあり
 			const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)];
-			const followingChannelIds = followingChannels.map(x => x.followeeId);
 			query.andWhere(new Brackets(qb => {
 				qb
 					.where(new Brackets(qb2 => {
 						qb2
-							.where('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds })
+							.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds })
 							.andWhere('note.channelId IS NULL');
 					}))
 					.orWhere('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
@@ -170,22 +172,32 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		} else if (followees.length > 0) {
 			// ユーザーフォローのみ（チャンネルフォローなし）
 			const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)];
-			query
-				.andWhere('note.channelId IS NULL')
-				.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds });
-		} else if (followingChannels.length > 0) {
-			// チャンネルフォローのみ（ユーザーフォローなし）
-			const followingChannelIds = followingChannels.map(x => x.followeeId);
 			query.andWhere(new Brackets(qb => {
 				qb
+					.andWhere('note.channelId IS NULL')
+					.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds });
+				if (mutingChannelIds.length > 0) {
+					qb.andWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+				}
+			}));
+		} else if (followingChannelIds.length > 0) {
+			// チャンネルフォローのみ（ユーザーフォローなし）
+			query.andWhere(new Brackets(qb => {
+				qb
+					// renoteChannelIdは見る必要が無い
+					// ・HTLに流れてくるチャンネル＝フォローしているチャンネル
+					// ・HTLにフォロー外のチャンネルが流れるのは、フォローしているユーザがそのチャンネル投稿をリノートした場合のみ
+					// つまり、ユーザフォローしてない前提のこのブロックでは見る必要が無い
 					.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds })
 					.orWhere('note.userId = :meId', { meId: me.id });
 			}));
 		} else {
 			// フォローなし
-			query
+			query.andWhere(new Brackets(qb => {
+				qb
 					.andWhere('note.channelId IS NULL')
 					.andWhere('note.userId = :meId', { meId: me.id });
+			}));
 		}
 
 		query.andWhere(new Brackets(qb => {

packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts

@@ -14,6 +14,7 @@ import { IdService } from '@/core/IdService.js';
 import { QueryService } from '@/core/QueryService.js';
 import { MiLocalUser } from '@/models/User.js';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -84,6 +85,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private idService: IdService,
 		private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
 		private queryService: QueryService,
+		private channelMutingService: ChannelMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -187,6 +189,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		this.queryService.generateBaseNoteFilteringQuery(query, me);
 		this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 
+		// -- ミュートされたチャンネルのリノート対策
+		const mutedChannelIds = await this.channelMutingService
+			.list({ requestUserId: me.id }, { idOnly: true })
+			.then(x => x.map(x => x.id));
+		if (mutedChannelIds.length > 0) {
+			query.andWhere(new Brackets(qb => {
+				qb.orWhere('note.renoteChannelId IS NULL')
+					.orWhere('note.renoteChannelId NOT IN (:...mutedChannelIds)', { mutedChannelIds });
+			}));
+		}
+
 		if (ps.includeMyRenotes === false) {
 			query.andWhere(new Brackets(qb => {
 				qb.orWhere('note.userId != :meId', { meId: me.id });

packages/backend/src/server/api/endpoints/roles/notes.ts

@@ -5,6 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
+import { Brackets } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { NotesRepository, RolesRepository } from '@/models/_.js';
 import { QueryService } from '@/core/QueryService.js';
@@ -12,6 +13,7 @@ import { DI } from '@/di-symbols.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { IdService } from '@/core/IdService.js';
 import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -68,6 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private noteEntityService: NoteEntityService,
 		private queryService: QueryService,
 		private fanoutTimelineService: FanoutTimelineService,
+		private channelMutingService: ChannelMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -101,6 +104,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
+			// -- ミュートされたチャンネル対策
+			const mutingChannelIds = await this.channelMutingService
+				.list({ requestUserId: me.id }, { idOnly: true })
+				.then(x => x.map(x => x.id));
+			if (mutingChannelIds.length > 0) {
+				query.andWhere(new Brackets(qb => {
+					qb.orWhere('note.channelId IS NULL');
+					qb.orWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+				}));
+				query.andWhere(new Brackets(qb => {
+					qb.orWhere('note.renoteChannelId IS NULL');
+					qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+				}));
+			}
+
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBaseNoteFilteringQuery(query, me);
 

packages/backend/src/server/api/endpoints/users/notes.ts

@@ -16,6 +16,7 @@ import { MiLocalUser } from '@/models/User.js';
 import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
 import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
 import { ApiError } from '@/server/api/error.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 
 export const meta = {
 	tags: ['users', 'notes'],
@@ -77,12 +78,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
-
 		private noteEntityService: NoteEntityService,
 		private queryService: QueryService,
 		private cacheService: CacheService,
 		private idService: IdService,
 		private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
+		private channelMutingService: ChannelMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -165,6 +166,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		withFiles: boolean,
 		withRenotes: boolean,
 	}, me: MiLocalUser | null) {
+		const mutingChannelIds = me
+			? await this.channelMutingService
+				.list({ requestUserId: me.id }, { idOnly: true })
+				.then(x => x.map(x => x.id))
+			: [];
 		const isSelf = me && (me.id === ps.userId);
 
 		const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
@@ -177,14 +183,30 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('renote.user', 'renoteUser');
 
 		if (ps.withChannelNotes) {
-			if (!isSelf) query.andWhere(new Brackets(qb => {
+			query.andWhere(new Brackets(qb => {
-				qb.orWhere('note.channelId IS NULL');
+				if (mutingChannelIds.length > 0) {
-				qb.orWhere('channel.isSensitive = false');
+					qb.andWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds: mutingChannelIds });
+				}
+
+				if (!isSelf) {
+					qb.andWhere(new Brackets(qb2 => {
+						qb2.orWhere('note.channelId IS NULL');
+						qb2.orWhere('channel.isSensitive = false');
+					}));
+				}
 			}));
 		} else {
 			query.andWhere('note.channelId IS NULL');
 		}
 
+		// -- ミュートされたチャンネルのリノート対策
+		if (mutingChannelIds.length > 0) {
+			query.andWhere(new Brackets(qb => {
+				qb.orWhere('note.renoteChannelId IS NULL');
+				qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
+			}));
+		}
+
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBaseNoteFilteringQuery(query, me, {
 			excludeAuthor: true,

packages/backend/src/server/api/stream/Connection.ts

@@ -11,8 +11,9 @@ import type { NotificationService } from '@/core/NotificationService.js';
 import { bindThis } from '@/decorators.js';
 import { CacheService } from '@/core/CacheService.js';
 import { MiFollowing, MiUserProfile } from '@/models/_.js';
-import type { StreamEventEmitter, GlobalEvents } from '@/core/GlobalEventService.js';
+import type { GlobalEvents, StreamEventEmitter } from '@/core/GlobalEventService.js';
 import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
 import { isJsonObject } from '@/misc/json-value.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import type { ChannelsService } from './ChannelsService.js';
@@ -35,6 +36,7 @@ export default class Connection {
 	public userProfile: MiUserProfile | null = null;
 	public following: Record<string, Pick<MiFollowing, 'withReplies'> | undefined> = {};
 	public followingChannels: Set<string> = new Set();
+	public mutingChannels: Set<string> = new Set();
 	public userIdsWhoMeMuting: Set<string> = new Set();
 	public userIdsWhoBlockingMe: Set<string> = new Set();
 	public userIdsWhoMeMutingRenotes: Set<string> = new Set();
@@ -46,7 +48,7 @@ export default class Connection {
 		private notificationService: NotificationService,
 		private cacheService: CacheService,
 		private channelFollowingService: ChannelFollowingService,
-
+		private channelMutingService: ChannelMutingService,
 		user: MiUser | null | undefined,
 		token: MiAccessToken | null | undefined,
 	) {
@@ -57,10 +59,19 @@ export default class Connection {
 	@bindThis
 	public async fetch() {
 		if (this.user == null) return;
-		const [userProfile, following, followingChannels, userIdsWhoMeMuting, userIdsWhoBlockingMe, userIdsWhoMeMutingRenotes] = await Promise.all([
+		const [
+			userProfile,
+			following,
+			followingChannels,
+			mutingChannels,
+			userIdsWhoMeMuting,
+			userIdsWhoBlockingMe,
+			userIdsWhoMeMutingRenotes,
+		] = await Promise.all([
 			this.cacheService.userProfileCache.fetch(this.user.id),
 			this.cacheService.userFollowingsCache.fetch(this.user.id),
 			this.channelFollowingService.userFollowingChannelsCache.fetch(this.user.id),
+			this.channelMutingService.mutingChannelsCache.fetch(this.user.id),
 			this.cacheService.userMutingsCache.fetch(this.user.id),
 			this.cacheService.userBlockedCache.fetch(this.user.id),
 			this.cacheService.renoteMutingsCache.fetch(this.user.id),
@@ -68,6 +79,7 @@ export default class Connection {
 		this.userProfile = userProfile;
 		this.following = following;
 		this.followingChannels = followingChannels;
+		this.mutingChannels = mutingChannels;
 		this.userIdsWhoMeMuting = userIdsWhoMeMuting;
 		this.userIdsWhoBlockingMe = userIdsWhoBlockingMe;
 		this.userIdsWhoMeMutingRenotes = userIdsWhoMeMutingRenotes;

packages/backend/src/server/api/stream/channel.ts

@@ -6,7 +6,8 @@
 import { bindThis } from '@/decorators.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
-import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import { isQuotePacked, isRenotePacked } from '@/misc/is-renote.js';
+import { isChannelRelated } from '@/misc/is-channel-related.js';
 import type { Packed } from '@/misc/json-schema.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import type Connection from './Connection.js';
@@ -55,6 +56,10 @@ export default abstract class Channel {
 		return this.connection.followingChannels;
 	}
 
+	protected get mutingChannels() {
+		return this.connection.mutingChannels;
+	}
+
 	protected get subscriber() {
 		return this.connection.subscriber;
 	}
@@ -74,6 +79,9 @@ export default abstract class Channel {
 		// 流れてきたNoteがリノートをミュートしてるユーザが行ったもの
 		if (isRenotePacked(note) && !isQuotePacked(note) && this.userIdsWhoMeMutingRenotes.has(note.user.id)) return true;
 
+		// 流れてきたNoteがミュートしているチャンネルと関わる
+		if (isChannelRelated(note, this.mutingChannels)) return true;
+
 		return false;
 	}
 

packages/backend/src/server/api/stream/channels/channel.ts

@@ -8,6 +8,8 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import { isInstanceMuted } from '@/misc/is-instance-muted.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -19,7 +21,6 @@ class ChannelChannel extends Channel {
 
 	constructor(
 		private noteEntityService: NoteEntityService,
-
 		id: string,
 		connection: Channel['connection'],
 	) {
@@ -52,6 +53,35 @@ class ChannelChannel extends Channel {
 		this.send('note', note);
 	}
 
+	/*
+	 * ミュートとブロックされてるを処理する
+	 */
+	protected override isNoteMutedOrBlocked(note: Packed<'Note'>): boolean {
+		// 流れてきたNoteがインスタンスミュートしたインスタンスが関わる
+		if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? []))) return true;
+
+		// 流れてきたNoteがミュートしているユーザーが関わる
+		if (isUserRelated(note, this.userIdsWhoMeMuting)) return true;
+		// 流れてきたNoteがブロックされているユーザーが関わる
+		if (isUserRelated(note, this.userIdsWhoBlockingMe)) return true;
+
+		// 流れてきたNoteがリノートをミュートしてるユーザが行ったもの
+		if (isRenotePacked(note) && !isQuotePacked(note) && this.userIdsWhoMeMutingRenotes.has(note.user.id)) return true;
+
+		// このソケットで見ているチャンネルがミュートされていたとしても、チャンネルを直接見ている以上は流すようにしたい
+		// ただし、他のミュートしているチャンネルは流さないようにもしたい
+		// ノート自体のチャンネルIDはonNoteでチェックしているので、ここではリノートのチャンネルIDをチェックする
+		if (
+			(note.renote) &&
+			(note.renote.channelId !== this.channelId) &&
+			(note.renote.channelId && this.mutingChannels.has(note.renote.channelId))
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
 	@bindThis
 	public dispose() {
 		// Unsubscribe events

packages/backend/src/server/api/stream/channels/home-timeline.ts

@@ -44,7 +44,10 @@ class HomeTimelineChannel extends Channel {
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 
 		if (note.channelId) {
-			if (!this.followingChannels.has(note.channelId)) return;
+			// そのチャンネルをフォローしていない
+			if (!this.followingChannels.has(note.channelId)) {
+				return;
+			}
 		} else {
 			// その投稿のユーザーをフォローしていなかったら弾く
 			if (!isMe && !Object.hasOwn(this.following, note.userId)) return;

packages/backend/src/server/api/stream/channels/hybrid-timeline.ts

@@ -53,16 +53,25 @@ class HybridTimelineChannel extends Channel {
 
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 
-		// チャンネルの投稿ではなく、自分自身の投稿 または
+		if (!note.channelId) {
-		// チャンネルの投稿ではなく、その投稿のユーザーをフォローしている または
+			// 以下の条件に該当するノートのみ後続処理に通す（ので、以下のif文は該当しないノートをすべて弾くようにする）
-		// チャンネルの投稿ではなく、全体公開のローカルの投稿 または
+			// - 自分自身の投稿
-		// フォローしているチャンネルの投稿 の場合だけ
+			// - その投稿のユーザーをフォローしている
+			// - 全体公開のローカルの投稿
 			if (!(
-			(note.channelId == null && isMe) ||
+				isMe ||
-			(note.channelId == null && Object.hasOwn(this.following, note.userId)) ||
+				Object.hasOwn(this.following, note.userId) ||
-			(note.channelId == null && (note.user.host == null && note.visibility === 'public')) ||
+				(note.user.host == null && note.visibility === 'public')
-			(note.channelId != null && this.followingChannels.has(note.channelId))
+			)) {
-		)) return;
+				return;
+			}
+		} else {
+			// 以下の条件に該当するノートのみ後続処理に通す（ので、以下のif文は該当しないノートをすべて弾くようにする）
+			// - フォローしているチャンネルの投稿
+			if (!this.followingChannels.has(note.channelId)) {
+				return;
+			}
+		}
 
 		if (note.visibility === 'followers') {
 			if (!isMe && !Object.hasOwn(this.following, note.userId)) return;

packages/backend/test/e2e/antennas.ts

@@ -69,6 +69,9 @@ describe('アンテナ', () => {
 	let userMutingAlice: User;
 	let userMutedByAlice: User;
 
+	let testChannel: misskey.entities.Channel;
+	let testMutedChannel: misskey.entities.Channel;
+
 	beforeAll(async () => {
 		root = await signup({ username: 'root' });
 		alice = await signup({ username: 'alice' });
@@ -120,6 +123,10 @@ describe('アンテナ', () => {
 		userMutedByAlice = await signup({ username: 'userMutedByAlice' });
 		await post(userMutedByAlice, { text: 'test' });
 		await api('mute/create', { userId: userMutedByAlice.id }, alice);
+
+		testChannel = (await api('channels/create', { name: 'test' }, root)).body;
+		testMutedChannel = (await api('channels/create', { name: 'test-muted' }, root)).body;
+		await api('channels/mute/create', { channelId: testMutedChannel.id }, alice);
 	}, 1000 * 60 * 10);
 
 	beforeEach(async () => {
@@ -605,6 +612,20 @@ describe('アンテナ', () => {
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
 				],
 			},
+			{
+				label: 'チャンネルノートも含む',
+				parameters: () => ({ src: 'all' }),
+				posts: [
+					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}`, channelId: testChannel.id }), included: true },
+				],
+			},
+			{
+				label: 'ミュートしてるチャンネルは含まない',
+				parameters: () => ({ src: 'all' }),
+				posts: [
+					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}`, channelId: testMutedChannel.id }) },
+				],
+			},
 		])('が取得できること（$label）', async ({ parameters, posts }) => {
 			const antenna = await successfulApiCall({
 				endpoint: 'antennas/create',

packages/backend/test/jest.setup.unit.cjs

@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+module.exports = async () => {
+	// DBはUTC（っぽい）ので、テスト側も合わせておく
+	process.env.TZ = 'UTC';
+	process.env.NODE_ENV = 'test';
+};

packages/backend/test/unit/ChannelFollowingService.ts

@@ -0,0 +1,235 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable */
+
+import { afterEach, beforeEach, describe, expect } from '@jest/globals';
+import { Test, TestingModule } from '@nestjs/testing';
+import { GlobalModule } from '@/GlobalModule.js';
+import { CoreModule } from '@/core/CoreModule.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { IdService } from '@/core/IdService.js';
+import {
+	type ChannelFollowingsRepository,
+	ChannelsRepository,
+	DriveFilesRepository,
+	MiChannel,
+	MiChannelFollowing,
+	MiDriveFile,
+	MiUser,
+	UserProfilesRepository,
+	UsersRepository,
+} from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { ChannelFollowingService } from "@/core/ChannelFollowingService.js";
+import { MiLocalUser } from "@/models/User.js";
+
+describe('ChannelFollowingService', () => {
+	let app: TestingModule;
+	let service: ChannelFollowingService;
+	let channelsRepository: ChannelsRepository;
+	let channelFollowingsRepository: ChannelFollowingsRepository;
+	let usersRepository: UsersRepository;
+	let userProfilesRepository: UserProfilesRepository;
+	let driveFilesRepository: DriveFilesRepository;
+	let idService: IdService;
+
+	let alice: MiLocalUser;
+	let bob: MiLocalUser;
+	let channel1: MiChannel;
+	let channel2: MiChannel;
+	let channel3: MiChannel;
+	let driveFile1: MiDriveFile;
+	let driveFile2: MiDriveFile;
+
+	async function createUser(data: Partial<MiUser> = {}) {
+		const user = await usersRepository
+			.insert({
+				id: idService.gen(),
+				username: 'username',
+				usernameLower: 'username',
+				...data,
+			})
+			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
+
+		await userProfilesRepository.insert({
+			userId: user.id,
+		});
+
+		return user;
+	}
+
+	async function createChannel(data: Partial<MiChannel> = {}) {
+		return await channelsRepository
+			.insert({
+				id: idService.gen(),
+				...data,
+			})
+			.then(x => channelsRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	async function createChannelFollowing(data: Partial<MiChannelFollowing> = {}) {
+		return await channelFollowingsRepository
+			.insert({
+				id: idService.gen(),
+				...data,
+			})
+			.then(x => channelFollowingsRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	async function fetchChannelFollowing() {
+		return await channelFollowingsRepository.findBy({});
+	}
+
+	async function createDriveFile(data: Partial<MiDriveFile> = {}) {
+		return await driveFilesRepository
+			.insert({
+				id: idService.gen(),
+				md5: 'md5',
+				name: 'name',
+				size: 0,
+				type: 'type',
+				storedInternal: false,
+				url: 'url',
+				...data,
+			})
+			.then(x => driveFilesRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	beforeAll(async () => {
+		app = await Test.createTestingModule({
+			imports: [
+				GlobalModule,
+				CoreModule,
+			],
+			providers: [
+				GlobalEventService,
+				IdService,
+				ChannelFollowingService,
+			],
+		}).compile();
+
+		app.enableShutdownHooks();
+
+		service = app.get<ChannelFollowingService>(ChannelFollowingService);
+		idService = app.get<IdService>(IdService);
+		channelsRepository = app.get<ChannelsRepository>(DI.channelsRepository);
+		channelFollowingsRepository = app.get<ChannelFollowingsRepository>(DI.channelFollowingsRepository);
+		usersRepository = app.get<UsersRepository>(DI.usersRepository);
+		userProfilesRepository = app.get<UserProfilesRepository>(DI.userProfilesRepository);
+		driveFilesRepository = app.get<DriveFilesRepository>(DI.driveFilesRepository);
+	});
+
+	afterAll(async () => {
+		await app.close();
+	});
+
+	beforeEach(async () => {
+		alice = { ...await createUser({ username: 'alice' }), host: null, uri: null };
+		bob = { ...await createUser({ username: 'bob' }), host: null, uri: null };
+		driveFile1 = await createDriveFile();
+		driveFile2 = await createDriveFile();
+		channel1 = await createChannel({ name: 'channel1', userId: alice.id, bannerId: driveFile1.id });
+		channel2 = await createChannel({ name: 'channel2', userId: alice.id, bannerId: driveFile2.id });
+		channel3 = await createChannel({ name: 'channel3', userId: alice.id, bannerId: driveFile2.id });
+	});
+
+	afterEach(async () => {
+		await channelFollowingsRepository.deleteAll();
+		await channelsRepository.deleteAll();
+		await userProfilesRepository.deleteAll();
+		await usersRepository.deleteAll();
+	});
+
+	describe('list', () => {
+		test('default', async () => {
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
+			await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
+
+			const followings = await service.list({ requestUserId: alice.id });
+
+			expect(followings).toHaveLength(2);
+			expect(followings[0].id).toBe(channel1.id);
+			expect(followings[0].userId).toBe(alice.id);
+			expect(followings[0].user).toBeFalsy();
+			expect(followings[0].bannerId).toBe(driveFile1.id);
+			expect(followings[0].banner).toBeFalsy();
+			expect(followings[1].id).toBe(channel2.id);
+			expect(followings[1].userId).toBe(alice.id);
+			expect(followings[1].user).toBeFalsy();
+			expect(followings[1].bannerId).toBe(driveFile2.id);
+			expect(followings[1].banner).toBeFalsy();
+		});
+
+		test('idOnly', async () => {
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
+			await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
+
+			const followings = await service.list({ requestUserId: alice.id }, { idOnly: true });
+
+			expect(followings).toHaveLength(2);
+			expect(followings[0].id).toBe(channel1.id);
+			expect(followings[1].id).toBe(channel2.id);
+		});
+
+		test('joinUser', async () => {
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
+			await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
+
+			const followings = await service.list({ requestUserId: alice.id }, { joinUser: true });
+
+			expect(followings).toHaveLength(2);
+			expect(followings[0].id).toBe(channel1.id);
+			expect(followings[0].user).toEqual(alice);
+			expect(followings[0].banner).toBeFalsy();
+			expect(followings[1].id).toBe(channel2.id);
+			expect(followings[1].user).toEqual(alice);
+			expect(followings[1].banner).toBeFalsy();
+		});
+
+		test('joinBannerFile', async () => {
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
+			await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
+
+			const followings = await service.list({ requestUserId: alice.id }, { joinBannerFile: true });
+
+			expect(followings).toHaveLength(2);
+			expect(followings[0].id).toBe(channel1.id);
+			expect(followings[0].user).toBeFalsy();
+			expect(followings[0].banner).toEqual(driveFile1);
+			expect(followings[1].id).toBe(channel2.id);
+			expect(followings[1].user).toBeFalsy();
+			expect(followings[1].banner).toEqual(driveFile2);
+		});
+	});
+
+	describe('follow', () => {
+		test('default', async () => {
+			await service.follow(alice, channel1);
+
+			const followings = await fetchChannelFollowing();
+
+			expect(followings).toHaveLength(1);
+			expect(followings[0].followeeId).toBe(channel1.id);
+			expect(followings[0].followerId).toBe(alice.id);
+		});
+	});
+
+	describe('unfollow', () => {
+		test('default', async () => {
+			await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
+
+			await service.unfollow(alice, channel1);
+
+			const followings = await fetchChannelFollowing();
+
+			expect(followings).toHaveLength(0);
+		});
+	});
+});

packages/backend/test/unit/ChannelMutingService.ts

@@ -0,0 +1,336 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable */
+
+import { afterEach, beforeEach, describe, expect } from '@jest/globals';
+import { Test, TestingModule } from '@nestjs/testing';
+import { GlobalModule } from '@/GlobalModule.js';
+import { CoreModule } from '@/core/CoreModule.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { IdService } from '@/core/IdService.js';
+import { ChannelMutingService } from '@/core/ChannelMutingService.js';
+import {
+	ChannelMutingRepository,
+	ChannelsRepository,
+	DriveFilesRepository,
+	MiChannel,
+	MiChannelMuting,
+	MiDriveFile,
+	MiUser,
+	UserProfilesRepository,
+	UsersRepository,
+} from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { setTimeout } from 'node:timers/promises';
+
+describe('ChannelMutingService', () => {
+	let app: TestingModule;
+	let service: ChannelMutingService;
+	let channelsRepository: ChannelsRepository;
+	let channelMutingRepository: ChannelMutingRepository;
+	let usersRepository: UsersRepository;
+	let userProfilesRepository: UserProfilesRepository;
+	let driveFilesRepository: DriveFilesRepository;
+	let idService: IdService;
+
+	let alice: MiUser;
+	let bob: MiUser;
+	let channel1: MiChannel;
+	let channel2: MiChannel;
+	let channel3: MiChannel;
+	let driveFile1: MiDriveFile;
+	let driveFile2: MiDriveFile;
+
+	async function createUser(data: Partial<MiUser> = {}) {
+		const user = await usersRepository
+			.insert({
+				id: idService.gen(),
+				username: 'username',
+				usernameLower: 'username',
+				...data,
+			})
+			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
+
+		await userProfilesRepository.insert({
+			userId: user.id,
+		});
+
+		return user;
+	}
+
+	async function createChannel(data: Partial<MiChannel> = {}) {
+		return await channelsRepository
+			.insert({
+				id: idService.gen(),
+				...data,
+			})
+			.then(x => channelsRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	async function createChannelMuting(data: Partial<MiChannelMuting> = {}) {
+		return await channelMutingRepository
+			.insert({
+				id: idService.gen(),
+				...data,
+			})
+			.then(x => channelMutingRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	async function fetchChannelMuting() {
+		return await channelMutingRepository.findBy({});
+	}
+
+	async function createDriveFile(data: Partial<MiDriveFile> = {}) {
+		return await driveFilesRepository
+			.insert({
+				id: idService.gen(),
+				md5: 'md5',
+				name: 'name',
+				size: 0,
+				type: 'type',
+				storedInternal: false,
+				url: 'url',
+				...data,
+			})
+			.then(x => driveFilesRepository.findOneByOrFail(x.identifiers[0]));
+	}
+
+	beforeAll(async () => {
+		app = await Test.createTestingModule({
+			imports: [
+				GlobalModule,
+				CoreModule,
+			],
+			providers: [
+				GlobalEventService,
+				IdService,
+				ChannelMutingService,
+			],
+		}).compile();
+
+		app.enableShutdownHooks();
+
+		service = app.get<ChannelMutingService>(ChannelMutingService);
+		idService = app.get<IdService>(IdService);
+		channelsRepository = app.get<ChannelsRepository>(DI.channelsRepository);
+		channelMutingRepository = app.get<ChannelMutingRepository>(DI.channelMutingRepository);
+		usersRepository = app.get<UsersRepository>(DI.usersRepository);
+		userProfilesRepository = app.get<UserProfilesRepository>(DI.userProfilesRepository);
+		driveFilesRepository = app.get<DriveFilesRepository>(DI.driveFilesRepository);
+	});
+
+	afterAll(async () => {
+		await app.close();
+	});
+
+	beforeEach(async () => {
+		alice = await createUser({ username: 'alice' });
+		bob = await createUser({ username: 'bob' });
+		driveFile1 = await createDriveFile();
+		driveFile2 = await createDriveFile();
+		channel1 = await createChannel({ name: 'channel1', userId: alice.id, bannerId: driveFile1.id });
+		channel2 = await createChannel({ name: 'channel2', userId: alice.id, bannerId: driveFile2.id });
+		channel3 = await createChannel({ name: 'channel3', userId: alice.id, bannerId: driveFile2.id });
+	});
+
+	afterEach(async () => {
+		await channelMutingRepository.deleteAll();
+		await channelsRepository.deleteAll();
+		await userProfilesRepository.deleteAll();
+		await usersRepository.deleteAll();
+	});
+
+	describe('list', () => {
+		test('default', async () => {
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id });
+			await createChannelMuting({ userId: bob.id, channelId: channel3.id });
+
+			const mutings = await service.list({ requestUserId: alice.id });
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].id).toBe(channel1.id);
+			expect(mutings[0].userId).toBe(alice.id);
+			expect(mutings[0].user).toBeFalsy();
+			expect(mutings[0].bannerId).toBe(driveFile1.id);
+			expect(mutings[0].banner).toBeFalsy();
+			expect(mutings[1].id).toBe(channel2.id);
+			expect(mutings[1].userId).toBe(alice.id);
+			expect(mutings[1].user).toBeFalsy();
+			expect(mutings[1].bannerId).toBe(driveFile2.id);
+			expect(mutings[1].banner).toBeFalsy();
+		});
+
+		test('withoutExpires', async () => {
+			const now = new Date();
+			const past = new Date(now);
+			const future = new Date(now);
+			past.setMinutes(past.getMinutes() - 1);
+			future.setMinutes(future.getMinutes() + 1);
+
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: null });
+			await createChannelMuting({ userId: alice.id, channelId: channel3.id, expiresAt: future });
+
+			const mutings = await service.list({ requestUserId: alice.id });
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].id).toBe(channel2.id);
+			expect(mutings[1].id).toBe(channel3.id);
+		});
+
+		test('idOnly', async () => {
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id });
+			await createChannelMuting({ userId: bob.id, channelId: channel3.id });
+
+			const mutings = await service.list({ requestUserId: alice.id }, { idOnly: true });
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].id).toBe(channel1.id);
+			expect(mutings[1].id).toBe(channel2.id);
+		});
+
+		test('withoutExpires-idOnly', async () => {
+			const now = new Date();
+			const past = new Date(now);
+			const future = new Date(now);
+			past.setMinutes(past.getMinutes() - 1);
+			future.setMinutes(future.getMinutes() + 1);
+
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: null });
+			await createChannelMuting({ userId: alice.id, channelId: channel3.id, expiresAt: future });
+
+			const mutings = await service.list({ requestUserId: alice.id }, { idOnly: true });
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].id).toBe(channel2.id);
+			expect(mutings[1].id).toBe(channel3.id);
+		});
+
+		test('joinUser', async () => {
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id });
+			await createChannelMuting({ userId: bob.id, channelId: channel3.id });
+
+			const mutings = await service.list({ requestUserId: alice.id }, { joinUser: true });
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].id).toBe(channel1.id);
+			expect(mutings[0].user).toEqual(alice);
+			expect(mutings[0].banner).toBeFalsy();
+			expect(mutings[1].id).toBe(channel2.id);
+			expect(mutings[1].user).toEqual(alice);
+			expect(mutings[1].banner).toBeFalsy();
+		});
+
+		test('joinBannerFile', async () => {
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id });
+			await createChannelMuting({ userId: bob.id, channelId: channel3.id });
+
+			const mutings = await service.list({ requestUserId: alice.id }, { joinBannerFile: true });
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].id).toBe(channel1.id);
+			expect(mutings[0].user).toBeFalsy();
+			expect(mutings[0].banner).toEqual(driveFile1);
+			expect(mutings[1].id).toBe(channel2.id);
+			expect(mutings[1].user).toBeFalsy();
+			expect(mutings[1].banner).toEqual(driveFile2);
+		});
+	});
+
+	describe('findExpiredMutings', () => {
+		test('default', async () => {
+			const now = new Date();
+			const future = new Date(now);
+			const past = new Date(now);
+			future.setMinutes(now.getMinutes() + 1);
+			past.setMinutes(now.getMinutes() - 1);
+
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: future });
+			await createChannelMuting({ userId: bob.id, channelId: channel3.id, expiresAt: past });
+
+			const mutings = await service.findExpiredMutings();
+
+			expect(mutings).toHaveLength(2);
+			expect(mutings[0].channelId).toBe(channel1.id);
+			expect(mutings[1].channelId).toBe(channel3.id);
+		});
+	});
+
+	describe('isMuted', () => {
+		test('isMuted: true', async () => {
+			// キャッシュを読むのでServiceの機能を使って登録し、キャッシュを作成する
+			await service.mute({ requestUserId: alice.id, targetChannelId: channel1.id });
+			await service.mute({ requestUserId: alice.id, targetChannelId: channel2.id });
+
+			await setTimeout(500);
+
+			const result = await service.isMuted({ requestUserId: alice.id, targetChannelId: channel1.id });
+
+			expect(result).toBe(true);
+		});
+
+		test('isMuted: false', async () => {
+			await service.mute({ requestUserId: alice.id, targetChannelId: channel2.id });
+
+			await setTimeout(500);
+
+			const result = await service.isMuted({ requestUserId: alice.id, targetChannelId: channel1.id });
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('mute', () => {
+		test('default', async () => {
+			await service.mute({ requestUserId: alice.id, targetChannelId: channel1.id });
+
+			const muting = await fetchChannelMuting();
+			expect(muting).toHaveLength(1);
+			expect(muting[0].channelId).toBe(channel1.id);
+		});
+	});
+
+	describe('unmute', () => {
+		test('default', async () => {
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id });
+
+			let muting = await fetchChannelMuting();
+			expect(muting).toHaveLength(1);
+			expect(muting[0].channelId).toBe(channel1.id);
+
+			await service.unmute({ requestUserId: alice.id, targetChannelId: channel1.id });
+
+			muting = await fetchChannelMuting();
+			expect(muting).toHaveLength(0);
+		});
+	});
+
+	describe('eraseExpiredMutings', () => {
+		test('default', async () => {
+			const now = new Date();
+			const future = new Date(now);
+			const past = new Date(now);
+			future.setMinutes(now.getMinutes() + 1);
+			past.setMinutes(now.getMinutes() - 1);
+
+			await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
+			await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: future });
+			await createChannelMuting({ userId: bob.id, channelId: channel3.id, expiresAt: past });
+
+			await service.eraseExpiredMutings();
+
+			const mutings = await fetchChannelMuting();
+			expect(mutings).toHaveLength(1);
+			expect(mutings[0].channelId).toBe(channel2.id);
+		});
+	});
+});

packages/backend/test/unit/NoteCreateService.ts

@@ -61,6 +61,7 @@ describe('NoteCreateService', () => {
 			replyUserHost: null,
 			renoteUserId: null,
 			renoteUserHost: null,
+			renoteChannelId: null,
 		};
 
 		const poll: IPoll = {

packages/backend/test/unit/RoleService.ts

@@ -6,7 +6,7 @@
 process.env.NODE_ENV = 'test';
 
 import { setTimeout } from 'node:timers/promises';
-import { jest } from '@jest/globals';
+import { describe, jest } from '@jest/globals';
 import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
 import * as lolex from '@sinonjs/fake-timers';
@@ -158,16 +158,75 @@ describe('RoleService', () => {
 	afterEach(async () => {
 		clock.uninstall();
 
+		/**
+		 * Delete meta and roleAssignment first to avoid deadlock due to schema dependencies
+		 * https://github.com/misskey-dev/misskey/issues/16783
+		 */ 
+		await app.get(DI.metasRepository).createQueryBuilder().delete().execute();
+		await roleAssignmentsRepository.createQueryBuilder().delete().execute();
 		await Promise.all([
-			app.get(DI.metasRepository).createQueryBuilder().delete().execute(),
 			usersRepository.createQueryBuilder().delete().execute(),
 			rolesRepository.createQueryBuilder().delete().execute(),
-			roleAssignmentsRepository.createQueryBuilder().delete().execute(),
 		]);
 
 		await app.close();
 	});
 
+	describe('getUserAssigns', () => {
+		test('アサインされたロールを取得できる', async () => {
+			const user = await createUser();
+			const role1 = await createRole({ name: 'a' });
+			const role2 = await createRole({ name: 'b' });
+
+			await roleService.assign(user.id, role1.id);
+			await roleService.assign(user.id, role2.id);
+
+			const assigns = await roleService.getUserAssigns(user.id);
+			expect(assigns).toHaveLength(2);
+			expect(assigns.some(a => a.roleId === role1.id)).toBe(true);
+			expect(assigns.some(a => a.roleId === role2.id)).toBe(true);
+		});
+
+		test('アサインされたロールの有効/期限切れパターンを取得できる', async () => {
+			const user = await createUser();
+			const roleNoExpiry = await createRole({ name: 'no-expires' });
+			const roleNotExpired = await createRole({ name: 'not-expired' });
+			const roleExpired = await createRole({ name: 'expired' });
+
+			// expiresAtなし
+			await roleService.assign(user.id, roleNoExpiry.id);
+
+			// expiresAtあり（期限切れでない）
+			const future = new Date(Date.now() + 1000 * 60 * 60); // +1 hour
+			await roleService.assign(user.id, roleNotExpired.id, future);
+
+			// expiresAtあり（期限切れ）
+			await assignRole({ userId: user.id, roleId: roleExpired.id, expiresAt: new Date(Date.now() - 1000) });
+
+			const assigns = await roleService.getUserAssigns(user.id);
+			expect(assigns.some(a => a.roleId === roleNoExpiry.id)).toBe(true);
+			expect(assigns.some(a => a.roleId === roleNotExpired.id)).toBe(true);
+			expect(assigns.some(a => a.roleId === roleExpired.id)).toBe(false);
+		});
+	});
+
+	describe('getUserRoles', () => {
+		test('アサインされたロールとコンディショナルロールの両方が取得できる', async () => {
+			const user = await createUser();
+			const manualRole = await createRole({ name: 'manual role' });
+			const conditionalRole = await createConditionalRole({
+				id: aidx(),
+				type: 'isBot',
+			});
+			await roleService.assign(user.id, manualRole.id);
+			await roleService.assign(user.id, conditionalRole.id);
+
+			const roles = await roleService.getUserRoles(user.id);
+			expect(roles.some(r => r.id === manualRole.id)).toBe(true);
+			expect(roles.some(r => r.id === conditionalRole.id)).toBe(true);
+		});
+	});
+
 	describe('getUserPolicies', () => {
 		test('instance default policies', async () => {
 			const user = await createUser();
@@ -280,6 +339,112 @@ describe('RoleService', () => {
 			const resultAfter25hAgain = await roleService.getUserPolicies(user.id);
 			expect(resultAfter25hAgain.canManageCustomEmojis).toBe(true);
 		});
+
+		test('role with no policy set', async () => {
+			const user = await createUser();
+			const roleWithPolicy = await createRole({
+				name: 'roleWithPolicy',
+				policies: {
+					pinLimit: {
+						useDefault: false,
+						priority: 0,
+						value: 10,
+					},
+				},
+			});
+			const roleWithoutPolicy = await createRole({
+				name: 'roleWithoutPolicy',
+				policies: {}, // ポリシーが空
+			});
+			await roleService.assign(user.id, roleWithPolicy.id);
+			await roleService.assign(user.id, roleWithoutPolicy.id);
+			meta.policies = {
+				pinLimit: 5,
+			};
+
+			const result = await roleService.getUserPolicies(user.id);
+
+			// roleWithoutPolicy は default 値 (5) を使い、roleWithPolicy の 10 と比較して大きい方が採用される
+			expect(result.pinLimit).toBe(10);
+		});
+	});
+
+	describe('getUserBadgeRoles', () => {
+		test('手動アサイン済みのバッジロールのみが返る', async () => {
+			const user = await createUser();
+			const badgeRole = await createRole({ name: 'badge', asBadge: true });
+			const normalRole = await createRole({ name: 'normal', asBadge: false });
+
+			await roleService.assign(user.id, badgeRole.id);
+			await roleService.assign(user.id, normalRole.id);
+
+			const roles = await roleService.getUserBadgeRoles(user.id);
+			expect(roles.some(r => r.id === badgeRole.id)).toBe(true);
+			expect(roles.some(r => r.id === normalRole.id)).toBe(false);
+		});
+
+		test('コンディショナルなバッジロールが条件一致で返る', async () => {
+			const user = await createUser({ isBot: true });
+			const condBadgeRole = await createConditionalRole({
+				id: aidx(),
+				type: 'isBot',
+			}, { asBadge: true, name: 'cond-badge' });
+			const condNonBadgeRole = await createConditionalRole({
+				id: aidx(),
+				type: 'isBot',
+			}, { asBadge: false, name: 'cond-non-badge' });
+
+			const roles = await roleService.getUserBadgeRoles(user.id);
+			expect(roles.some(r => r.id === condBadgeRole.id)).toBe(true);
+			expect(roles.some(r => r.id === condNonBadgeRole.id)).toBe(false);
+		});
+
+		test('roleAssignedTo 条件のバッジロール: アサイン有無で変化する', async () => {
+			const [user1, user2] = await Promise.all([createUser(), createUser()]);
+			const manualRole = await createRole({ name: 'manual' });
+			const condBadgeRole = await createConditionalRole({
+				id: aidx(),
+				type: 'roleAssignedTo',
+				roleId: manualRole.id,
+			}, { asBadge: true, name: 'assigned-badge' });
+
+			await roleService.assign(user2.id, manualRole.id);
+
+			const [roles1, roles2] = await Promise.all([
+				roleService.getUserBadgeRoles(user1.id),
+				roleService.getUserBadgeRoles(user2.id),
+			]);
+			expect(roles1.some(r => r.id === condBadgeRole.id)).toBe(false);
+			expect(roles2.some(r => r.id === condBadgeRole.id)).toBe(true);
+		});
+
+		test('期限切れのバッジロールは除外される', async () => {
+			const user = await createUser();
+			const roleNoExpiry = await createRole({ name: 'no-exp', asBadge: true });
+			const roleNotExpired = await createRole({ name: 'not-expired', asBadge: true });
+			const roleExpired = await createRole({ name: 'expired', asBadge: true });
+
+			// expiresAt なし
+			await roleService.assign(user.id, roleNoExpiry.id);
+
+			// expiresAt あり（期限切れでない）
+			const future = new Date(Date.now() + 1000 * 60 * 60); // +1 hour
+			await roleService.assign(user.id, roleNotExpired.id, future);
+
+			// expiresAt あり（期限切れ）
+			await assignRole({ userId: user.id, roleId: roleExpired.id, expiresAt: new Date(Date.now() - 1000) });
+
+			const rolesBefore = await roleService.getUserBadgeRoles(user.id);
+			expect(rolesBefore.some(r => r.id === roleNoExpiry.id)).toBe(true);
+			expect(rolesBefore.some(r => r.id === roleNotExpired.id)).toBe(true);
+			expect(rolesBefore.some(r => r.id === roleExpired.id)).toBe(false);
+
+			// 時間経過で roleNotExpired を失効させる
+			clock.tick('02:00:00');
+			const rolesAfter = await roleService.getUserBadgeRoles(user.id);
+			expect(rolesAfter.some(r => r.id === roleNoExpiry.id)).toBe(true);
+			expect(rolesAfter.some(r => r.id === roleNotExpired.id)).toBe(false);
+		});
 	});
 
 	describe('getModeratorIds', () => {
@@ -413,9 +578,9 @@ describe('RoleService', () => {
 			expect(result).toEqual([modeUser1.id, modeUser2.id, rootUser.id]);
 		});
 
-		test('root has moderator role', async () => {
+		test('includeAdmins = false, includeRoot = true, excludeExpire = true', async () => {
-			const [adminUser1, modeUser1, normalUser1, rootUser] = await Promise.all([
+			const [adminUser1, adminUser2, modeUser1, modeUser2, normalUser1, normalUser2, rootUser] = await Promise.all([
-				createUser(), createUser(), createUser(), createRoot(),
+				createUser(), createUser(), createUser(), createUser(), createUser(), createUser(), createRoot(),
 			]);
 
 			const role1 = await createRole({ name: 'admin', isAdministrator: true });
@@ -424,9 +589,11 @@ describe('RoleService', () => {
 
 			await Promise.all([
 				assignRole({ userId: adminUser1.id, roleId: role1.id }),
+				assignRole({ userId: adminUser2.id, roleId: role1.id, expiresAt: new Date(Date.now() - 1000) }),
 				assignRole({ userId: modeUser1.id, roleId: role2.id }),
-				assignRole({ userId: rootUser.id, roleId: role2.id }),
+				assignRole({ userId: modeUser2.id, roleId: role2.id, expiresAt: new Date(Date.now() - 1000) }),
 				assignRole({ userId: normalUser1.id, roleId: role3.id }),
+				assignRole({ userId: normalUser2.id, roleId: role3.id, expiresAt: new Date(Date.now() - 1000) }),
 			]);
 
 			const result = await roleService.getModeratorIds({
@@ -434,12 +601,12 @@ describe('RoleService', () => {
 				includeRoot: true,
 				excludeExpire: false,
 			});
-			expect(result).toEqual([modeUser1.id, rootUser.id]);
+			expect(result).toEqual([modeUser1.id, modeUser2.id, rootUser.id]);
 		});
 
-		test('root has administrator role', async () => {
+		test('includeAdmins = true, includeRoot = true, excludeExpire = false', async () => {
-			const [adminUser1, modeUser1, normalUser1, rootUser] = await Promise.all([
+			const [adminUser1, adminUser2, modeUser1, modeUser2, normalUser1, normalUser2, rootUser] = await Promise.all([
-				createUser(), createUser(), createUser(), createRoot(),
+				createUser(), createUser(), createUser(), createUser(), createUser(), createUser(), createRoot(),
 			]);
 
 			const role1 = await createRole({ name: 'admin', isAdministrator: true });
@@ -448,9 +615,11 @@ describe('RoleService', () => {
 
 			await Promise.all([
 				assignRole({ userId: adminUser1.id, roleId: role1.id }),
-				assignRole({ userId: rootUser.id, roleId: role1.id }),
+				assignRole({ userId: adminUser2.id, roleId: role1.id, expiresAt: new Date(Date.now() - 1000) }),
 				assignRole({ userId: modeUser1.id, roleId: role2.id }),
+				assignRole({ userId: modeUser2.id, roleId: role2.id, expiresAt: new Date(Date.now() - 1000) }),
 				assignRole({ userId: normalUser1.id, roleId: role3.id }),
+				assignRole({ userId: normalUser2.id, roleId: role3.id, expiresAt: new Date(Date.now() - 1000) }),
 			]);
 
 			const result = await roleService.getModeratorIds({
@@ -458,12 +627,12 @@ describe('RoleService', () => {
 				includeRoot: true,
 				excludeExpire: false,
 			});
-			expect(result).toEqual([adminUser1.id, modeUser1.id, rootUser.id]);
+			expect(result).toEqual([adminUser1.id, adminUser2.id, modeUser1.id, modeUser2.id, rootUser.id]);
 		});
 
-		test('root has moderator role(expire)', async () => {
+		test('includeAdmins = true, includeRoot = true, excludeExpire = true', async () => {
-			const [adminUser1, modeUser1, normalUser1, rootUser] = await Promise.all([
+			const [adminUser1, adminUser2, modeUser1, modeUser2, normalUser1, normalUser2, rootUser] = await Promise.all([
-				createUser(), createUser(), createUser(), createRoot(),
+				createUser(), createUser(), createUser(), createUser(), createUser(), createUser(), createRoot(),
 			]);
 
 			const role1 = await createRole({ name: 'admin', isAdministrator: true });
@@ -472,17 +641,71 @@ describe('RoleService', () => {
 
 			await Promise.all([
 				assignRole({ userId: adminUser1.id, roleId: role1.id }),
-				assignRole({ userId: modeUser1.id, roleId: role2.id, expiresAt: new Date(Date.now() - 1000) }),
+				assignRole({ userId: adminUser2.id, roleId: role1.id, expiresAt: new Date(Date.now() - 1000) }),
-				assignRole({ userId: rootUser.id, roleId: role2.id, expiresAt: new Date(Date.now() - 1000) }),
+				assignRole({ userId: modeUser1.id, roleId: role2.id }),
+				assignRole({ userId: modeUser2.id, roleId: role2.id, expiresAt: new Date(Date.now() - 1000) }),
 				assignRole({ userId: normalUser1.id, roleId: role3.id }),
+				assignRole({ userId: normalUser2.id, roleId: role3.id, expiresAt: new Date(Date.now() - 1000) }),
 			]);
 
 			const result = await roleService.getModeratorIds({
-				includeAdmins: false,
+				includeAdmins: true,
 				includeRoot: true,
 				excludeExpire: true,
 			});
-			expect(result).toEqual([rootUser.id]);
+			expect(result).toEqual([adminUser1.id, modeUser1.id, rootUser.id]);
+		});
+	});
+
+	describe('getAdministratorIds', () => {
+		test('should return only user IDs with administrator roles', async () => {
+			const adminUser1 = await createUser();
+			const adminUser2 = await createUser();
+			const normalUser = await createUser();
+			const moderatorUser = await createUser();
+
+			const adminRole = await createRole({ name: 'admin', isAdministrator: true, isModerator: false });
+			const moderatorRole = await createRole({ name: 'moderator', isModerator: true, isAdministrator: false });
+			const normalRole = await createRole({ name: 'normal', isAdministrator: false, isModerator: false });
+
+			await roleService.assign(adminUser1.id, adminRole.id);
+			await roleService.assign(adminUser2.id, adminRole.id);
+			await roleService.assign(moderatorUser.id, moderatorRole.id);
+			await roleService.assign(normalUser.id, normalRole.id);
+
+			const adminIds = await roleService.getAdministratorIds();
+
+			// sort for deterministic order
+			adminIds.sort();
+			const expectedIds = [adminUser1.id, adminUser2.id].sort();
+
+			expect(adminIds).toEqual(expectedIds);
+		});
+
+		test('should return an empty array if no users have administrator roles', async () => {
+			const normalUser = await createUser();
+			const normalRole = await createRole({ name: 'normal', isAdministrator: false });
+			await roleService.assign(normalUser.id, normalRole.id);
+
+			const adminIds = await roleService.getAdministratorIds();
+
+			expect(adminIds).toHaveLength(0);
+		});
+
+		test('should return an empty array if there are no administrator roles defined', async () => {
+			await createUser(); // create user to ensure not empty db
+			const adminIds = await roleService.getAdministratorIds();
+			expect(adminIds).toHaveLength(0);
+		});
+
+		// TODO: rootユーザーは現在実装に含まれていないため、テストもそれに倣う
+		test('should not include the root user', async () => {
+			const rootUser = await createUser();
+			meta.rootUserId = rootUser.id;
+
+			const adminIds = await roleService.getAdministratorIds();
+
+			expect(adminIds).not.toContain(rootUser.id);
 		});
 	});
 

packages/backend/test/unit/misc/is-renote.ts

@@ -44,6 +44,7 @@ const base: MiNote = {
 	replyUserHost: null,
 	renoteUserId: null,
 	renoteUserHost: null,
+	renoteChannelId: null,
 };
 
 describe('misc:is-renote', () => {

packages/backend/test/utils.ts

@@ -316,8 +316,12 @@ export const uploadFile = async (user?: UserToken, { path, name, blob }: UploadO
 			: new URL(path, new URL('resources/', import.meta.url));
 
 	const formData = new FormData();
-	formData.append('file', blob ??
+	formData.append(
-		new File([new Uint8Array(await readFile(absPath))], basename(absPath.toString())));
+		'file',
+		blob ?? new Blob([new Uint8Array(await readFile(absPath))]),
+		basename(absPath.toString()),
+	);
+
 	formData.append('force', 'true');
 	if (name) {
 		formData.append('name', name);

packages/frontend-builder/package.json

@@ -11,15 +11,15 @@
 	},
 	"devDependencies": {
 		"@types/estree": "1.0.8",
-		"@types/node": "22.18.10",
+		"@types/node": "24.9.2",
-		"@typescript-eslint/eslint-plugin": "8.46.1",
+		"@typescript-eslint/eslint-plugin": "8.46.2",
-		"@typescript-eslint/parser": "8.46.1",
+		"@typescript-eslint/parser": "8.46.2",
-		"rollup": "4.52.4",
+		"rollup": "4.52.5",
 		"typescript": "5.9.3"
 	},
 	"dependencies": {
 		"estree-walker": "3.0.3",
-		"magic-string": "0.30.19",
+		"magic-string": "0.30.21",
-		"vite": "7.1.9"
+		"vite": "7.1.11"
 	}
 }

packages/frontend-embed/package.json

@@ -12,7 +12,7 @@
 	"dependencies": {
 		"@discordapp/twemoji": "16.0.1",
 		"@rollup/plugin-json": "6.1.0",
-		"@rollup/plugin-replace": "6.0.2",
+		"@rollup/plugin-replace": "6.0.3",
 		"@rollup/pluginutils": "5.3.0",
 		"@twemoji/parser": "16.0.0",
 		"@vitejs/plugin-vue": "6.0.1",
@@ -26,47 +26,47 @@
 		"mfm-js": "0.25.0",
 		"misskey-js": "workspace:*",
 		"punycode.js": "2.3.1",
-		"rollup": "4.52.4",
+		"rollup": "4.52.5",
-		"sass": "1.93.2",
+		"sass": "1.93.3",
-		"shiki": "3.13.0",
+		"shiki": "3.14.0",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.16",
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.9.3",
 		"uuid": "13.0.0",
-		"vite": "7.1.9",
+		"vite": "7.1.11",
 		"vue": "3.5.22"
 	},
 	"devDependencies": {
-		"@misskey-dev/summaly": "5.2.4",
+		"@misskey-dev/summaly": "5.2.5",
 		"@tabler/icons-webfont": "3.35.0",
 		"@testing-library/vue": "8.1.0",
 		"@types/estree": "1.0.8",
-		"@types/micromatch": "4.0.9",
+		"@types/micromatch": "4.0.10",
-		"@types/node": "22.18.10",
+		"@types/node": "24.9.2",
 		"@types/punycode.js": "npm:@types/punycode@2.1.4",
 		"@types/tinycolor2": "1.4.6",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.46.1",
+		"@typescript-eslint/eslint-plugin": "8.46.2",
-		"@typescript-eslint/parser": "8.46.1",
+		"@typescript-eslint/parser": "8.46.2",
 		"@vitest/coverage-v8": "3.2.4",
 		"@vue/runtime-core": "3.5.22",
 		"acorn": "8.15.0",
 		"cross-env": "10.1.0",
 		"eslint-plugin-import": "2.32.0",
-		"eslint-plugin-vue": "10.5.0",
+		"eslint-plugin-vue": "10.5.1",
 		"fast-glob": "3.3.3",
-		"happy-dom": "20.0.7",
+		"happy-dom": "20.0.10",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
-		"msw": "2.11.5",
+		"msw": "2.11.6",
 		"nodemon": "3.1.10",
 		"prettier": "3.6.2",
 		"start-server-and-test": "2.1.2",
 		"tsx": "4.20.6",
 		"vite-plugin-turbosnap": "1.0.3",
-		"vue-component-type-helpers": "3.1.1",
+		"vue-component-type-helpers": "3.1.2",
 		"vue-eslint-parser": "10.2.0",
-		"vue-tsc": "3.1.1"
+		"vue-tsc": "3.1.2"
 	}
 }

packages/frontend-embed/src/workers/draw-blurhash.ts

@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+/// <reference lib="esnext" />
+/// <reference lib="webworker" />
+
 import { render } from 'buraha';
 
 const canvas = new OffscreenCanvas(64, 64);
@@ -18,5 +21,5 @@ onmessage = (event) => {
 
 	render(event.data.hash, canvas);
 	const bitmap = canvas.transferToImageBitmap();
-	postMessage({ id: event.data.id, bitmap }, [bitmap]);
+	self.postMessage({ id: event.data.id, bitmap }, [bitmap]);
 };