Merge branch 'rest' into dev-kakurega

.github/workflows/publish.yml

@@ -10,12 +10,12 @@ on:
         type: boolean
   push:
     branches:
-      - 'master-kakurega'
+      - 'rest-master'
     paths:
       - 'package.json'
 
 env:
-  REGISTRY_IMAGE: ghcr.io/${{ github.repository_owner }}/kakurega.app
+  REGISTRY_IMAGE: ghcr.io/${{ github.repository_owner }}/misskey.rest
   DEVELOP_BRANCH_NAME: dev
 
 jobs:

README.md

@@ -8,10 +8,8 @@
 [Learn more](https://misskey-hub.net/)
 
 --- 
-
-<img src="./assets/kakurega.png" alt="Kakurega logo" style="margin-bottom:16px" width="128"/>  
 
-このリポジトリはMisskeyサーバー「[隠れ家](https://misskey.yukineko.me)」で使用している本家Misskeyのフォークです。  
+このリポジトリはmisskey.restで使用しているMisskeyの「[隠れ家](https://misskey.yukineko.me)」フォームをmisskey.rest用に変更したフォークです。  
 詳細については[こちらのドキュメント](./docs/index.md)をご覧ください。  
 
 Dockerを用いたセットアップ方法は[こちら](./docs/setup/docker.md)

docs/difference-rest.md

@@ -0,0 +1,2 @@
+# 本家Misskey/kakurega.appとの相違点
+## backend

locales/ar-SA.yml

@@ -821,7 +821,7 @@ muteThread: "اكتم النقاش"
 unmuteThread: "ارفع الكتم عن النقاش"
 continueThread: "اعرض بقية النقاش"
 deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد المتابعة؟"
-incorrectPassword: "كلمة السر خاطئة."
+incorrectPasswordorUsername: "اسم مستخدم أو كلمة مرور غير صحيحة."
 voteConfirm: "متيقِّن من تصويتك لـ {choice}؟"
 hide: "إخفاء"
 welcomeBackWithName: "مرحبًا بك مجددًا {name}"

locales/bn-BD.yml

@@ -814,7 +814,7 @@ muteThread: "থ্রেড মিউট করুন"
 unmuteThread: "থ্রেড আনমিউট করুন"
 continueThread: "আরো থ্রেড দেখুন"
 deleteAccountConfirm: "আপনার অ্যাকাউন্ট মুছে ফেলা হবে। ঠিক আছে?"
-incorrectPassword: "আপনার দেওয়া পাসওয়ার্ডটি ভুল।"
+incorrectPasswordorUsername: "ভুল ব্যবহারকারীর নাম বা পাসওয়ার্ড."
 voteConfirm: "\"{choice}\" এ ভোট দিতে চান？"
 hide: "লুকান"
 useDrawerReactionPickerForMobile: "মোবাইলে রিঅ্যাকশন পিকারকে ড্রয়ারে প্রদর্শন করুন"

locales/ca-ES.yml

@@ -895,7 +895,7 @@ followingVisibility: "Visibilitat dels seguiments"
 followersVisibility: "Visibilitat dels seguidors"
 continueThread: "Veure la continuació del fil"
 deleteAccountConfirm: "Això eliminarà el teu compte irreversiblement. Procedir?"
-incorrectPassword: "Contrasenya incorrecta."
+incorrectPasswordorUsername: "Nom d'usuari o contrasenya incorrectes."
 voteConfirm: "Confirma el teu vot \"{choice}\""
 hide: "Amagar"
 useDrawerReactionPickerForMobile: "Mostrar el selector de reaccions com un calaix al mòbil "

locales/cs-CZ.yml

@@ -858,7 +858,7 @@ muteThread: "Ztlumit vlákno"
 unmuteThread: "Zrušit ztlumení vlákna"
 continueThread: "Zobrazit pokračování vlákna"
 deleteAccountConfirm: "Tohle nenávratně smaže váš účet, chcete pokračovat?"
-incorrectPassword: "Nesprávné heslo."
+incorrectPasswordorUsername: "Nesprávné uživatelské jméno nebo heslo."
 voteConfirm: "Potvrdit hlas pro \"{choice}\"?"
 hide: "Skrýt"
 useDrawerReactionPickerForMobile: "Zobrazit výběr reakcí jako šuplík na mobilním zařízení"

locales/de-DE.yml

@@ -888,7 +888,7 @@ muteThread: "Thread stummschalten"
 unmuteThread: "Threadstummschaltung aufheben"
 continueThread: "Weiteren Threadverlauf anzeigen"
 deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
-incorrectPassword: "Falsches Passwort."
+incorrectPasswordorUsername: "Falscher Benutzername oder Passwort."
 voteConfirm: "Wirklich für „{choice}“ abstimmen?"
 hide: "Inhalt verbergen"
 useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"

locales/en-US.yml

@@ -916,7 +916,7 @@ followingVisibility: "Visibility of follows"
 followersVisibility: "Visibility of followers"
 continueThread: "View thread continuation"
 deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
-incorrectPassword: "Incorrect password."
+incorrectPasswordorUsername: "Incorrect password or username."
 voteConfirm: "Confirm your vote for \"{choice}\"?"
 hide: "Hide"
 useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"

locales/es-ES.yml

@@ -896,7 +896,7 @@ followingVisibility: "Visibilidad de seguidos"
 followersVisibility: "Visibilidad de seguidores"
 continueThread: "Ver la continuación del hilo"
 deleteAccountConfirm: "La cuenta será borrada. ¿Está seguro?"
-incorrectPassword: "La contraseña es incorrecta"
+incorrectPasswordorUsername: "Nombre de usuario o contraseña incorrectos."
 voteConfirm: "¿Confirma su voto a {choice}?"
 hide: "Ocultar"
 useDrawerReactionPickerForMobile: "Mostrar panel de reacciones en móviles"

locales/fr-FR.yml

@@ -895,7 +895,7 @@ followingVisibility: "Visibilité des abonnements"
 followersVisibility: "Visibilité des abonnés"
 continueThread: "Afficher la suite du fil"
 deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
-incorrectPassword: "Le mot de passe est incorrect."
+incorrectPasswordorUsername: "Nom d'utilisateur ou mot de passe incorrect."
 voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
 useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que panneau sur mobile"

locales/id-ID.yml

@@ -904,7 +904,7 @@ followingVisibility: "Visibilitas mengikuti"
 followersVisibility: "Visibilitas pengikut"
 continueThread: "Lihat lanjutan thread"
 deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
-incorrectPassword: "Kata sandi salah."
+incorrectPasswordorUsername: "Nama pengguna atau kata sandi salah."
 voteConfirm: "Konfirmasi suara kamu untuk ({choice})？"
 hide: "Sembunyikan"
 useDrawerReactionPickerForMobile: "Tampilkan bilah reaksi sebagai laci di ponsel"

locales/index.d.ts

@@ -3799,7 +3799,7 @@ export interface Locale extends ILocale {
     /**
      * パスワードが間違っています。
      */
-    "incorrectPassword": string;
+    "incorrectPasswordorUsername": string;
     /**
      * 「{choice}」に投票しますか？
      */

locales/it-IT.yml

@@ -906,7 +906,7 @@ followingVisibility: "Visibilità dei profili seguiti"
 followersVisibility: "Visibilità dei profili che ti seguono"
 continueThread: "Altre conversazioni"
 deleteAccountConfirm: "Così verrà eliminato il profilo. Vuoi procedere?"
-incorrectPassword: "La password è errata."
+incorrectPasswordorUsername: "Nome utente o password errati."
 voteConfirm: "Votare per「{choice}」?"
 hide: "Nascondere"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"

locales/ja-JP.yml

@@ -945,7 +945,7 @@ followingVisibility: "フォローの公開範囲"
 followersVisibility: "フォロワーの公開範囲"
 continueThread: "さらにスレッドを見る"
 deleteAccountConfirm: "アカウントが削除されます。よろしいですか？"
-incorrectPassword: "パスワードが間違っています。"
+incorrectPasswordorUsername: "ユーザー名またはパスワードが間違っています。"
 voteConfirm: "「{choice}」に投票しますか？"
 hide: "隠す"
 useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示"

locales/ja-KS.yml

@@ -912,7 +912,7 @@ followingVisibility: "フォローの公開範囲"
 followersVisibility: "フォロワーの公開範囲"
 continueThread: "さらにスレッドを見るで"
 deleteAccountConfirm: "アカウントを消すで？ええんか？"
-incorrectPassword: "パスワードがちゃうわ。"
+incorrectPasswordorUsername: "ユーザー名かパスワードがちゃうわ。"
 voteConfirm: "「{choice}」に投票するんか？"
 hide: "隠す"
 useDrawerReactionPickerForMobile: "ケータイとかのときドロワーで表示するで"

locales/ko-KR.yml

@@ -906,7 +906,7 @@ followingVisibility: "팔로우의 공개 범위"
 followersVisibility: "팔로워의 공개 범위"
 continueThread: "글타래 더 보기"
 deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다. 계속하시겠습니까? "
-incorrectPassword: "비밀번호가 올바르지 않습니다."
+incorrectPasswordorUsername: "사용자 이름 또는 암호가 올바르지 않습니다."
 voteConfirm: "\"{choice}\"에 투표하시겠습니까?"
 hide: "숨기기"
 useDrawerReactionPickerForMobile: "모바일에서 드로어 메뉴로 표시"

locales/pl-PL.yml

@@ -893,7 +893,7 @@ followingVisibility: "Widoczność obserwacji"
 followersVisibility: "Widoczność obserwujących"
 continueThread: "Pokaż kontynuację wątku"
 deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
-incorrectPassword: "Nieprawidłowe hasło."
+incorrectPasswordorUsername: "Nieprawidłowa nazwa użytkownika lub hasło."
 voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
 useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"

locales/pt-PT.yml

@@ -912,7 +912,7 @@ followingVisibility: "Visibilidade dos usuários seguidos"
 followersVisibility: "Visibilidade dos seguidores"
 continueThread: "Ver mais desta conversa"
 deleteAccountConfirm: "Deseja realmente excluir a conta?"
-incorrectPassword: "Senha inválida."
+incorrectPasswordorUsername: "Nome de usuário ou senha inválidos."
 voteConfirm: "Deseja confirmar o seu voto em \"{choice}\"?"
 hide: "Ocultar"
 useDrawerReactionPickerForMobile: "Mostrar em formato de gaveta"

locales/ru-RU.yml

@@ -880,7 +880,7 @@ muteThread: "Скрыть цепочку"
 unmuteThread: "Отменить сокрытие цепочки"
 continueThread: "Показать следующие ответы"
 deleteAccountConfirm: "Учётная запись будет безвозвратно удалена. Подтверждаете?"
-incorrectPassword: "Пароль неверен."
+incorrectPasswordorUsername: "Неверное имя пользователя или пароль."
 voteConfirm: "Отдать голос за «{choice}»?"
 hide: "Спрятать"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"

locales/sk-SK.yml

@@ -825,7 +825,7 @@ muteThread: "Ztíšiť vlákno"
 unmuteThread: "Zrušiť stíšenie vlákna"
 continueThread: "Zobraziť pokračovanie vlákna"
 deleteAccountConfirm: "Toto nezvrátiteľne vymaže váš účet. Pokračovať?"
-incorrectPassword: "Nesprávne heslo."
+incorrectPasswordorUsername: "Nesprávne používateľské meno alebo heslo."
 voteConfirm: "Potvrdzujete svoj hlas za \"{choice}\"?"
 hide: "Skryť"
 useDrawerReactionPickerForMobile: "Zobraziť výber reakcií ako šuflík na mobile"

locales/sv-SE.yml

@@ -465,7 +465,7 @@ global: "Global"
 squareAvatars: "Visa fyrkantiga profilbilder"
 sent: "Skicka"
 misskeyUpdated: "Misskey har uppdaterats!"
-incorrectPassword: "Fel lösenord."
+incorrectPasswordorUsername: "Felaktigt användarnamn eller lösenord."
 welcomeBackWithName: "Välkommen tillbaka, {name}"
 clickToFinishEmailVerification: "Tryck på [{ok}] för att slutföra bekräftelsen på e-postadressen."
 searchByGoogle: "Sök"

locales/th-TH.yml

@@ -912,7 +912,7 @@ followingVisibility: "การมองเห็นที่เรากำล
 followersVisibility: "การมองเห็นผู้ที่กำลังติดตามเรา"
 continueThread: "ดูความต่อเนื่องเธรด"
 deleteAccountConfirm: "การดำเนินการนี้จะลบบัญชีของคุณอย่างถาวรเลยนะ แน่ใจหรอดำเนินการ?"
-incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
+incorrectPasswordorUsername: "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"
 voteConfirm: "ต้องการโหวต “{choice}” ใช่ไหม?"
 hide: "ซ่อน"
 useDrawerReactionPickerForMobile: "แสดง ตัวจิ้มรีแอคชั่น เป็นแบบลิ้นชัก เมื่อใช้บนมือถือ"

locales/uk-UA.yml

@@ -821,7 +821,7 @@ muteThread: "Приглушити тред"
 unmuteThread: "Скасувати глушіння"
 continueThread: "Показати продовження треду"
 deleteAccountConfirm: "Це незворотно видалить ваш акаунт. Продовжити?"
-incorrectPassword: "Неправильний пароль."
+incorrectPasswordorUsername: "Невірне ім'я користувача або пароль."
 voteConfirm: "Підтверджуєте свій голос за \"{choice}\"?"
 hide: "Сховати"
 welcomeBackWithName: "З поверненням, {name}!"

locales/vi-VN.yml

@@ -878,7 +878,7 @@ followingVisibility: "Hiển thị lượt theo dõi"
 followersVisibility: "Hiển thị người theo dõi"
 continueThread: "Tiếp tục xem chuỗi tút"
 deleteAccountConfirm: "Điều này sẽ khiến tài khoản bị xóa vĩnh viễn. Vẫn tiếp tục?"
-incorrectPassword: "Sai mật khẩu."
+incorrectPasswordorUsername: "Tên người dùng hoặc mật khẩu không chính xác."
 voteConfirm: "Xác nhận bình chọn \"{choice}\"?"
 hide: "Ẩn"
 useDrawerReactionPickerForMobile: "Hiện bộ chọn biểu cảm dạng xổ ra trên điện thoại"

locales/zh-CN.yml

@@ -912,7 +912,7 @@ followingVisibility: "关注的人的公开范围"
 followersVisibility: "关注者的公开范围"
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
-incorrectPassword: "密码错误"
+incorrectPasswordorUsername: "使用者名称或密码不正确。"
 voteConfirm: "确定投给 “{choice}” ？"
 hide: "隐藏"
 useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"

locales/zh-TW.yml

@@ -912,7 +912,7 @@ followingVisibility: "追隨中的可見性"
 followersVisibility: "追隨者的可見性"
 continueThread: "查看更多貼文"
 deleteAccountConfirm: "將要刪除帳戶。是否確定？"
-incorrectPassword: "密碼錯誤。"
+incorrectPasswordorUsername: "使用者名稱或密碼不正確。"
 voteConfirm: "確定投給「{choice}」？"
 hide: "隱藏"
 useDrawerReactionPickerForMobile: "在移動設備上使用抽屜顯示"

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-kakurega.1.39.1",
+	"version": "2024.8.0-rest.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/hideki0403/misskey.git"
+		"url": "https://github.com/amsc-tech/misskey.rest.git"
 	},
 	"packageManager": "[email protected]",
 	"workspaces": [

packages/backend/src/server/api/endpoints/i/2fa/key-done.ts

@@ -21,7 +21,7 @@ export const meta = {
 
 	errors: {
 		incorrectPassword: {
-			message: 'Incorrect password.',
+			message: 'Incorrect password or username.',
 			code: 'INCORRECT_PASSWORD',
 			id: '0d7ec6d2-e652-443e-a7bf-9ee9a0cd77b0',
 		},

packages/backend/src/server/api/endpoints/i/2fa/register-key.ts

@@ -25,7 +25,7 @@ export const meta = {
 		},
 
 		incorrectPassword: {
-			message: 'Incorrect password.',
+			message: 'Incorrect password or username.',
 			code: 'INCORRECT_PASSWORD',
 			id: '38769596-efe2-4faf-9bec-abbb3f2cd9ba',
 		},

packages/backend/src/server/api/endpoints/i/2fa/register.ts

@@ -21,7 +21,7 @@ export const meta = {
 
 	errors: {
 		incorrectPassword: {
-			message: 'Incorrect password.',
+			message: 'Incorrect password or username.',
 			code: 'INCORRECT_PASSWORD',
 			id: '78d6c839-20c9-4c66-b90a-fc0542168b48',
 		},

packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts

@@ -20,7 +20,7 @@ export const meta = {
 
 	errors: {
 		incorrectPassword: {
-			message: 'Incorrect password.',
+			message: 'Incorrect password or username.',
 			code: 'INCORRECT_PASSWORD',
 			id: '141c598d-a825-44c8-9173-cfb9d92be493',
 		},

packages/backend/src/server/api/endpoints/i/2fa/unregister.ts

@@ -20,7 +20,7 @@ export const meta = {
 
 	errors: {
 		incorrectPassword: {
-			message: 'Incorrect password.',
+			message: 'Incorrect password or username.',
 			code: 'INCORRECT_PASSWORD',
 			id: '7add0395-9901-4098-82f9-4f67af65f775',
 		},

packages/backend/src/server/api/endpoints/i/update-email.ts

@@ -30,7 +30,7 @@ export const meta = {
 
 	errors: {
 		incorrectPassword: {
-			message: 'Incorrect password.',
+			message: 'Incorrect password or username.',
 			code: 'INCORRECT_PASSWORD',
 			id: 'e54c1d7e-e7d6-4103-86b6-0a95069b4ad3',
 		},

packages/frontend/src/components/MkSignin.vue

@@ -188,15 +188,15 @@ function loginFailed(err: any): void {
 			os.alert({
 				type: 'error',
 				title: i18n.ts.loginFailed,
-				text: i18n.ts.noSuchUser,
+				text: i18n.ts.incorrectPasswordorUsername,
 			});
 			break;
 		}
 		case '932c904e-9460-45b7-9ce6-7ed33be7eb2c': {
 			os.alert({
 				type: 'error',
 				title: i18n.ts.loginFailed,
-				text: i18n.ts.incorrectPassword,
+				text: i18n.ts.incorrectPasswordorUsername,
 			});
 			break;
 		}