Merge pull request #749 from update-host

locales/ca-ES.yml

@@ -2003,8 +2003,8 @@ _permissions:
   "read:admin:show-user": "Veure informació privada de l'usuari "
   "read:admin:show-users": "Veure informació privada de l'usuari "
   "write:admin:suspend-user": "Suspendre usuari"
-  "write:admin:unset-user-avatar": "Esborrar avatar d'usuari "
-  "write:admin:unset-user-banner": "Esborrar bàner de l'usuari "
+  "write:admin:user-avatar": "Esborrar avatar d'usuari "
+  "write:admin:user-banner": "Esborrar bàner de l'usuari "
   "write:admin:unsuspend-user": "Treure la suspensió d'un usuari"
   "write:admin:meta": "Gestionar les metadades de la instància"
   "write:admin:user-note": "Gestionar les notes de moderació "

locales/en-US.yml

@@ -693,6 +693,7 @@ useGlobalSetting: "Use global settings"
 useGlobalSettingDesc: "If turned on, your account's notification settings will be used. If turned off, individual configurations can be made."
 other: "Other"
 regenerateLoginToken: "Regenerate login token"
+regenerateLoginTokenConfirm: "Are you sure you want to regenerate the login token? All devices will be logged out."
 regenerateLoginTokenDescription: "Regenerates the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
 theKeywordWhenSearchingForCustomEmoji: "This is the keyword when searching for custom emojis."
 setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
@@ -1060,7 +1061,7 @@ likeOnlyForRemote: "All (Only likes for remote instances)"
 nonSensitiveOnly: "Non-sensitive only"
 nonSensitiveOnlyForLocalLikeOnlyForRemote: "Non-sensitive only (Only likes from remote)"
 rolesAssignedToMe: "Roles assigned to me"
-resetPasswordConfirm: "Really reset your password?"
+resetPasswordConfirm: "Are you sure you want to reset password?"
 sensitiveWords: "Sensitive words"
 sensitiveWordsDescription: "The visibility of all notes containing any of the configured words will be set to \"Home\" automatically. You can list multiple by separating them via line breaks."
 sensitiveWordsDescription2: "Using spaces will create AND expressions and surrounding keywords with slashes will turn them into a regular expression."
@@ -1268,6 +1269,7 @@ inquiry: "Contact"
 here: "here"
 mutualLink: "Mutual Link"
 saveThisFile: "Save this file to Drive"
+changeUserName: "Change name"
 _bubbleGame:
   howToPlay: "How to play"
   hold: "Hold"
@@ -2111,18 +2113,20 @@ _permissions:
   "read:admin:user-ips": "View user IP addresses"
   "read:admin:meta": "View instance metadata"
   "write:admin:reset-password": "Reset user password"
+  "write:admin:regenerate-user-token": "Regenerate user login token"
   "write:admin:resolve-abuse-user-report": "Resolve user report"
   "write:admin:send-email": "Send email"
   "read:admin:server-info": "View server info"
   "read:admin:show-moderation-log": "View moderation log"
   "read:admin:show-user": "View private user info"
   "read:admin:show-users": "View private user info"
   "write:admin:suspend-user": "Suspend user"
-  "write:admin:unset-user-avatar": "Remove user avatar"
-  "write:admin:unset-user-banner": "Remove user banner"
-  "write:admin:unset-user-mutual-link": "Remove user mutual link"
+  "write:admin:user-avatar": "Remove user avatar"
+  "write:admin:user-banner": "Remove user banner"
+  "write:admin:user-mutual-link": "Remove user mutual link"
   "write:admin:unsuspend-user": "Unsuspend user"
   "write:admin:meta": "Manage instance metadata"
+  "write:admin:user-name": "Change user name"
   "write:admin:user-note": "Manage moderation note"
   "write:admin:roles": "Manage roles"
   "read:admin:roles": "View roles"

locales/es-ES.yml

@@ -2031,8 +2031,8 @@ _permissions:
   "read:admin:show-user": "Ver información privada de usuario"
   "read:admin:show-users": "Ver información privada de usuario"
   "write:admin:suspend-user": "Suspender cuentas de usuario"
-  "write:admin:unset-user-avatar": "Quitar avatares de usuario"
-  "write:admin:unset-user-banner": "Quitar banner de usuarios"
+  "write:admin:user-avatar": "Quitar avatares de usuario"
+  "write:admin:user-banner": "Quitar banner de usuarios"
   "write:admin:unsuspend-user": "Quitar suspensión de cuentas de usuario"
   "write:admin:meta": "Edición de metadatos de la instancia"
   "write:admin:user-note": "Moderación de notas"

locales/id-ID.yml

@@ -2034,8 +2034,8 @@ _permissions:
   "read:admin:show-user": "Lihat informasi pengguna privat"
   "read:admin:show-users": "Lihat informasi pengguna privat"
   "write:admin:suspend-user": "Tangguhkan pengguna"
-  "write:admin:unset-user-avatar": "Hapus avatar pengguna"
-  "write:admin:unset-user-banner": "Hapus banner pengguna"
+  "write:admin:user-avatar": "Hapus avatar pengguna"
+  "write:admin:user-banner": "Hapus banner pengguna"
   "write:admin:unsuspend-user": "Batalkan penangguhan pengguna"
   "write:admin:meta": "Kelola metadata instansi"
   "write:admin:user-note": "Kelola moderasi catatan"

locales/index.d.ts

@@ -2796,6 +2796,10 @@ export interface Locale extends ILocale {
      * ログイントークンを再生成
      */
     "regenerateLoginToken": string;
+    /**
+     * ログイントークンを再生成しますか？
+     */
+    "regenerateLoginTokenConfirm": string;
     /**
      * ログインに使用される内部トークンを再生成します。通常この操作を行う必要はありません。再生成すると、全てのデバイスでログアウトされます。
      */
@@ -4268,7 +4272,7 @@ export interface Locale extends ILocale {
      */
     "rolesAssignedToMe": string;
     /**
-     * パスワードリセットしますか？
+     * パスワードをリセットしますか？
      */
     "resetPasswordConfirm": string;
     /**
@@ -5130,6 +5134,10 @@ export interface Locale extends ILocale {
      * このファイルをドライブに保存する
      */
     "saveThisFile": string;
+    /**
+     * 名前を変更
+     */
+    "changeUserName": string;
     "_bubbleGame": {
         /**
          * 遊び方
@@ -8235,6 +8243,10 @@ export interface Locale extends ILocale {
          * ユーザーのパスワードをリセットする
          */
         "write:admin:reset-password": string;
+        /**
+         * ユーザーのログイントークンを再生成する
+         */
+        "write:admin:regenerate-user-token": string;
         /**
          * ユーザーからの通報を解決する
          */
@@ -8266,15 +8278,15 @@ export interface Locale extends ILocale {
         /**
          * ユーザーのアバターを削除する
          */
-        "write:admin:unset-user-avatar": string;
+        "write:admin:user-avatar": string;
         /**
          * ユーザーのバーナーを削除する
          */
-        "write:admin:unset-user-banner": string;
+        "write:admin:user-banner": string;
         /**
          * ユーザーの相互リンクを削除する
          */
-        "write:admin:unset-user-mutual-link": string;
+        "write:admin:user-mutual-link": string;
         /**
          * ユーザーの凍結を解除する
          */
@@ -8283,6 +8295,10 @@ export interface Locale extends ILocale {
          * インスタンスのメタデータを操作する
          */
         "write:admin:meta": string;
+        /**
+         * ユーザーの名前を変更する
+         */
+        "write:admin:user-name": string;
         /**
          * モデレーションノートを操作する
          */

locales/it-IT.yml

@@ -2027,8 +2027,8 @@ _permissions:
   "read:admin:show-user": "Vedere le informazioni private degli account utente"
   "read:admin:show-users": "Vedere le informazioni private degli account utente"
   "write:admin:suspend-user": "Sospendere i profili"
-  "write:admin:unset-user-avatar": "Rimuovere la foto profilo dai profili"
-  "write:admin:unset-user-banner": "Rimuovere l'immagine testata dai profili"
+  "write:admin:user-avatar": "Rimuovere la foto profilo dai profili"
+  "write:admin:user-banner": "Rimuovere l'immagine testata dai profili"
   "write:admin:unsuspend-user": "Togliere la sospensione ai profili"
   "write:admin:meta": "Modificare i metadati dell'istanza"
   "write:admin:user-note": "Scrivere annotazioni di moderazione"

locales/ja-JP.yml

@@ -695,6 +695,7 @@ useGlobalSetting: "グローバル設定を使う"
 useGlobalSettingDesc: "オンにすると、アカウントの通知設定が使用されます。オフにすると、個別に設定できるようになります。"
 other: "その他"
 regenerateLoginToken: "ログイントークンを再生成"
+regenerateLoginTokenConfirm: "ログイントークンを再生成しますか？"
 regenerateLoginTokenDescription: "ログインに使用される内部トークンを再生成します。通常この操作を行う必要はありません。再生成すると、全てのデバイスでログアウトされます。"
 theKeywordWhenSearchingForCustomEmoji: "カスタム絵文字を検索する時のキーワードになります。"
 setMultipleBySeparatingWithSpace: "スペースで区切って複数設定できます。"
@@ -1062,7 +1063,7 @@ likeOnlyForRemote: "全て (リモートはいいねのみ)"
 nonSensitiveOnly: "非センシティブのみ"
 nonSensitiveOnlyForLocalLikeOnlyForRemote: "非センシティブのみ (リモートはいいねのみ)"
 rolesAssignedToMe: "自分に割り当てられたロール"
-resetPasswordConfirm: "パスワードリセットしますか？"
+resetPasswordConfirm: "パスワードをリセットしますか？"
 sensitiveWords: "センシティブワード"
 sensitiveWordsDescription: "設定したワードが含まれるノートの公開範囲をホームにします。改行で区切って複数設定できます。"
 sensitiveWordsDescription2: "スペースで区切るとAND指定になり、キーワードをスラッシュで囲むと正規表現になります。"
@@ -1277,6 +1278,7 @@ muteThisUser: "このユーザーをミュートする"
 here: "こちら"
 mutualLink: "相互リンク"
 saveThisFile: "このファイルをドライブに保存する"
+changeUserName: "名前を変更"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -2157,18 +2159,20 @@ _permissions:
   "read:admin:user-ips": "ユーザーのIPアドレスを見る"
   "read:admin:meta": "インスタンスのメタデータを見る"
   "write:admin:reset-password": "ユーザーのパスワードをリセットする"
+  "write:admin:regenerate-user-token": "ユーザーのログイントークンを再生成する"
   "write:admin:resolve-abuse-user-report": "ユーザーからの通報を解決する"
   "write:admin:send-email": "メールを送る"
   "read:admin:server-info": "サーバーの情報を見る"
   "read:admin:show-moderation-log": "モデレーションログを見る"
   "read:admin:show-user": "ユーザーのプライベートな情報を見る"
   "read:admin:show-users": "ユーザーのプライベートな情報を見る"
   "write:admin:suspend-user": "ユーザーを凍結する"
-  "write:admin:unset-user-avatar": "ユーザーのアバターを削除する"
-  "write:admin:unset-user-banner": "ユーザーのバーナーを削除する"
-  "write:admin:unset-user-mutual-link": "ユーザーの相互リンクを削除する"
+  "write:admin:user-avatar": "ユーザーのアバターを削除する"
+  "write:admin:user-banner": "ユーザーのバーナーを削除する"
+  "write:admin:user-mutual-link": "ユーザーの相互リンクを削除する"
   "write:admin:unsuspend-user": "ユーザーの凍結を解除する"
   "write:admin:meta": "インスタンスのメタデータを操作する"
+  "write:admin:user-name": "ユーザーの名前を変更する"
   "write:admin:user-note": "モデレーションノートを操作する"
   "write:admin:roles": "ロールを操作する"
   "read:admin:roles": "ロールを見る"

locales/ja-KS.yml

@@ -2034,8 +2034,8 @@ _permissions:
   "read:admin:show-user": "ユーザーのプライベートな情報見る"
   "read:admin:show-users": "ユーザーのプライベートな情報見る"
   "write:admin:suspend-user": "ユーザーを凍結"
-  "write:admin:unset-user-avatar": "ユーザーのアバターを削除"
-  "write:admin:unset-user-banner": "ユーザーのバナーを削除"
+  "write:admin:user-avatar": "ユーザーのアバターを削除"
+  "write:admin:user-banner": "ユーザーのバナーを削除"
   "write:admin:unsuspend-user": "ユーザーの凍結解除"
   "write:admin:meta": "インスタンスのメタデータいじる"
   "write:admin:user-note": "モデレーションノートいじる"

locales/ko-KR.yml

@@ -692,6 +692,7 @@ useGlobalSetting: "글로벌 설정을 사용하기"
 useGlobalSettingDesc: "활성화하면 계정의 알림 설정이 적용됩니다. 비활성화하면 개별적으로 설정할 수 있게 됩니다."
 other: "기타"
 regenerateLoginToken: "로그인 토큰을 재생성"
+regenerateLoginTokenConfirm: "정말 로그인 토큰을 재생성하시겠습니까? 이 작업을 실행하면 이 계정으로 로그인한 모든 기기에서 로그아웃됩니다."
 regenerateLoginTokenDescription: "로그인할 때 사용되는 내부 토큰을 재생성합니다. 일반적으로 이 작업을 실행할 필요는 없습니다. 이 기능을 사용하면 이 계정으로 로그인한 모든 기기에서 로그아웃됩니다."
 theKeywordWhenSearchingForCustomEmoji: "맞춤 이모티콘을 검색할 때 키워드가 됩니다."
 setMultipleBySeparatingWithSpace: "공백으로 구분하여 여러 개 설정할 수 있습니다."
@@ -1261,6 +1262,7 @@ useNativeUIForVideoAudioPlayer: "브라우저 UI에서 미디어 재생"
 here: "여기"
 mutualLink: "서로링크"
 saveThisFile: "이 파일을 드라이브에 저장"
+changeUserName: "이름 변경"
 _bubbleGame:
   howToPlay: "설명"
   hold: "홀드"
@@ -2102,9 +2104,9 @@ _permissions:
   "read:admin:show-user": "사용자 개인정보 보기"
   "read:admin:show-users": "사용자 개인정보 보기"
   "write:admin:suspend-user": "사용자 정지하기"
-  "write:admin:unset-user-avatar": "사용자 아바타 삭제하기"
-  "write:admin:unset-user-banner": "사용자 배너 삭제하기"
-  "write:admin:unset-user-mutual-link": "사용자의 서로링크 삭제하기"
+  "write:admin:user-avatar": "사용자 아바타 삭제하기"
+  "write:admin:user-banner": "사용자 배너 삭제하기"
+  "write:admin:user-mutual-link": "사용자의 서로링크 삭제하기"
   "write:admin:unsuspend-user": "사용자 정지 해제하기"
   "write:admin:meta": "인스턴스 메타데이터 수정하기"
   "write:admin:user-note": "조정 기록 수정하기"

locales/th-TH.yml

@@ -2034,8 +2034,8 @@ _permissions:
   "read:admin:show-user": "ดูข้อมูลส่วนตัวของผู้ใช้"
   "read:admin:show-users": "ดูข้อมูลส่วนตัวของผู้ใช้"
   "write:admin:suspend-user": "ระงับผู้ใช้"
-  "write:admin:unset-user-avatar": "ลบอวตารผู้ใช้"
-  "write:admin:unset-user-banner": "ลบแบนเนอร์ผู้ใช้"
+  "write:admin:user-avatar": "ลบอวตารผู้ใช้"
+  "write:admin:user-banner": "ลบแบนเนอร์ผู้ใช้"
   "write:admin:unsuspend-user": "ยกเลิกการระงับผู้ใช้"
   "write:admin:meta": "จัดการข้อมูลเมตาของอินสแตนซ์"
   "write:admin:user-note": "จัดการโน้ตการกลั่นกรอง"

locales/zh-CN.yml

@@ -2052,8 +2052,8 @@ _permissions:
   "read:admin:show-user": "查看用户的非公开信息"
   "read:admin:show-users": "查看用户的非公开信息"
   "write:admin:suspend-user": "冻结用户"
-  "write:admin:unset-user-avatar": "删除用户头像"
-  "write:admin:unset-user-banner": "删除用户横幅"
+  "write:admin:user-avatar": "删除用户头像"
+  "write:admin:user-banner": "删除用户横幅"
   "write:admin:unsuspend-user": "解除用户冻结"
   "write:admin:meta": "编辑实例元数据"
   "write:admin:user-note": "编辑管理笔记"

locales/zh-TW.yml

@@ -2034,8 +2034,8 @@ _permissions:
   "read:admin:show-user": "查看使用者的私密資訊"
   "read:admin:show-users": "查看使用者的私密資訊"
   "write:admin:suspend-user": "凍結使用者"
-  "write:admin:unset-user-avatar": "刪除使用者的頭像"
-  "write:admin:unset-user-banner": "刪除使用者的橫幅"
+  "write:admin:user-avatar": "刪除使用者的頭像"
+  "write:admin:user-banner": "刪除使用者的橫幅"
   "write:admin:unsuspend-user": "解除凍結使用者"
   "write:admin:meta": "編輯實例的詮釋資料"
   "write:admin:user-note": "編輯審查筆記"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-host.2g",
+	"version": "2024.5.0-host.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/config.ts

@@ -50,7 +50,7 @@ type Source = {
 	redisForJobQueue?: RedisOptionsSource;
 	redisForSystemQueue?: RedisOptionsSource;
 	redisForEndedPollNotificationQueue?: RedisOptionsSource;
-	redisForDeliverQueue?: RedisOptionsSource;
+	redisForDeliverQueues?: Array<RedisOptionsSource>;
 	redisForInboxQueue?: RedisOptionsSource;
 	redisForDbQueue?: RedisOptionsSource;
 	redisForRelationshipQueue?: RedisOptionsSource;
@@ -250,7 +250,7 @@ export type Config = {
 	redisForPubsub: RedisOptions & RedisOptionsSource;
 	redisForSystemQueue: RedisOptions & RedisOptionsSource;
 	redisForEndedPollNotificationQueue: RedisOptions & RedisOptionsSource;
-	redisForDeliverQueue: RedisOptions & RedisOptionsSource;
+	redisForDeliverQueues: Array<RedisOptions & RedisOptionsSource>;
 	redisForInboxQueue: RedisOptions & RedisOptionsSource;
 	redisForDbQueue: RedisOptions & RedisOptionsSource;
 	redisForRelationshipQueue: RedisOptions & RedisOptionsSource;
@@ -327,7 +327,7 @@ export function loadConfig(): Config {
 		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
 		redisForSystemQueue: config.redisForSystemQueue ? convertRedisOptions(config.redisForSystemQueue, host) : redisForJobQueue,
 		redisForEndedPollNotificationQueue: config.redisForEndedPollNotificationQueue ? convertRedisOptions(config.redisForEndedPollNotificationQueue, host) : redisForJobQueue,
-		redisForDeliverQueue: config.redisForDeliverQueue ? convertRedisOptions(config.redisForDeliverQueue, host) : redisForJobQueue,
+		redisForDeliverQueues: config.redisForDeliverQueues ? config.redisForDeliverQueues.map(config => convertRedisOptions(config, host)) : [redisForJobQueue],
 		redisForInboxQueue: config.redisForInboxQueue ? convertRedisOptions(config.redisForInboxQueue, host) : redisForJobQueue,
 		redisForDbQueue: config.redisForDbQueue ? convertRedisOptions(config.redisForDbQueue, host) : redisForJobQueue,
 		redisForRelationshipQueue: config.redisForRelationshipQueue ? convertRedisOptions(config.redisForRelationshipQueue, host) : redisForJobQueue,

packages/backend/src/core/QueueModule.ts

@@ -9,12 +9,13 @@ import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { QUEUE, baseQueueOptions } from '@/queue/const.js';
 import { allSettled } from '@/misc/promise-tracker.js';
+import { Queues } from '@/misc/queues.js';
 import type { Provider } from '@nestjs/common';
 import type { DeliverJobData, InboxJobData, EndedPollNotificationJobData, WebhookDeliverJobData, RelationshipJobData } from '../queue/types.js';
 
 export type SystemQueue = Bull.Queue<Record<string, unknown>>;
 export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
-export type DeliverQueue = Bull.Queue<DeliverJobData>;
+export type DeliverQueue = Queues<DeliverJobData>;
 export type InboxQueue = Bull.Queue<InboxJobData>;
 export type DbQueue = Bull.Queue;
 export type RelationshipQueue = Bull.Queue<RelationshipJobData>;
@@ -35,7 +36,7 @@ const $endedPollNotification: Provider = {
 
 const $deliver: Provider = {
 	provide: 'queue:deliver',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config.redisForDeliverQueue, config.bullmqQueueOptions, QUEUE.DELIVER)),
+	useFactory: (config: Config) => new Queues(config.redisForDeliverQueues.map(queueConfig => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(queueConfig, config.bullmqQueueOptions, QUEUE.DELIVER)))),
 	inject: [DI.config],
 };