From dd9424e8b5fc28e929fd7d8e039cbfd6dc579c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=E7=80=AC=E3=81=93=E3=81=93=E3=81=82?= Date: Sat, 10 Aug 2024 22:03:11 +0900 Subject: [PATCH 1/7] Bump Vue Version from https://github.com/misskey-dev/misskey/pull/14380 --- packages/frontend/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 2699ba6d953f..31e539248349 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -29,7 +29,7 @@ "@tabler/icons-webfont": "3.3.0", "@twemoji/parser": "15.1.1", "@vitejs/plugin-vue": "5.1.0", - "@vue/compiler-sfc": "3.4.34", + "@vue/compiler-sfc": "3.4.37", "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.11", "astring": "1.8.6", "broadcast-channel": "7.0.0", @@ -75,7 +75,7 @@ "v-code-diff": "1.12.0", "vite": "5.3.5", "vite-plugin-sentry": "^1.3.0", - "vue": "3.4.34", + "vue": "3.4.37", "vuedraggable": "next" }, "devDependencies": { @@ -114,7 +114,7 @@ "@typescript-eslint/eslint-plugin": "7.17.0", "@typescript-eslint/parser": "7.17.0", "@vitest/coverage-v8": "1.6.0", - "@vue/runtime-core": "3.4.34", + "@vue/runtime-core": "3.4.37", "acorn": "8.12.1", "cross-env": "7.0.3", "cypress": "13.13.1", From 02926d68fa2fe9a04d2c7835d201e8e07904b0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=E7=80=AC=E3=81=93=E3=81=93=E3=81=82?= Date: Sat, 10 Aug 2024 22:09:20 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d661446824da..a6304a948ac8 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "misskey", - "version": "2024.7.0-kakurega.1.39.0", + "version": "2024.7.0-rest.0", "codename": "nasubi", "repository": { "type": "git", - "url": "https://github.com/hideki0403/misskey.git" + "url": "https://github.com/amsc-tech/misskey.rest.git" }, "packageManager": "pnpm@9.6.0", "workspaces": [ From 03e52d129279b81a5e5e05f4a8194a99ed9037fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=E7=80=AC=E3=81=93=E3=81=93=E3=81=82?= Date: Tue, 13 Aug 2024 00:14:19 +0900 Subject: [PATCH 3/7] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 69568e5db6cc..cc7687d3f634 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,8 @@ [Learn more](https://misskey-hub.net/) --- - -Kakurega logo -このリポジトリはMisskeyサーバー「[隠れ家](https://misskey.yukineko.me)」で使用している本家Misskeyのフォークです。 +このリポジトリはmisskey.restで使用しているMisskeyの「[隠れ家](https://misskey.yukineko.me)」フォームをmisskey.rest用に変更したフォークです。 詳細については[こちらのドキュメント](./docs/index.md)をご覧ください。 Dockerを用いたセットアップ方法は[こちら](./docs/setup/docker.md) From c9184c761f62dc28c4b33fe09568dd6312715391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=E7=80=AC=E3=81=93=E3=81=93=E3=81=82?= Date: Tue, 13 Aug 2024 00:18:59 +0900 Subject: [PATCH 4/7] Create difference-rest.md --- docs/difference-rest.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/difference-rest.md diff --git a/docs/difference-rest.md b/docs/difference-rest.md new file mode 100644 index 000000000000..d340ba94fb57 --- /dev/null +++ b/docs/difference-rest.md @@ -0,0 +1,3 @@ +# 本家Misskey/kakurega.appとの相違点 +## backend +* (WIP) ジョブキューにRabbitMQを使うように変更 From 395d7dba7ae37c83e531fc961d8745da1408d5a6 Mon Sep 17 00:00:00 2001 From: AmaseCocoa Date: Thu, 15 Aug 2024 17:44:19 +0900 Subject: [PATCH 5/7] =?UTF-8?q?(=E7=84=A1=E6=84=8F=E5=91=B3=E3=81=A7?= =?UTF-8?q?=E3=81=AF=E3=81=82=E3=82=8B=E3=81=91=E3=81=A9)=20=E4=B8=80?= =?UTF-8?q?=E9=83=A8=E3=81=AE=E7=BF=BB=E8=A8=B3=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ar-SA.yml | 2 +- locales/bn-BD.yml | 2 +- locales/ca-ES.yml | 2 +- locales/cs-CZ.yml | 2 +- locales/de-DE.yml | 2 +- locales/en-US.yml | 2 +- locales/es-ES.yml | 2 +- locales/fr-FR.yml | 2 +- locales/id-ID.yml | 2 +- locales/index.d.ts | 2 +- locales/it-IT.yml | 2 +- locales/ja-JP.yml | 2 +- locales/ja-KS.yml | 2 +- locales/ko-KR.yml | 2 +- locales/pl-PL.yml | 2 +- locales/pt-PT.yml | 2 +- locales/ru-RU.yml | 2 +- locales/sk-SK.yml | 2 +- locales/sv-SE.yml | 2 +- locales/th-TH.yml | 2 +- locales/uk-UA.yml | 2 +- locales/vi-VN.yml | 2 +- locales/zh-CN.yml | 2 +- locales/zh-TW.yml | 2 +- packages/backend/src/server/api/endpoints/i/2fa/key-done.ts | 2 +- .../backend/src/server/api/endpoints/i/2fa/register-key.ts | 2 +- packages/backend/src/server/api/endpoints/i/2fa/register.ts | 2 +- packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts | 2 +- packages/backend/src/server/api/endpoints/i/2fa/unregister.ts | 2 +- packages/backend/src/server/api/endpoints/i/update-email.ts | 2 +- packages/frontend/src/components/MkSignin.vue | 4 ++-- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index b6bfbfa68281..9a4251e4902c 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -821,7 +821,7 @@ muteThread: "اكتم النقاش" unmuteThread: "ارفع الكتم عن النقاش" continueThread: "اعرض بقية النقاش" deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد المتابعة؟" -incorrectPassword: "كلمة السر خاطئة." +incorrectPasswordorUsername: "اسم مستخدم أو كلمة مرور غير صحيحة." voteConfirm: "متيقِّن من تصويتك لـ {choice}؟" hide: "إخفاء" welcomeBackWithName: "مرحبًا بك مجددًا {name}" diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 6fb51ea5d860..d387f9226e98 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -814,7 +814,7 @@ muteThread: "থ্রেড মিউট করুন" unmuteThread: "থ্রেড আনমিউট করুন" continueThread: "আরো থ্রেড দেখুন" deleteAccountConfirm: "আপনার অ্যাকাউন্ট মুছে ফেলা হবে। ঠিক আছে?" -incorrectPassword: "আপনার দেওয়া পাসওয়ার্ডটি ভুল।" +incorrectPasswordorUsername: "ভুল ব্যবহারকারীর নাম বা পাসওয়ার্ড." voteConfirm: "\"{choice}\" এ ভোট দিতে চান？" hide: "লুকান" useDrawerReactionPickerForMobile: "মোবাইলে রিঅ্যাকশন পিকারকে ড্রয়ারে প্রদর্শন করুন" diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index 7bd9a1bb32de..b3383393644f 100644 --- a/locales/ca-ES.yml +++ b/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 " diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index 7db742476292..b7053784ce97 100644 --- a/locales/cs-CZ.yml +++ b/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í" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 8e44a3bbd4fc..1941d85259bc 100644 --- a/locales/de-DE.yml +++ b/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" diff --git a/locales/en-US.yml b/locales/en-US.yml index 11cd7f9b387d..ed51b6f5708c 100644 --- a/locales/en-US.yml +++ b/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" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index ef066a37edd1..cf35e3431096 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -895,7 +895,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" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index ee08dfddf1a1..4b456a9b1146 100644 --- a/locales/fr-FR.yml +++ b/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" diff --git a/locales/id-ID.yml b/locales/id-ID.yml index 24f7482fcaea..7f2c4be35df6 100644 --- a/locales/id-ID.yml +++ b/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" diff --git a/locales/index.d.ts b/locales/index.d.ts index ba8b21613ad5..8c794efd084c 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -3799,7 +3799,7 @@ export interface Locale extends ILocale { /** * パスワードが間違っています。 */ - "incorrectPassword": string; + "incorrectPasswordorUsername": string; /** * 「{choice}」に投票しますか？ */ diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 2b4b1e425e84..d37ab4764263 100644 --- a/locales/it-IT.yml +++ b/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" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index eb887e609eb9..065438ec3750 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -945,7 +945,7 @@ followingVisibility: "フォローの公開範囲" followersVisibility: "フォロワーの公開範囲" continueThread: "さらにスレッドを見る" deleteAccountConfirm: "アカウントが削除されます。よろしいですか？" -incorrectPassword: "パスワードが間違っています。" +incorrectPasswordorUsername: "ユーザー名またはパスワードが間違っています。" voteConfirm: "「{choice}」に投票しますか？" hide: "隠す" useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 5969082cf2a6..ab18200b0472 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -899,7 +899,7 @@ followingVisibility: "フォローの公開範囲" followersVisibility: "フォロワーの公開範囲" continueThread: "さらにスレッドを見るで" deleteAccountConfirm: "アカウントを消すで？ええんか？" -incorrectPassword: "パスワードがちゃうわ。" +incorrectPasswordorUsername: "ユーザー名かパスワードがちゃうわ。" voteConfirm: "「{choice}」に投票するんか？" hide: "隠す" useDrawerReactionPickerForMobile: "ケータイとかのときドロワーで表示するで" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 34c1cc3ebfb5..2506a2f03ab0 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -906,7 +906,7 @@ followingVisibility: "팔로우의 공개 범위" followersVisibility: "팔로워의 공개 범위" continueThread: "글타래 더 보기" deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다. 계속하시겠습니까? " -incorrectPassword: "비밀번호가 올바르지 않습니다." +incorrectPasswordorUsername: "사용자 이름 또는 암호가 올바르지 않습니다." voteConfirm: "\"{choice}\"에 투표하시겠습니까?" hide: "숨기기" useDrawerReactionPickerForMobile: "모바일에서 드로어 메뉴로 표시" diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 73eff0941a06..446d77939b60 100644 --- a/locales/pl-PL.yml +++ b/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" diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml index 2e26f6d12a4f..44a929a0e58a 100644 --- a/locales/pt-PT.yml +++ b/locales/pt-PT.yml @@ -862,7 +862,7 @@ muteThread: "Silenciar esta conversa" unmuteThread: "Desativar silêncio desta conversa" 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" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 88f59155d656..c7c9d51644b4 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -880,7 +880,7 @@ muteThread: "Скрыть цепочку" unmuteThread: "Отменить сокрытие цепочки" continueThread: "Показать следующие ответы" deleteAccountConfirm: "Учётная запись будет безвозвратно удалена. Подтверждаете?" -incorrectPassword: "Пароль неверен." +incorrectPasswordorUsername: "Неверное имя пользователя или пароль." voteConfirm: "Отдать голос за «{choice}»?" hide: "Спрятать" useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве" diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 41f894919615..7501f68b9b79 100644 --- a/locales/sk-SK.yml +++ b/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" diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml index c1a998b8fb57..e394b7e6c7b3 100644 --- a/locales/sv-SE.yml +++ b/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" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 63f27934283b..f096c4750ccf 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -912,7 +912,7 @@ followingVisibility: "การมองเห็นที่เรากำล followersVisibility: "การมองเห็นผู้ที่กำลังติดตามเรา" continueThread: "ดูความต่อเนื่องเธรด" deleteAccountConfirm: "การดำเนินการนี้จะลบบัญชีของคุณอย่างถาวรเลยนะ แน่ใจหรอดำเนินการ?" -incorrectPassword: "รหัสผ่านไม่ถูกต้อง" +incorrectPasswordorUsername: "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง" voteConfirm: "ต้องการโหวต “{choice}” ใช่ไหม?" hide: "ซ่อน" useDrawerReactionPickerForMobile: "แสดง ตัวจิ้มรีแอคชั่น เป็นแบบลิ้นชัก เมื่อใช้บนมือถือ" diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index 36d741d30e4a..938f05e181ab 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -821,7 +821,7 @@ muteThread: "Приглушити тред" unmuteThread: "Скасувати глушіння" continueThread: "Показати продовження треду" deleteAccountConfirm: "Це незворотно видалить ваш акаунт. Продовжити?" -incorrectPassword: "Неправильний пароль." +incorrectPasswordorUsername: "Невірне ім'я користувача або пароль." voteConfirm: "Підтверджуєте свій голос за \"{choice}\"?" hide: "Сховати" welcomeBackWithName: "З поверненням, {name}!" diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index aadbf8b16f22..41a98cb9062f 100644 --- a/locales/vi-VN.yml +++ b/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" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 1deb0effc394..692cc77e2ce0 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -912,7 +912,7 @@ followingVisibility: "关注的人的公开范围" followersVisibility: "关注者的公开范围" continueThread: "查看更多帖子" deleteAccountConfirm: "将要删除账户。是否确认？" -incorrectPassword: "密码错误" +incorrectPasswordorUsername: "使用者名称或密码不正确。" voteConfirm: "确定投给 “{choice}” ？" hide: "隐藏" useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 16dc464e352a..be961c4ee2a9 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -912,7 +912,7 @@ followingVisibility: "追隨中的可見性" followersVisibility: "追隨者的可見性" continueThread: "查看更多貼文" deleteAccountConfirm: "將要刪除帳戶。是否確定？" -incorrectPassword: "密碼錯誤。" +incorrectPasswordorUsername: "使用者名稱或密碼不正確。" voteConfirm: "確定投給「{choice}」？" hide: "隱藏" useDrawerReactionPickerForMobile: "在移動設備上使用抽屜顯示" diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index 65eece5b9705..73efaf945d72 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/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', }, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts index 9391aee5e019..0062efe41342 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts +++ b/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', }, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts index a54c598213ef..d47539b29c3c 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts +++ b/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', }, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts index c350136eae5b..612b9f5668ed 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/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', }, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts index b5a53cc88969..a5394781e0b6 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts +++ b/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', }, diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts index eea657ebbd07..bed940aae615 100644 --- a/packages/backend/src/server/api/endpoints/i/update-email.ts +++ b/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', }, diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue index 781145e1bc42..4b6d482314f5 100644 --- a/packages/frontend/src/components/MkSignin.vue +++ b/packages/frontend/src/components/MkSignin.vue @@ -188,7 +188,7 @@ function loginFailed(err: any): void { os.alert({ type: 'error', title: i18n.ts.loginFailed, - text: i18n.ts.noSuchUser, + text: i18n.ts.incorrectPasswordorUsername, }); break; } @@ -196,7 +196,7 @@ function loginFailed(err: any): void { os.alert({ type: 'error', title: i18n.ts.loginFailed, - text: i18n.ts.incorrectPassword, + text: i18n.ts.incorrectPasswordorUsername, }); break; } From 49b9ae0ba2e4eff6a8209794e7f2b53e36152744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=E7=80=AC=E3=81=93=E3=81=93=E3=81=82?= Date: Thu, 15 Aug 2024 17:47:26 +0900 Subject: [PATCH 6/7] rename --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1870312bdece..3da3dee7569f 100644 --- a/.github/workflows/publish.yml +++ b/.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: From f463b45ef6b66942a067a59ccb89398b87b85601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=E7=80=AC=E3=81=93=E3=81=93=E3=81=82?= Date: Fri, 20 Sep 2024 17:47:56 +0900 Subject: [PATCH 7/7] Update difference-rest.md --- docs/difference-rest.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/difference-rest.md b/docs/difference-rest.md index d340ba94fb57..391c58940681 100644 --- a/docs/difference-rest.md +++ b/docs/difference-rest.md @@ -1,3 +1,2 @@ # 本家Misskey/kakurega.appとの相違点 ## backend -* (WIP) ジョブキューにRabbitMQを使うように変更