Merge branch 'misskey-dev:develop' into sim-dev-ja-nya

.github/workflows/test.yml

@@ -17,14 +17,14 @@ jobs:
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:12.2-alpine
         ports:
           - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
       redis:
-        image: redis:6
+        image: redis:4.0-alpine
         ports:
           - 56312:6379
 
@@ -51,21 +51,19 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
       matrix:
         node-version: [16.x]
-        browser: [chrome]
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:12.2-alpine
         ports:
           - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
       redis:
-        image: redis:6
+        image: redis:4.0-alpine
         ports:
           - 56312:6379
 
@@ -73,12 +71,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    # https://github.com/cypress-io/cypress-docker-images/issues/150
-    #- name: Install mplayer for FireFox
-    #  run: sudo apt install mplayer -y
-    #  if: ${{ matrix.browser == 'firefox' }}
-    #- uses: browser-actions/setup-firefox@latest
-    #  if: ${{ matrix.browser == 'firefox' }}
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
@@ -95,24 +87,5 @@ jobs:
       run: cp .github/misskey/test.yml .config
     - name: Build
       run: yarn build
-    # https://github.com/cypress-io/cypress/issues/4351#issuecomment-559489091
+    - name: Test
-    - name: ALSA Env
+      run: yarn e2e
-      run: echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-    - name: Cypress run
-      uses: cypress-io/github-action@v2
-      with:
-        install: false
-        start: npm run start:test
-        wait-on: 'http://localhost:61812'
-        headless: false
-        browser: ${{ matrix.browser }}
-    - uses: actions/upload-artifact@v2
-      if: failure()
-      with:
-        name: ${{ matrix.browser }}-cypress-screenshots
-        path: cypress/screenshots
-    - uses: actions/upload-artifact@v2
-      if: always()
-      with:
-        name: ${{ matrix.browser }}-cypress-videos
-        path: cypress/videos

.vscode/extensions.json

@@ -4,5 +4,6 @@
 		"eg2.vscode-npm-script",
 		"dbaeumer.vscode-eslint",
 		"johnsoncodehk.volar",
+		"sysoev.language-stylus"
 	]
 }

CHANGELOG.md

@@ -7,45 +7,13 @@
 
 -->
 
-## 12.102.0 (2022/01/27)
+## 12.x.x (unreleased)
-
-### Changes
-- Room機能が削除されました
-  - 後日別リポジトリとして復活予定です
-- リバーシ機能が削除されました
-  - 後日別リポジトリとして復活予定です
-- Chat UIが削除されました
-- ノートに添付できるファイルの数が16に増えました
-- カスタム絵文字にSVGを指定した場合、PNGに変換されて表示されるようになりました
-
-### Improvements
-- カスタム絵文字一括編集機能
-- カスタム絵文字一括インポート
-- 投稿フォームで一時的に投稿するアカウントを切り替えられるように
-- Unifying Misskey-specific IRIs in JSON-LD `@context`
-- クライアントのパフォーマンス向上
-- セキュリティの向上
-
-### Bugfixes
-- アップロードエラー時の処理を修正
-
-## 12.101.1 (2021/12/29)
-
-### Bugfixes
-- SVG絵文字が表示できないのを修正
-- エクスポートした絵文字の拡張子がfalseになることがあるのを修正
-
-## 12.101.0 (2021/12/29)
 
 ### Improvements
 - クライアント: ノートプレビューの精度を改善
-- クライアント: MFM sparkleエフェクトの改善
-- クライアント: デザインの調整
-- セキュリティの向上
 
 ### Bugfixes
 - クライアント: 一部のコンポーネントが裏に隠れるのを修正
-- fix html blockquote conversion
 
 ## 12.100.2 (2021/12/18)
 

CONTRIBUTING.md

@@ -87,18 +87,25 @@ Configuration files are located in [`/.github/workflows`](/.github/workflows).
 
 ## Vue
 Misskey uses Vue(v3) as its front-end framework.
-- Use TypeScript.
+**When creating a new component, please use the Composition API (and [setup sugar](https://v3.vuejs.org/api/sfc-script-setup.html)) instead of the Options API.**
-- **When creating a new component, please use the Composition API (with [setup sugar](https://v3.vuejs.org/api/sfc-script-setup.html) and [ref sugar](https://github.com/vuejs/rfcs/discussions/369)) instead of the Options API.**
+Some of the existing components are implemented in the Options API, but it is an old implementation. Refactors that migrate those components to the Composition API are also welcome.
-	- Some of the existing components are implemented in the Options API, but it is an old implementation. Refactors that migrate those components to the Composition API are also welcome.
+
+## Adding MisskeyRoom items
+* Use English for material, object and texture names.
+* Use meter for unit of length.
+* Your PR should include all source files (e.g. `.png`, `.blend`) of your models (for later editing).
+* Your PR must include the glTF binary files (`.glb`) of your models.
+* Add a locale key `room.furnitures.YOUR_ITEM` at [`/locales/ja-JP.yml`](/locales/ja-JP.yml).
+* Add a furniture definition at [`src/client/scripts/room/furnitures.json5`](src/client/scripts/room/furnitures.json5).
+
+If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
+You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
 
 ## Notes
 ### How to resolve conflictions occurred at yarn.lock?
 
 Just execute `yarn` to fix it.
 
-### INSERTするときにはsaveではなくinsertを使用する
-#6441
-
 ### placeholder
 SQLをクエリビルダで組み立てる際、使用するプレースホルダは重複してはならない
 例えば

cypress/integration/basic.js

@@ -41,6 +41,8 @@ describe('After setup instance', () => {
 			username: 'admin',
 			password: 'pass',
 		}).its('body').as('admin');
+
+		cy.get('@admin');
 	});
 
 	afterEach(() => {
@@ -80,11 +82,15 @@ describe('After user signup', () => {
 			password: 'pass',
 		}).its('body').as('admin');
 
-		// ユーザー作成
+		cy.get('@admin').then(() => {
-		cy.request('POST', '/api/signup', {
+			// ユーザー作成
-			username: 'alice',
+			cy.request('POST', '/api/signup', {
-			password: 'alice1234',
+				username: 'alice',
-		}).its('body').as('alice');
+				password: 'alice1234',
+			}).its('body').as('alice');
+		});
+
+		cy.get('@alice');
 	});
 
 	afterEach(() => {
@@ -139,21 +145,27 @@ describe('After user singed in', () => {
 			password: 'pass',
 		}).its('body').as('admin');
 
-		// ユーザー作成
+		cy.get('@admin').then(() => {
-		cy.request('POST', '/api/signup', {
+			// ユーザー作成
-			username: 'alice',
+			cy.request('POST', '/api/signup', {
-			password: 'alice1234',
+				username: 'alice',
-		}).its('body').as('alice');
+				password: 'alice1234',
+			}).its('body').as('alice');
+		});
 
-		cy.visit('/');
+		cy.get('@alice').then(() => {
+			cy.visit('/');
 
-		cy.intercept('POST', '/api/signin').as('signin');
+			cy.intercept('POST', '/api/signin').as('signin');
 
-		cy.get('[data-cy-signin]').click();
+			cy.get('[data-cy-signin]').click();
-		cy.get('[data-cy-signin-username] input').type('alice');
+			cy.get('[data-cy-signin-username] input').type('alice');
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+			cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
 
-		cy.wait('@signin').as('signedIn');
+			cy.wait('@signin').as('signedIn');
+		});
+
+		cy.get('@signedIn');
 	});
 
 	afterEach(() => {

cypress/support/index.js

@@ -18,15 +18,3 @@ import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
-
-Cypress.on('uncaught:exception', (err, runnable) => {
-	if ([
-		// Chrome
-		'ResizeObserver loop limit exceeded',
-
-		// Firefox
-		'ResizeObserver loop completed with undelivered notifications',
-	].some(msg => err.message.includes(msg))) {
-		return false;
-	}
-});

docker-compose.yml

@@ -40,7 +40,6 @@ services:
 #    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
 #    environment:
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-#      - "TAKE_FILE_OWNERSHIP=111"
 #    networks:
 #      - internal_network
 #    volumes:

locales/ar-SA.yml

@@ -237,6 +237,7 @@ uploadFromUrlDescription: "رابط الملف المراد رفعه"
 uploadFromUrlRequested: "الرفع مطلوب"
 uploadFromUrlMayTakeTime: "سيستغرق بعض الوقت لاتمام الرفع "
 explore: "استكشاف"
+games: "ألعاب ميسكي"
 messageRead: "مقروءة"
 noMoreHistory: "لا يوجد المزيد من التاريخ"
 startMessaging: "ابدأ محادثة"
@@ -514,6 +515,7 @@ yourAccountSuspendedDescription: "عُلق الحساب بسبب انتهاك ش
 menu: "القائمة"
 divider: "فاصل"
 addItem: "إضافة عنصر"
+rooms: "الغرفة"
 relays: "المُرَحلات"
 addRelay: "إضافة مُرحّل"
 addedRelays: "المرحلات المضافة"
@@ -578,6 +580,7 @@ regenerateLoginToken: "أعد توليد الرمز"
 regenerateLoginTokenDescription: "ينشئ رمز استيثاق جديد في العادة هذا ليس ضروريًا ؛ عند إنشاء رمز جديد ستُخرج جميع الأجهزة."
 setMultipleBySeparatingWithSpace: "يمكنك ادخال أكثر من مدخل واحد وذلك بفصلها بمسافات."
 fileIdOrUrl: "معرف الملف أو رابط"
+chatOpenBehavior: "سلوك نفاذة المحادثة عند فتحها"
 behavior: "السلوك"
 sample: "مثال"
 abuseReports: "البلاغات"
@@ -688,7 +691,6 @@ notRecommended: "غير مستحسن"
 botProtection: "الحماية من الحسابات الآلية"
 instanceBlocking: "المثيلات المحجوبة"
 selectAccount: "اختر حسابًا"
-switchAccount: "تغيير الحساب"
 enabled: "مفعّل"
 disabled: "معطّل"
 quickAction: "الإجراءات السّريعة"
@@ -735,7 +737,6 @@ keepCw: "أبقِ على تحذيرات المحتوى"
 lastCommunication: "آخر تواصل"
 resolved: "عولج"
 unresolved: "لم يعالج"
-breakFollow: "إلغاء الاشتراك"
 itsOn: "مفعّل"
 itsOff: "معطّل"
 emailRequiredForSignup: "عنوان البريد الإلكتروني إلزامي للتسجيل"
@@ -751,8 +752,6 @@ unmuteThread: "ارفع الكتم عن النقاش"
 deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد المتابعة؟"
 incorrectPassword: "كلمة السر خاطئة."
 hide: "إخفاء"
-leaveGroup: "مغادرة الفريق"
-welcomeBackWithName: "مرحبًا بك مجددًا {name}"
 _emailUnavailable:
   used: "هذا البريد الإلكتروني مستخدم"
   format: "صيغة البريد الإلكتروني غير صالحة"
@@ -760,7 +759,6 @@ _emailUnavailable:
   smtp: "خادم البريد الإلكتروتي لا يستجيب"
 _ffVisibility:
   public: "علني"
-  followers: "مرئية لمتابِعيك فقط"
   private: "خاص"
 _signup:
   almostThere: "كدت تنتهي"
@@ -845,6 +843,34 @@ _mfm:
   rainbow: "قوس قزح"
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
+_reversi:
+  gameSettings: "إعدادات اللعبة"
+  chooseBoard: "اختر اللوح"
+  blackOrWhite: "أسود/أبيض"
+  blackIs: "{name} سيلعب بالأسود"
+  rules: "القوانين"
+  botSettings: "خيارات الحسابات الآلية"
+  thisGameIsStartedSoon: "ستبدأ اللعبة خلال بضع ثوانٍ"
+  waitingForOther: "ينتظر دور الخصم"
+  waitingForMe: "ينتظر دورك"
+  waitingBoth: "استعد"
+  ready: "جاهز"
+  cancelReady: "ألغ الجهوزية"
+  opponentTurn: "دور الخصم"
+  myTurn: "دورك"
+  turnOf: "دور {name}"
+  pastTurnOf: "دور {name}"
+  surrender: "استسلم"
+  drawn: "تعادل"
+  won: "فاز {name}"
+  black: "أسود"
+  white: "أبيض"
+  total: "المجموع"
+  turnCount: "الدور {count}"
+  myGames: "جولاتي"
+  allGames: "كل الجولات"
+  ended: "انتهت"
+  playing: "يُلعب الآن"
 _instanceTicker:
   remote: "أظهر للمستخدمين البِعاد"
 _serverDisconnectedBehavior:
@@ -861,8 +887,6 @@ _channel:
   usersCount: "{n} منتسب"
   notesCount: "{n} ملاحظة"
 _menuDisplay:
-  sideFull: "جانبي"
-  top: "الأعلى"
   hide: "إخفاء"
 _wordMute:
   muteWords: "الكلمات المحظورة"
@@ -1129,6 +1153,50 @@ _timelines:
   local: "المحلي"
   social: "الاجتماعي"
   global: "الشامل"
+_rooms:
+  roomOf: "غرفة {user}"
+  translate: "أنقل"
+  rotate: "تدوير"
+  exit: "رجوع"
+  remove: "أزل"
+  clear: "أزل الكل"
+  clearConfirm: "أتريد إزالة كل الأثاث من الغرفة؟"
+  leaveConfirm: "لديك تغييرات غير محفوظة. أتريد المتابعة دون حفظها؟"
+  chooseImage: "اختر صورة"
+  roomType: "نوع الغرفة"
+  carpetColor: "لون السّجاد"
+  _roomType:
+    default: "افتراضي"
+    washitsu: "الأسلوب الياباني"
+  _furnitures:
+    milk: "علبة حليب"
+    bed: "سرير"
+    low-table: "طاولة قصيرة"
+    desk: "مكتب"
+    chair: "كرسي"
+    chair2: "كرسي 2"
+    fan: "مروحة"
+    pc: "حاسوب"
+    plant: "نبات زينة"
+    plant2: "نبات زينة 2"
+    eraser: "ممحاة"
+    pencil: "قلم رصاص"
+    pudding: "بودينغ"
+    book: "كتاب"
+    book2: "كتاب 2"
+    piano: "بيانو"
+    server: "خادم"
+    moon: "قمر"
+    monitor: "شاشة التحكم"
+    keyboard: "لوحة مفاتيح"
+    wall-clock: "ساعة حائط"
+    photoframe: "إطار صورة"
+    cube: "مكعب"
+    tv: "تلفاز"
+    pinguin: "بطريق"
+    sofa: "أريكة"
+    bin: "سلة مهملات"
+    banknote: "أوراق نقدية"
 _pages:
   newPage: "أنشئ صفحة جديدة"
   editPage: "عدّل الصفحة"
@@ -1137,21 +1205,16 @@ _pages:
   updated: "نجح تعديل الصفحة"
   deleted: "نجح حذف الصفحة"
   pageSetting: "إعدادات الصفحة"
-  viewSource: "اظهر المصدر"
   viewPage: "اعرض صفحاتك"
   like: "أعجبني"
   unlike: "أزل الإعجاب"
   my: "صفحاتي"
-  featured: "الأكثر شعبية"
   contents: "المحتوى"
-  title: "العنوان"
-  summary: "ملخص الصفحة"
   alignCenter: "توسيط العناصر"
   hideTitleWhenPinned: "اخف عنوان الصفحة عند تدبيسها في ملف الشخصي"
   font: "الخط"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
-  chooseBlock: "إضافة كتلة"
   selectType: "اختر النوع"
   enterVariableName: "أدخل اسم المتغيّر"
   variableNameIsAlreadyUsed: "هذا الاسم محجوز"
@@ -1160,8 +1223,6 @@ _pages:
   specialBlocks: "خاص"
   blocks:
     text: "نص"
-    textarea: "حقل نصي"
-    section: "قسم"
     image: "الصور"
     button: "زرّ"
     _if:

locales/bn-BD.yml

@@ -1 +0,0 @@
----

locales/cs-CZ.yml

@@ -207,6 +207,7 @@ uploadFromUrl: "Nahrát z URL adresy"
 uploadFromUrlDescription: "URL adresa souboru, který chcete nahrát"
 uploadFromUrlMayTakeTime: "Může trvat nějakou dobu, dokud nebude dokončeno nahrávání."
 explore: "Objevovat"
+games: "Misskey hry"
 messageRead: "Přečtené"
 noMoreHistory: "To je vše"
 startMessaging: "Zahájit chat"
@@ -271,8 +272,6 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Stránky"
 integration: "Integrace"
-connectService: "Připojit"
-disconnectService: "Odpojit"
 enableLocalTimeline: "Povolit lokální čas"
 enableGlobalTimeline: "Povolit globální čas"
 registration: "Registrace"
@@ -281,10 +280,8 @@ invite: "Pozvat"
 inMb: "V megabajtech"
 iconUrl: "Favicon URL"
 bannerUrl: "Baner URL"
-backgroundImageUrl: "Adresa URL obrázku pozadí"
 basicInfo: "Základní informace"
 hcaptcha: "hCaptcha"
-enableHcaptcha: "Aktivovat hCaptchu"
 hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Zapnout ReCAPTCHu"
@@ -296,7 +293,6 @@ antennaSource: "Zdroj Antény"
 enableServiceworker: "Povolit ServiceWorker"
 caseSensitive: "Rozlišuje malá a velká písmena"
 connectedTo: "Následující účty jsou připojeny"
-popularTags: "Populární tagy"
 userList: "Seznamy"
 about: "Informace"
 aboutMisskey: "O Misskey"
@@ -340,9 +336,6 @@ next: "Další"
 retype: "Zadejte znovu"
 noteOf: "{user} poznámky"
 inviteToGroup: "Pozvat do skupiny"
-newMessageExists: "Máte novou zprávu"
-onlyOneFileCanBeAttached: "Ke zprávě můžete přiložit jenom jeden soubor"
-signinRequired: "Přihlašte se, prosím"
 invitations: "Pozvat"
 checking: "Ověřuji"
 available: "K dispozici"
@@ -370,13 +363,10 @@ signinHistory: "Historie přihlášení"
 category: "Kategorie"
 tags: "Štítky"
 createAccount: "Vytvořit účet"
-existingAccount: "Existující účet"
-regenerate: "Obnovit"
 fontSize: "Velikost písma"
 openImageInNewTab: "Otevřít obrázek v novém panelu"
 dashboard: "Přehled"
 local: "Lokální"
-remote: "Vzdálené"
 total: "Celkem"
 weekOverWeekChanges: "Týdně"
 dayOverDayChanges: "Denně"
@@ -386,9 +376,6 @@ accountSettings: "Nastavení účtu"
 promotion: "Propagace"
 promote: "Propagovat"
 numberOfDays: "Počet dní"
-deleteAll: "Smazat vše"
-showFixedPostForm: "Zobrazit formulář pro nové příspěvky nad časovou osou"
-masterVolume: "Celková hlasitost"
 chooseEmoji: "Vybrat emotikon"
 unableToProcess: "Operace nebyla dokončena."
 recentUsed: "Naposledy použité"
@@ -398,57 +385,25 @@ installedApps: "Autorizované aplikace"
 nothing: "Nic nebylo nalezeno"
 lastUsedDate: "Poslední použití"
 state: "Stav"
-sort: "Seřadit"
 ascendingOrder: "Vzestupně"
 descendingOrder: "Sestupně"
 scratchpad: "Zápisník"
 output: "Výstup"
 script: "Skript"
-updateRemoteUser: "Aktualizovat informace o vzdáleném účtu"
 deleteAllFiles: "Smazat všechny soubory"
 deleteAllFilesConfirm: "Jste si jistí že chcete smazat všechny soubory?"
 userSuspended: "Tomuto uživateli byl pozastaven účet."
-menu: "Menu"
 addItem: "Přidat položku"
+rooms: "Místnost"
 inboxUrl: "Inbox URL"
 deletedNote: "Odstraněné příspěvky"
 invisibleNote: "Skryté příspěvky"
-description: "Popis"
-author: "Autor"
-manage: "Administrace"
-small: "Malé"
-generateAccessToken: "Vygenerovat přístupový token"
-permission: "Oprávnění"
-enableAll: "Povolit vše"
-disableAll: "Vypnout vše"
-notificationType: "Typy oznámení"
-edit: "Upravit"
-emailServer: "Mailový server"
-enableEmail: "Zapnout email dystribuci"
-email: "Email"
-emailAddress: "Emailová adresa"
-smtpConfig: "Konfigurace SMTP serveru"
 smtpHost: "Hostitel"
-smtpPort: "Port"
 smtpUser: "Uživatelské jméno"
 smtpPass: "Heslo"
-smtpSecureInfo: "Toto vypněte pokud používáte STARTTLS"
-makeActive: "Aktivovat"
-display: "Zobrazit"
-copy: "Kopírovat"
-logs: "Logy"
-database: "Databáze"
-create: "Vytvořit"
-notificationSetting: "Nastavení oznámení"
-useGlobalSetting: "Použít globální nastavení"
-other: "Ostatní"
-fileIdOrUrl: "ID nebo URL souboru"
-behavior: "Chování"
-sample: "Ukázka"
 clearCache: "Vyprázdnit mezipaměť"
 info: "Informace"
 user: "Uživatelé"
-administration: "Administrace"
 _email:
   _follow:
     title: "Máte nového následovníka"
@@ -457,8 +412,9 @@ _mfm:
   quote: "Citovat"
   emoji: "Vlastní emoji"
   search: "Vyhledávání"
+_reversi:
+  total: "Celkem"
 _theme:
-  description: "Popis"
   keys:
     mention: "Zmínění"
     renote: "Přeposlat"
@@ -486,6 +442,11 @@ _exportOrImport:
   userLists: "Seznamy"
 _timelines:
   home: "Domů"
+_rooms:
+  _roomType:
+    default: "Výchozí"
+  _furnitures:
+    monitor: "Monitorovat"
 _pages:
   blocks:
     image: "Obrázky"

locales/de-DE.yml

@@ -242,6 +242,7 @@ uploadFromUrlDescription: "URL der hochzuladenden Datei"
 uploadFromUrlRequested: "Upload angefordert"
 uploadFromUrlMayTakeTime: "Es kann eine Weile dauern, bis das Hochladen abgeschlossen ist."
 explore: "Erkunden"
+games: "Misskey-Spiele"
 messageRead: "Gelesen"
 noMoreHistory: "Kein weiterer Verlauf vorhanden"
 startMessaging: "Neuen Chat erstellen"
@@ -447,7 +448,6 @@ uiLanguage: "Sprache der Benutzeroberfläche"
 groupInvited: "Du wurdest in eine Gruppe eingeladen"
 aboutX: "Über {x}"
 useOsNativeEmojis: "Eingebaute Emojis des Betriebssystems benutzen"
-disableDrawer: "Keine ausfahrbaren Menüs verwenden"
 youHaveNoGroups: "Keine Gruppen vorhanden"
 joinOrCreateGroup: "Lass dich zu einer Gruppe einladen oder erstelle deine eigene."
 noHistory: "Kein Verlauf"
@@ -536,6 +536,7 @@ yourAccountSuspendedDescription: "Dieses Benutzerkonto wurde gesperrt, da es geg
 menu: "Menü"
 divider: "Trenner"
 addItem: "Element hinzufügen"
+rooms: "Raum"
 relays: "Relays"
 addRelay: "Relay hinzufügen"
 inboxUrl: "inbox-URL"
@@ -612,6 +613,7 @@ regenerateLoginToken: "Anmeldungstoken regenerieren"
 regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
 setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
 fileIdOrUrl: "Datei-ID oder URL"
+chatOpenBehavior: "Verhalten des Chatfensters bei Öffnung"
 behavior: "Verhalten"
 sample: "Beispiel"
 abuseReports: "Meldungen"
@@ -619,11 +621,8 @@ reportAbuse: "Melden"
 reportAbuseOf: "{name} melden"
 fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
 abuseReported: "Die Meldung wurde versendet. Vielen Dank."
-reporter: "Melder"
 reporteeOrigin: "Herkunft des Gemeldeten"
 reporterOrigin: "Herkunft des Meldenden"
-forwardReport: "Meldung an fremde Instanz weiterleiten"
-forwardReportIsAnonymous: "Anstatt deines Benutzerkontos wird bei der fremden Instanz ein anonymes Systemkonto als Melder angezeigt."
 send: "Senden"
 abuseMarkAsResolved: "Meldung als gelöst markieren"
 openInNewTab: "In neuem Tab öffnen"
@@ -671,6 +670,7 @@ emailVerified: "Email-Adresse bestätigt"
 noteFavoritesCount: "Anzahl an als Favorit markierter Notizen"
 pageLikesCount: "Anzahl an als \"Gefällt mir\" markierter Seiten"
 pageLikedCount: "Anzahl erhaltener \"Gefällt mir\" auf Seiten"
+reversiCount: "Anzahl an Reversi-Runden"
 contact: "Kontakt"
 useSystemFont: "Standardschriftart des Systems verwenden"
 clips: "Clips"
@@ -746,7 +746,6 @@ notRecommended: "Nicht empfohlen"
 botProtection: "Bot-Schutz"
 instanceBlocking: "Blockierte Instanzen"
 selectAccount: "Benutzerkonto auswählen"
-switchAccount: "Konto wechseln"
 enabled: "Aktiviert"
 disabled: "Deaktiviert"
 quickAction: "Schnellaktionen"
@@ -819,7 +818,6 @@ leaveGroup: "Gruppe verlassen"
 leaveGroupConfirm: "Möchtest du \"{name}\" wirklich verlassen?"
 useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
 welcomeBackWithName: "Willkommen zurück, {name}"
-clickToFinishEmailVerification: "Drücke bitte auf [{ok}], um die Email-Bestätigung abzuschließen."
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
@@ -945,6 +943,39 @@ _mfm:
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
   rotate: "Drehen"
   rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel"
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Spieleinstellungen"
+  chooseBoard: "Spielbrett auswählen"
+  blackOrWhite: "Schwarz/Weiß"
+  blackIs: "{name} spielt Schwarz"
+  rules: "Regeln"
+  botSettings: "Optionen des Computergegners"
+  thisGameIsStartedSoon: "Dieses Spiel beginnt in wenigen Sekunden"
+  waitingForOther: "Warte auf den Zug des Gegenspielers"
+  waitingForMe: "Warte auf deinen Zug"
+  waitingBoth: "Mach dich bereit"
+  ready: "Bereit"
+  cancelReady: "Nicht bereit"
+  opponentTurn: "Zug deines Gegners"
+  myTurn: "Dein Zug"
+  turnOf: "{name} ist am Zug"
+  pastTurnOf: "Zug von {name}"
+  surrender: "Aufgeben"
+  surrendered: "Durch Aufgabe"
+  drawn: "Unentschieden"
+  won: "{name} gewinnt"
+  black: "Schwarz"
+  white: "Weiß"
+  total: "Gesamt"
+  turnCount: " Zug {count}"
+  myGames: "Meine Runden"
+  allGames: "Alle Runden"
+  ended: "Beendet"
+  playing: "Laufend"
+  isLlotheo: "Der mit weniger Steinen gewinnt (Llotheo)"
+  loopedMap: "Wiederholendes Spielbrett"
+  canPutEverywhere: "Steine können überall platziert werden"
 _instanceTicker:
   none: "Nie anzeigen"
   remote: "Für Benutzer fremder Instanzen anzeigen"
@@ -1064,6 +1095,8 @@ _sfx:
   chatBg: "Chat (Hintergrund)"
   antenna: "Antennen"
   channel: "Kanalbenachrichtigung"
+  reversiPutBlack: "Reversi: Schwarz macht einen Zug"
+  reversiPutWhite: "Reversi: Weiß macht einen Zug"
 _ago:
   unknown: "Unbekannt"
   future: "Zukunft"
@@ -1286,6 +1319,68 @@ _timelines:
   local: "Lokal"
   social: "Sozial"
   global: "Global"
+_rooms:
+  roomOf: "{user}'s Raum"
+  addFurniture: "Möbel hinzufügen"
+  translate: "Bewegen"
+  rotate: "Drehen"
+  exit: "Zurück"
+  remove: "Entfernen"
+  clear: "Aufräumen"
+  clearConfirm: "Möchtest du wirklich alle Möbel entfernen?"
+  leaveConfirm: "Es gibt ungespeicherte Änderungen. Möchtest du wirklich gehen?"
+  chooseImage: "Bild auswählen"
+  roomType: "Raumart"
+  carpetColor: "Teppichfarbe"
+  _roomType:
+    default: "Standard"
+    washitsu: "Japanischer Stil"
+  _furnitures:
+    milk: "Milchkarton"
+    bed: "Bett"
+    low-table: "Niedrigtisch"
+    desk: "Schreibtisch"
+    chair: "Stuhl"
+    chair2: "Stuhl 2"
+    fan: "Ventilator"
+    pc: "Computer"
+    plant: "Deko-Pflanze"
+    plant2: "Deko-Pflanze 2"
+    eraser: "Radiergummi"
+    pencil: "Bleistift"
+    pudding: "Pudding"
+    cardboard-box: "Pappkarton"
+    cardboard-box2: "Pappkarton 2"
+    cardboard-box3: "Pappkarton 3"
+    book: "Buch"
+    book2: "Buch 2"
+    piano: "Piano"
+    facial-tissue: "Taschentücher"
+    server: "Server"
+    moon: "Mond"
+    corkboard: "Pinnwand"
+    mousepad: "Mauspad"
+    monitor: "Monitor"
+    keyboard: "Tastatur"
+    carpet-stripe: "Gestreifter Teppich"
+    mat: "Matte"
+    color-box: "Regal"
+    wall-clock: "Wanduhr"
+    photoframe: "Bilderrahmen"
+    cube: "Würfel"
+    tv: "Fernseher"
+    pinguin: "Pinguin"
+    rubik-cube: "Zauberwürfel"
+    poster-h: "Poster (Horizontal)"
+    poster-v: "Poster (Vertikal)"
+    sofa: "Sofa"
+    spiral: "Spiraltreppe"
+    bin: "Papierkorb"
+    cup-noodle: "Instantnudeln"
+    holo-display: "Holographischer Bildschirm"
+    energy-drink: "Energy Drink"
+    doll-ai: "Ai-Puppe"
+    banknote: "Geldscheine"
 _pages:
   newPage: "Seite erstellen"
   editPage: "Seite bearbeiten"

locales/en-US.yml

@@ -242,6 +242,7 @@ uploadFromUrlDescription: "URL of the file you want to upload"
 uploadFromUrlRequested: "Upload requested"
 uploadFromUrlMayTakeTime: "It may take some time until the upload is complete."
 explore: "Explore"
+games: "Misskey Games"
 messageRead: "Read"
 noMoreHistory: "There is no further history"
 startMessaging: "Start a new chat"
@@ -447,7 +448,6 @@ uiLanguage: "User interface language"
 groupInvited: "You've been invited to a group"
 aboutX: "About {x}"
 useOsNativeEmojis: "Use OS native Emoji"
-disableDrawer: "Don't use drawer-style menus"
 youHaveNoGroups: "You have no groups"
 joinOrCreateGroup: "Get invited to a group or create your own."
 noHistory: "No history available"
@@ -536,6 +536,7 @@ yourAccountSuspendedDescription: "This account has been suspended due to breakin
 menu: "Menu"
 divider: "Divider"
 addItem: "Add Item"
+rooms: "Room"
 relays: "Relays"
 addRelay: "Add Relay"
 inboxUrl: "Inbox URL"
@@ -612,6 +613,7 @@ regenerateLoginToken: "Regenerate login token"
 regenerateLoginTokenDescription: "Regenerate the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
 setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
 fileIdOrUrl: "File-ID or URL"
+chatOpenBehavior: "Behavior of the chat window when opened"
 behavior: "Behavior"
 sample: "Sample"
 abuseReports: "Reports"
@@ -619,11 +621,8 @@ reportAbuse: "Report"
 reportAbuseOf: "Report {name}"
 fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific note, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
-reporter: "Reporter"
 reporteeOrigin: "Reportee Origin"
 reporterOrigin: "Reporter Origin"
-forwardReport: "Forward report to remote instance"
-forwardReportIsAnonymous: "Instead of your account, an anonymous system account will be displayed as reporter at the remote instance."
 send: "Send"
 abuseMarkAsResolved: "Mark report as resolved"
 openInNewTab: "Open in new tab"
@@ -671,6 +670,7 @@ emailVerified: "Email has been verified"
 noteFavoritesCount: "Number of favorite notes"
 pageLikesCount: "Number of liked Pages"
 pageLikedCount: "Number of received Page likes"
+reversiCount: "Number of Reversi matches"
 contact: "Contact"
 useSystemFont: "Use the system's default font"
 clips: "Clips"
@@ -746,7 +746,6 @@ notRecommended: "Not recommended"
 botProtection: "Bot Protection"
 instanceBlocking: "Blocked Instances"
 selectAccount: "Select account"
-switchAccount: "Switch account"
 enabled: "Enabled"
 disabled: "Disabled"
 quickAction: "Quick actions"
@@ -795,7 +794,6 @@ pubSub: "Pub/Sub Accounts"
 lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
-breakFollow: "Unfollow"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"
@@ -819,7 +817,6 @@ leaveGroup: "Leave Group"
 leaveGroupConfirm: "Are you sure you want to leave \"{name}\"?"
 useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"
 welcomeBackWithName: "Welcome back, {name}"
-clickToFinishEmailVerification: "Please click [{ok}] to complete email verification."
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
@@ -945,6 +942,39 @@ _mfm:
   sparkleDescription: "Gives content a sparkling particle effect."
   rotate: "Rotate"
   rotateDescription: "Turns content by a specified angle."
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Game settings"
+  chooseBoard: "Choose a board"
+  blackOrWhite: "Black/White"
+  blackIs: "{name} is playing Black"
+  rules: "Rules"
+  botSettings: "Bot options"
+  thisGameIsStartedSoon: "The game will start in a few seconds"
+  waitingForOther: "Waiting for the opponent's turn"
+  waitingForMe: "Waiting for your turn"
+  waitingBoth: "Get ready"
+  ready: "Ready"
+  cancelReady: "Cancel ready"
+  opponentTurn: "Opponent's turn"
+  myTurn: "Your turn"
+  turnOf: "It's {name}'s turn"
+  pastTurnOf: "{name}'s turn"
+  surrender: "Surrender"
+  surrendered: "By surrender"
+  drawn: "Draw"
+  won: "{name} wins"
+  black: "Black"
+  white: "White"
+  total: "Total"
+  turnCount: "Turn {count}"
+  myGames: "My rounds"
+  allGames: "All rounds"
+  ended: "Ended"
+  playing: "Currently playing"
+  isLlotheo: "The one with fewer stones wins (Llotheo)"
+  loopedMap: "Looping map"
+  canPutEverywhere: "Tiles are placeable everywhere"
 _instanceTicker:
   none: "Never show"
   remote: "Show for remote users"
@@ -1064,6 +1094,8 @@ _sfx:
   chatBg: "Chat (Background)"
   antenna: "Antennas"
   channel: "Channel notifications"
+  reversiPutBlack: "Reversi: Black makes a move"
+  reversiPutWhite: "Reversi: White makes a move"
 _ago:
   unknown: "Unknown"
   future: "Future"
@@ -1286,6 +1318,68 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
+_rooms:
+  roomOf: "{user}'s room"
+  addFurniture: "Place furniture"
+  translate: "Move"
+  rotate: "Rotate"
+  exit: "Back"
+  remove: "Remove"
+  clear: "Remove All"
+  clearConfirm: "Do you really want to remove all furniture from your room?"
+  leaveConfirm: "There are unsaved changes. Do you really want to leave?"
+  chooseImage: "Select an image"
+  roomType: "Room type"
+  carpetColor: "Carpet color"
+  _roomType:
+    default: "Default"
+    washitsu: "Japanese-style"
+  _furnitures:
+    milk: "Milk carton"
+    bed: "Bed"
+    low-table: "Low Table"
+    desk: "Desk"
+    chair: "Chair"
+    chair2: "Chair 2"
+    fan: "Fan"
+    pc: "Computer"
+    plant: "Houseplant"
+    plant2: "Houseplant 2"
+    eraser: "Eraser"
+    pencil: "Pencil"
+    pudding: "Pudding"
+    cardboard-box: "Cardboard Box"
+    cardboard-box2: "Cardboard Box 2"
+    cardboard-box3: "Cardboard Box 3"
+    book: "Book"
+    book2: "Book 2"
+    piano: "Piano"
+    facial-tissue: "Tissues"
+    server: "Server"
+    moon: "Moon"
+    corkboard: "Cork board"
+    mousepad: "Mousepad"
+    monitor: "Monitor"
+    keyboard: "Keyboard"
+    carpet-stripe: "Carpet (striped)"
+    mat: "Mat"
+    color-box: "Bookshelf"
+    wall-clock: "Wall clock"
+    photoframe: "Picture frame"
+    cube: "Cube"
+    tv: "TV"
+    pinguin: "Penguin"
+    rubik-cube: "Puzzle Cube"
+    poster-h: "Poster (Horizontal)"
+    poster-v: "Poster (Vertical)"
+    sofa: "Sofa"
+    spiral: "Spiral Staircase"
+    bin: "Garbage can"
+    cup-noodle: "Cup noodles"
+    holo-display: "Holographic display"
+    energy-drink: "Energy drink"
+    doll-ai: "Ai doll"
+    banknote: "Pile of money"
 _pages:
   newPage: "Create a new Page"
   editPage: "Edit this Page"

locales/eo-UY.yml

@@ -1,8 +1,8 @@
 ---
 _lang_: "Esperanto"
 headlineMisskey: "Reto konektita per notoj"
-introMisskey: "Bonvenon! Misskey estas malfermitkoda malcentraliza etbloga servo.\nKreu \"noto\"n por diskonigi nunan aferon, aŭ por paroli vian penson al ĉiuj ĉirkaŭ vi. 📡\nLa funkcio \"reago\" ebligas esprimi rapide vian senton pri la noto de la alia en la Fediverso. 👍\nBonvole esploru novan mondon. 🚀"
+introMisskey: "Bonvenon! Misskey estas malfermitkoda malcentraliza etbloga servo.\nKreu \"noto\"n por diskonigi nunan aferon, aŭ por paroli vian penson al ĉiuj ĉirkaŭ vi. 📡\nLa funkcion \"reago\" ebligas esprimi rapide vian senton pri la noto de la alia en la Fediverso. 👍\nBonvole esploru novan mondon. 🚀"
-monthAndDay: "La {day}a de l' {month}a"
+monthAndDay: "La {day}a de la {month}a monato"
 search: "Serĉi"
 notifications: "Sciigoj"
 username: "Uzantnomo"
@@ -23,7 +23,7 @@ otherSettings: "Aliaj agordoj"
 openInWindow: "Malfermi en nova fenestro"
 profile: "Profilo"
 timeline: "Templinio"
-noAccountDescription: "La uzanto ankoraŭ ne skribis la prion de sia profilo."
+noAccountDescription: "Neniu priskribo"
 login: "Saluti"
 loggingIn: "Salutado…"
 logout: "Adiaŭi"
@@ -41,10 +41,10 @@ cantFavorite: "Oni ne povis aldoni al viaj preferaĵoj."
 pin: "Alpingli"
 unpin: "Depingli"
 copyContent: "Kopii enhavon"
-copyLink: "Kopii la ligilon"
+copyLink: "Kopii ligilon"
 delete: "Forviŝi"
 deleteAndEdit: "Forviŝi kaj redakti"
-deleteAndEditConfirm: "Ĉu vi certas ke vi volas foriginte redakti la noton? Vi perdos ĉiujn reagojn, plusendojn, kaj respondojn je ĝi."
+deleteAndEditConfirm: "Ĉu vi certas ke vi volas redakti foriginte la noton? Tio forviŝos reagojn, plusendojn, kaj respondojn ĉiujn apartenantajn al ĝi."
 addToList: "Aldoni al listo"
 sendMessage: "Sendi mesaĝon"
 copyUsername: "Kopii uzantnomon"
@@ -69,7 +69,7 @@ lists: "Listoj"
 noLists: "Neniu listo"
 note: "Noti"
 notes: "Notoj"
-following: "Sekvata"
+following: "Sekvatoj"
 followers: "Sekvantoj"
 followsYou: "Sekvas vin"
 createList: "Krei liston"
@@ -97,12 +97,11 @@ quote: "Citi"
 pinnedNote: "Alpinglita noto"
 pinned: "Alpingli"
 you: "Vi"
-clickToShow: "Klaki por malkaŝi"
+clickToShow: "Klaku por malkaŝu"
 sensitive: "Enhavo ne estas deca por laborejo (NSFW)"
 add: "Aldoni"
 reaction: "Reagoj"
-reactionSetting: "Reagoj aperontaj en la elektilo de reagoj"
+rememberNoteVisibility: "Rememori la agordon de videbleco de la laste sendita"
-rememberNoteVisibility: "Rememori la agordon de videbleco de la lasta afiŝado"
 attachCancel: "Deigi aldonaĵon"
 markAsSensitive: "Troviĝi NSFW"
 unmarkAsSensitive: "Ne troviĝi NSFW"
@@ -122,7 +121,6 @@ selectAntenna: "Elekti antenon"
 selectWidget: "Elekti enestraĵon"
 editWidgets: "Redakti fenestraĵon"
 editWidgetsExit: "Fini la redaktadon"
-customEmojis: "Propraj emoĝioj"
 emoji: "Emoĵio"
 emojis: "Emoĵio"
 emojiName: "Nomo de la emoĵio"
@@ -130,12 +128,12 @@ emojiUrl: "URL de la emoĵio"
 addEmoji: "Aldoni emoĵion"
 settingGuide: "Agordaj rekomendoj"
 cacheRemoteFiles: "Stapli forajn dosierojn"
-flagAsBot: "Marki kiel esti uzanto de roboto"
+flagAsBot: "Marki kiel uzata de roboto"
-flagAsCat: "Marki kiel esti kato"
+flagAsCat: "Agordi kiel kat-iĝa"
+flagAsCatDescription: "Se vi estas kato, ebligu la agordon."
 autoAcceptFollowed: "Aŭtomate akcepti la peton de sekvado far uzantoj kiujn vi sekvas"
 addAccount: "Aldoni konton"
-loginFailed: "Saluto malsukcesis"
+showOnRemote: "Vidi ĉe la surloka nodo"
-showOnRemote: "Vidi pli al la originala profilo"
 general: "Ĝenerala"
 wallpaper: "Ekranfonoj"
 setWallpaper: "Apliki ekranfonon"
@@ -150,7 +148,6 @@ recipient: "Ricevonton"
 annotation: "Komentarioj"
 federation: "Federaĵo"
 instances: "Nodoj"
-registeredAt: "Registrita je"
 latestRequestSentAt: "La laste sendita peto"
 latestRequestReceivedAt: "La laste ricevita peto "
 latestStatus: "Laŭstato"
@@ -166,7 +163,7 @@ withNFiles: "{n} dosiero(j)"
 monitor: "Monitoro"
 network: "Reto"
 disk: "Disko"
-instanceInfo: "Informoj sur la nodo"
+instanceInfo: "Informoj pri la nodo"
 statistics: "Statistikoj"
 clearCachedFiles: "Malplenigi la staplon"
 clearCachedFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn forajn dosierojn en la staplo?"
@@ -222,6 +219,7 @@ uploadFromUrl: "Alŝuti de URL"
 uploadFromUrlDescription: "URL de la dosiero kiun vi volas alŝuti"
 uploadFromUrlRequested: "La alŝutado estis patita"
 explore: "Esplori"
+games: "Miskiaj Ludoj"
 messageRead: "Legita"
 noMoreHistory: "Ne plu de la historio"
 startMessaging: "Komenci babiladon"
@@ -230,7 +228,7 @@ agreeTo: "Mi akceptas {0}"
 tos: "Kondiĉoj de uzado"
 start: "Komenciĝi"
 home: "Hejma"
-remoteUserCaution: "Pro fora uzanto, la infomoj ne estas tuto."
+remoteUserCaution: "Ĉi tiuj infomoj ne estas kompletaj, ĉar ili estas pri uzanto el la fora."
 activity: "Aktiveco"
 images: "Bildoj"
 birthday: "Naskiĝdato"
@@ -281,7 +279,7 @@ normal: "Normala"
 instanceName: "Nomo de la nodo"
 instanceDescription: "Priskribo de la nodo "
 maintainerName: "Nomo de la administranto"
-maintainerEmail: "Retpoŝtadreso de la administranto"
+maintainerEmail: "Retpoŝta adreso de la administranto"
 tosUrl: "URL de kondiĉoj de uzado"
 thisYear: "Ĉi-jare"
 thisMonth: "Ĉi-monate"
@@ -305,9 +303,9 @@ bannerUrl: "URL de standardo"
 backgroundImageUrl: "URL de la fona bildo"
 basicInfo: "Baza informo"
 pinnedUsers: "Alpinglita uzanto"
-pinnedUsersDescription: "Laŭlinigu uzantnomojn en ĉiu linio, por alpingli al la paĝoj ekz \"Esplori\"."
+pinnedUsersDescription: "Listigu uzantnomojn apartige en ĉiu linio por alpingli al la paĝoj ekz \"Esplori\"."
 pinnedPages: "Alpinglitaj paĝoj"
-pinnedPagesDescription: "Laŭlinigu dosierindikojn de paĝo en ĉiu linio, por alpingli al la ĉefpaĝo de la nodo."
+pinnedPagesDescription: "Listigu dosierindiko apartige en ĉiu linio por alpingli al la ĉefpaĝo de la nodo."
 pinnedNotes: "Alpinglita noto"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Ebligi hCaptcha"
@@ -321,11 +319,8 @@ antennas: "Antenoj"
 manageAntennas: "Administri antenojn"
 name: "Nomo"
 antennaSource: "Fonto de la anteno"
-antennaKeywords: "Ricevi per ĉefterminoj"
-antennaExcludeKeywords: "Krom ĉefterminoj"
 notifyAntenna: "Oni sciigos novajn notojn"
 withFileAntenna: "Nur kun aldonaĵo"
-enableServiceworker: "Aktivigi ServiceWorker"
 withReplies: "Inkluzive respondoj"
 connectedTo: "Sekva konto estas konektita"
 notesAndReplies: "Kun respondoj"
@@ -365,7 +360,7 @@ cacheClear: "Malplenigi staplon"
 markAsReadAllNotifications: "Marki ĉiujn sciigojn kiel legita"
 markAsReadAllTalkMessages: "Marki ĉiujn retbabiladojn kiel legita"
 help: "Manlibro de uzado"
-inputMessageHere: "Entajpu mesaĝon tie"
+inputMessageHere: "Entajpu masaĝo tie ĉi"
 close: "Fermi"
 group: "Grupo"
 groups: "Grupoj"
@@ -376,7 +371,7 @@ invites: "Inviti"
 groupName: "Grupa nomo"
 members: "Membroj"
 transfer: "Movi"
-messagingWithUser: "Private babili "
+messagingWithUser: "Babili private"
 messagingWithGroup: "Babili grupe"
 title: "Titolo"
 text: "Teksto"
@@ -432,7 +427,6 @@ clientSettings: "Agordoj de kliento"
 accountSettings: "Agordoj de konto"
 numberOfDays: "Nombro de tagoj"
 hideThisNote: "Kaŝi la noton"
-showFeaturedNotesInTimeline: "Montri en via templinio notojn de la tendenco"
 objectStorageBaseUrl: "Baza URL"
 objectStoragePrefix: "Prefix"
 objectStorageRegion: "Regiono"
@@ -458,9 +452,9 @@ nothing: "Neniu"
 installedDate: "Dato de instalado"
 lastUsedDate: "Lastfoje uzita je"
 state: "Stato"
-sort: "Ordigi laŭ"
+sort: "Ordigado"
-ascendingOrder: "Kreska ordo"
+ascendingOrder: "Kreski"
-descendingOrder: "Malkreska ordo"
+descendingOrder: "Malkreski"
 scratchpad: "Malneta redaktilo"
 output: "Elmeto"
 script: "Skripto"
@@ -468,10 +462,11 @@ disablePagesScript: "Malebligi AiScript en la paĝoj"
 deleteAllFiles: "Forviŝi ĉiujn dosierojn"
 deleteAllFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn dosierojn?"
 removeAllFollowing: "Ĉesi sekvi ĉiujn sekvatojn"
-userSuspended: "La uzanto estas flostigita."
+userSuspended: "Ĉi tiu uzanto estas flostigita."
-userSilenced: "La uzanto estas mutigita."
+userSilenced: "Ĉi tiu uzanto estas mutigita."
 menu: "Menuo"
 addItem: "Aldoni novaĵon"
+rooms: "Ĉambro"
 deletedNote: "Forviŝita noto"
 invisibleNote: "Malpublikigita noto"
 enableInfiniteScroll: "Ebligi infinitan rulumon"
@@ -502,17 +497,16 @@ disableAll: "Malebligi ĉiujn"
 notificationType: "Tipo de sciigoj"
 edit: "Redakti"
 emailServer: "Retpoŝta servilo"
-enableEmail: "Ebligi dissendon de retpoŝto"
+enableEmail: "Ebligi dissendon el retpoŝto"
-emailConfigInfo: "Uzata por konfirmi vian retadreson kiam registri  kaj por restarigi vian pasvorton"
 email: "Retpoŝto"
-emailAddress: "Retpoŝtadreso"
+emailAddress: "Retpoŝta adreso"
 smtpConfig: "Agordoj de SMTP servilo"
 smtpHost: "Transa servilo"
 smtpPort: "Pordo"
 smtpUser: "Uzantnomo"
 smtpPass: "Pasvorto"
 wordMute: "Silentigi specifajn vortojn"
-userSaysSomething: "{name} diras ion"
+userSaysSomething: "{name} parolis ion"
 makeActive: "Aktivigi"
 display: "Vidi"
 copy: "Kopii"
@@ -528,11 +522,15 @@ useGlobalSetting: "Oni uzas malloka agordo"
 other: "Aliaj"
 regenerateLoginToken: "Regeneri la aŭtentikigan pecon"
 fileIdOrUrl: "Dosiera identigilo aŭ URL"
+chatOpenBehavior: "Konduto por malfermi la fenestron de babilejo"
 behavior: "Konduto"
 sample: "Ekzemplo"
+abuseReports: "Signaloj"
+reportAbuse: "Signalo"
+reportAbuseOf: "Signali kontraŭ {name}"
 send: "Sendi"
 openInNewTab: "Malfermi en nova langeto"
-editTheseSettingsMayBreakAccount: "Redakti tiujn agordojn povas damaĝi vian konton."
+editTheseSettingsMayBreakAccount: "Redakti ĉi tiujn agordojn povas damaĝi vian konton."
 instanceTicker: "Nomo de la nodo sendinta notojn"
 waitingFor: "Atendado pro {x}"
 random: "Hazarde"
@@ -555,23 +553,22 @@ sentReactionsCount: "La nombro de la reagoj senditaj"
 receivedReactionsCount: "La nombro de la reagoj ricevitaj"
 yes: "Jes"
 no: "Ne"
-driveFilesCount: "La nombro de la dosieroj sur la disko"
+driveFilesCount: "La nombro de la dosieroj ĉe la disko"
 notSet: "Ne elektita"
-emailVerified: "Via retpoŝtadreso estis kontrolita."
+emailVerified: "Via retpoŝto estis kontrolita."
 noteFavoritesCount: "La nombro de notoj preferataj"
-pageLikesCount: "La nombro de paĝa plaĉon"
+pageLikesCount: "La nombro de paĝoj kiun la uzanto preferas"
-pageLikedCount: "La nombro de la ricevita \"Mi plaĉas\""
+pageLikedCount: "La nombro de uzantoj, kiuj preferas paĝon de ĉi tiu uzanto"
 contact: "Kontakto"
 useSystemFont: "Uzi la tiparon implicitan de la sistemo"
 developer: "Evoluiganto"
-makeExplorable: "La konton videbligi sur la paĝo \"Esplori\""
+makeExplorable: "Videbligi konton sur la paĝo \"Esplori\""
-makeExplorableDescription: "Se vi elŝaltas tiun, via konto ne montros sur la paĝo \"Esplori\"."
+makeExplorableDescription: "Se vi elŝaltas tiun, via konto ne montros en la paĝo \"Esplori\"."
 duplicate: "Duobligi"
 left: "Maldekstra"
 center: "Centra"
 wide: "Vasta"
 narrow: "Malvasta"
-needReloadToApply: "Tiu agordo estos aplikita nur poste reŝargi."
 showTitlebar: "Videbligi titolan stangon"
 clearCache: "Malplenigi staplon"
 onlineUsersCount: "{n} uzantoj estas surlineaj"
@@ -588,7 +585,7 @@ updatedAt: "Laste ĝisdatigita"
 saveConfirm: "Ĉu vi konservas la ŝanĝon?"
 deleteConfirm: "Ĉu certas forviŝi?"
 closeAccount: "Forigi konton"
-currentVersion: "La aktuala versio"
+currentVersion: "Nuna versio"
 latestVersion: "La plej nova versio"
 youAreRunningUpToDateClient: "Vi uzas la plej novan version de via kliento."
 newVersionOfClientAvailable: "Nova versio de via kliento estas disponebla."
@@ -620,7 +617,6 @@ memo: "Memorigilo"
 high: "Alta"
 middle: "Meza"
 low: "Malalta"
-emailNotConfiguredWarning: "Vi ne agordis retpoŝtadreso."
 customCss: "Personecigita CSS"
 global: "Malloka"
 sent: "Sendi"
@@ -633,21 +629,16 @@ translate: "Traduki"
 translatedFrom: "Tradukita el {x}"
 breakFollow: "Ĉesigi la sekvadon al vi"
 itsOn: "Ŝaltita"
-emailRequiredForSignup: "Registri konton devas konformi retpoŝtadreson"
 unread: "Nelegita"
 controlPanel: "Ŝaltpodio"
 manageAccounts: "Bonteni la kontojn"
 classic: "Klasika"
-muteThread: "Silentigi la mesaĝaron"
+ffVisibility: "Videbleco pri viaj sekvataro/sekvantaro\n"
-unmuteThread: "Malsilentigi la mesaĝaron"
+ffVisibilityDescription: "Agordi la videblecon kiu povas vidi tiujn kiujn vi sekvas kaj tiujn kiuj sekvas vin."
-ffVisibility: "Videbleco de viaj sekvatoj/sekvantoj"
+continueThread: "Vidi pli mesaĝarojn"
-ffVisibilityDescription: "Oni permesas agordi tiuln kiuj povas vidi la homojn kiujn vi sekvas, kaj la homojn kiuj sekvas vin."
-continueThread: "Pli vidi la mesaĝaron"
 incorrectPassword: "Nevalida pasvorto"
 leaveGroup: "Eliĝi el la grupo"
 leaveGroupConfirm: "Ĉu vi certas ke vi volas eliĝi el la grupo {name}?"
-welcomeBackWithName: "Bonrevenon, {name}!"
-clickToFinishEmailVerification: "Volu klaki [{ok}] por fini la konfirmon de vian retadreson"
 _emailUnavailable:
   used: "La retpoŝto jam estas uzita."
   format: "Nevalida formato."
@@ -655,7 +646,7 @@ _emailUnavailable:
   smtp: "Tiu retpoŝta servilo ne respondas"
 _ffVisibility:
   public: "Publika"
-  followers: "Nur al sekvantoj"
+  followers: "Afiŝi nur al sekvantoj"
   private: "Malpublikigita"
 _signup:
   emailAddressInfo: "Entajpu vian retpoŝton"
@@ -664,7 +655,7 @@ _accountDelete:
 _ad:
   back: "Nuligi"
 _forgotPassword:
-  enterEmail: "Entajpu la retpoŝton kiun vi registrigis al via konto. Ligilo por restarigi pasvorton estos sendita al la retadreso."
+  enterEmail: "Entajpu la retpoŝton kiun vi registrigis al via konto. Ligilo por restarigi pasvorton estos sendita al la retpoŝto."
 _gallery:
   liked: "Ŝatitaj notoj"
   like: "Ŝati"
@@ -702,7 +693,6 @@ _mfm:
   inlineMath: "Formulo (en linio)"
   blockMath: "Formulo (bloko)"
   quote: "Citi"
-  emoji: "Propraj emoĝioj"
   search: "Serĉi"
   flip: "Inversa"
   x2: "Granda"
@@ -710,6 +700,8 @@ _mfm:
   x4: "Pli grandega"
   font: "Presliteraro"
   rotate: "Orientiĝo"
+_reversi:
+  total: "Entute"
 _instanceTicker:
   none: "Ne montri"
   remote: "Montri al foraj uzantoj"
@@ -722,11 +714,9 @@ _channel:
   setBanner: "Apliki standardan bildon"
   removeBanner: "Forviŝi la standardan bildon"
   owned: "Bontenitaj de vi"
-  following: "Sekvado"
+  following: "Sekvante"
   usersCount: "{n} partoprenantoj"
 _menuDisplay:
-  sideFull: "Flanko"
-  sideIcon: "Flanko (bildsimbolo)"
   top: "Supro"
   hide: "Kaŝi"
 _wordMute:
@@ -740,7 +730,6 @@ _theme:
   description: "Priskribo"
   defaultValue: "Implicitaĵa valoro"
   color: "Koloro"
-  func: "Funkcio"
   darken: "Malbrileco"
   lighten: "Brileco"
   keys:
@@ -780,12 +769,12 @@ _time:
 _tutorial:
   title: "Uzado de Misskey"
   step1_1: "Bonvenon."
-  step7_2: "Se vi volas pli scii pri Misskey, vidu la fakon {help}."
+  step7_2: "Se vi volas scii pli pri Misskey, rigardu la fakon {help}."
   step7_3: "Do, bonvolu amuziĝi sur Misskey🚀"
 _2fa:
   registerKey: "Nove registri ŝlosilon"
 _permissions:
-  "read:account": "Vidi la informojn de via konto"
+  "read:account": "Legado de la informoj pri via konto"
   "write:account": "Redatado de la informoj de via konto"
   "read:blocks": "Vidi vian liston de uzantoj blokitaj"
   "write:blocks": "Redakti vian liston de blokitoj"
@@ -793,8 +782,8 @@ _permissions:
   "write:drive": "Ĉia operacio por skribi, forviŝi, aŭ alimaniere ŝanĝi la informon de dosiero en via disko de Misskey"
   "read:favorites": "Vidi vian liston de preferaĵoj"
   "write:favorites": "Redakti vian liston de preferaĵoj"
-  "read:following": "Vidi la informojn de sekvo"
+  "read:following": "Vidi la infomaciojn pri tio, kion vi sekvas"
-  "write:following": "Sekvi/ Ĉesi sekvi alian uzanton"
+  "write:following": "Sekvi aŭ malsekvi alian uzanton"
   "read:messaging": "Vidi viajn retbabiladojn"
   "write:messaging": "Administri viajn retbabiladojn"
   "read:mutes": "Vidi vian liston de silentigitoj"
@@ -809,7 +798,7 @@ _permissions:
   "read:channels": "Vidi kanalojn"
 _antennaSources:
   all: "Ĉiuj notoj"
-  homeTimeline: "Notoj de la uzantoj kiujn vi sekvas"
+  homeTimeline: "Notoj far uzantoj kiujn vi sekvas"
 _weekday:
   sunday: "Dimanĉo"
   monday: "Lundo"
@@ -841,31 +830,24 @@ _poll:
   closed: "Oni jam balotis ĝin"
 _visibility:
   public: "Publika"
-  publicDescription: "Publikigi al ĉiuj en la Fediverso"
+  publicDescription: "Afiŝi al ĉiuj en la Fediverso"
   home: "Hejma"
   homeDescription: "Dissendi nur sur hejma templinio"
   followers: "Nur al sekvantoj"
-  followersDescription: "Videbligi nur al sekvantoj"
+  followersDescription: "Afiŝi nur al sekvantoj"
-  specified: "Rekte montrita"
+  specified: "Rekte"
-  specifiedDescription: "Montri nur al specifaj uzantoj"
+  specifiedDescription: "Afiŝi nur al specifaj uzantoj"
   localOnly: "Nur loka"
-  localOnlyDescription: "Ne videbligi al foraj uzantoj"
+  localOnlyDescription: "Ne afiŝi al foraj uzantoj"
 _postForm:
   replyPlaceholder: "Respondi la noton…"
   quotePlaceholder: "Citi la noton…"
-  channelPlaceholder: "Afiŝi en la kanalo…"
+  channelPlaceholder: "Mencii en la kanalo…"
-  _placeholders:
-    a: "Kiel vi fartas?"
-    b: "Kio okazis ĉirkaŭ vi?"
-    c: "Kio estas sur via penso?"
-    d: "Kion vi volas diri?"
-    e: "Komencu skribi tie"
-    f: "Atendanta de vi skribon…"
 _profile:
   name: "Nomo"
   username: "Uzantnomo"
   description: "Sinprezento"
-  metadata: "Kromaj Informoj"
+  metadata: "Kromaj informoj"
   metadataEdit: "Redakti kromajn informojn"
   changeAvatar: "Ŝanĝi profilbildon"
   changeBanner: "Ŝanĝi standardon"
@@ -886,18 +868,42 @@ _timelines:
   local: "Loka"
   social: "Sociala"
   global: "Malloka"
+_rooms:
+  translate: "Movi"
+  chooseImage: "Elekti bildon"
+  _roomType:
+    default: "Implicitaĵo"
+  _furnitures:
+    bed: "Lito"
+    low-table: "Malaltotablo"
+    desk: "Skribotablo"
+    chair: "Seĝo"
+    chair2: "Seĝo 2"
+    pc: "Komputilo"
+    eraser: "Skrapileto"
+    pencil: "Krajono"
+    pudding: "Flaŭno"
+    book: "Libro"
+    book2: "Libro 2"
+    piano: "Piano"
+    facial-tissue: "Tualetpaperejo"
+    server: "Servilo"
+    moon: "Luno"
+    monitor: "Monitoro"
+    keyboard: "Klavaro"
+    doll-ai: "Pupa Ai"
 _pages:
   newPage: "Krei novan paĝon"
   editPage: "Redakti paĝon"
   deleted: "Oni forviŝis la paĝon."
   editThisPage: "Redakti la paĝon"
-  viewPage: "Vidi paĝojn"
+  viewPage: "Vidi viajn paĝojn"
   my: "Miaj paĝoj"
   featured: "Ravaĵoj"
   contents: "Enhavo"
-  content: "Bloko de paĝo"
+  content: "Paĝo en bloko"
   title: "Temlinio"
-  url: "URL de la paĝo"
+  url: "URL de paĝo"
   alignCenter: "Centrigi"
   hideTitleWhenPinned: "Kaŝi la titolon de la paĝo kiam alpinglita"
   chooseBlock: "Aldoni blokon"
@@ -945,9 +951,6 @@ _pages:
       default: "Implicitaĵa valoro"
   script:
     categories:
-      random: "Hazardo"
-      value: "Valoro"
-      fn: "Funkcio"
       text: "Manipulo de teksto"
       list: "Listoj"
     blocks:
@@ -965,7 +968,6 @@ _pages:
       _join:
         arg1: "Listoj"
         arg2: "apartigilo"
-      random: "Hazardo"
       _randomPick:
         arg1: "Listoj"
       _dailyRandomPick:
@@ -983,7 +985,6 @@ _pages:
         arg1: "Teksto"
       _splitStrByLine:
         arg1: "Teksto"
-      fn: "Funkcio"
       _fn:
         slots: "Juntoj"
         arg1: "Elmeto"
@@ -1007,20 +1008,20 @@ _notification:
   youGotPoll: "{name} balotis"
   youGotMessagingMessageFromUser: "{name} sendis al vi mesaĝon"
   youGotMessagingMessageFromGroup: "Oni sendis al la grupo {name} mesaĝon"
-  youWereFollowed: "Eksekvis vin"
+  youWereFollowed: "eksekvis vin"
   youReceivedFollowRequest: "Vi ricevis peton de sekvado"
   yourFollowRequestAccepted: "Via peto de sekvado estis akceptita."
   youWereInvitedToGroup: "Invitita al grupo"
   _types:
     all: "Ĉio"
-    follow: "Novaj sekvantoj"
+    follow: "Novaj sekvatoj"
     mention: "Mencioj"
     reply: "Respondoj"
     renote: "Plusendoj"
     quote: "Citi"
     reaction: "Reagoj"
     receiveFollowRequest: "Ricevi peton de sekvado"
-    followRequestAccepted: "Akceptita peto de sekvado"
+    followRequestAccepted: "Akceptita peto por sekvado"
     groupInvited: "Invitita al grupo"
 _deck:
   profile: "Agordaro"

locales/es-ES.yml

@@ -81,8 +81,6 @@ somethingHappened: "Ocurrió un error"
 retry: "Reintentar"
 pageLoadError: "Error al leer la página"
 pageLoadErrorDescription: "Normalmente es debido a la red o al caché del navegador. Por favor limpie el caché o intente más tarde."
-serverIsDead: "No hay respuesta del servidor. Espere un momento y vuelva a intentarlo."
-youShouldUpgradeClient: "Para ver esta página, por favor refrezca el navegador y utiliza una versión más reciente del cliente."
 enterListName: "Ingrese nombre de lista"
 privacy: "Privacidad"
 makeFollowManuallyApprove: "Aprobar manualmente las solicitudes de seguimiento"
@@ -106,7 +104,6 @@ clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
-reactionSetting: "Reacciones para mostrar en el menú de reacciones"
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
 attachCancel: "Quitar adjunto"
@@ -242,6 +239,7 @@ uploadFromUrlDescription: "URL del fichero que quieres subir"
 uploadFromUrlRequested: "Subida solicitada"
 uploadFromUrlMayTakeTime: "Subir el fichero puede tardar un tiempo."
 explore: "Explorar"
+games: "Misskey Games"
 messageRead: "Ya leído"
 noMoreHistory: "El historial se ha acabado"
 startMessaging: "Iniciar chat"
@@ -535,6 +533,7 @@ yourAccountSuspendedDescription: "Esta cuenta ha sido suspendida debido a violac
 menu: "Menú"
 divider: "Divisor"
 addItem: "Agregar elemento"
+rooms: "Cuartos"
 relays: "Relés"
 addRelay: "Agregar relé"
 inboxUrl: "Inbox URL"
@@ -590,7 +589,6 @@ smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP"
 smtpSecureInfo: "Apagar cuando se use STARTTLS"
 testEmail: "Prueba de envío"
 wordMute: "Silenciar palabras"
-instanceMute: "Instancias silenciadas"
 userSaysSomething: "{name} dijo algo"
 makeActive: "Activar"
 display: "Apariencia"
@@ -611,6 +609,7 @@ regenerateLoginToken: "Regenerar token de login"
 regenerateLoginTokenDescription: "Regenerar el token usado internamente durante el login. No siempre es necesario hacerlo. Al hacerlo de nuevo, se deslogueará en todos los dispositivos."
 setMultipleBySeparatingWithSpace: "Puedes añadir mas de uno, separado por espacios."
 fileIdOrUrl: "Id del archivo o URL"
+chatOpenBehavior: "Comportamiento al abrir el chat"
 behavior: "Comportamiento"
 sample: "Muestra"
 abuseReports: "Reportes"
@@ -665,6 +664,7 @@ emailVerified: "Su dirección de correo electrónico ha sido verificada."
 noteFavoritesCount: "Número de notas favoritas"
 pageLikesCount: "Número de favoritos en la página"
 pageLikedCount: "Número de favoritos de su página"
+reversiCount: "Numero de partidas Reversi"
 contact: "Contacto"
 useSystemFont: "Utilizar la tipografía por defecto del sistema"
 clips: "Clip"
@@ -708,27 +708,12 @@ usageAmount: "Uso"
 capacity: "Capacidad"
 inUse: "Usado"
 editCode: "Editar código"
-apply: "Aplicar"
-publish: "Publicar"
-inChannelSearch: "Buscar en el canal"
-markAllAsRead: "Marcar todo como leído"
 goBack: "Deseleccionar"
 info: "Información"
-online: "En línea"
-offline: "Sin conexión"
 user: "Usuarios"
 administration: "Administrar"
-gallery: "Galería"
-recentPosts: "Posts recientes"
-popularPosts: "Más vistos"
 expiration: "Termina el"
-high: "Alta"
 middle: "Mediano"
-low: "Baja"
-emailNotConfiguredWarning: "No se ha configurado una dirección de correo electrónico."
-ratio: "Proporción"
-previewNoteText: "Mostrar vista preliminar"
-customCss: "CSS personalizado"
 customCssWarn: "Este ajuste sólo debe utilizarse si se sabe lo que hace. Introducir valores inadecuados puede hacer que el cliente deje de funcionar con normalidad."
 global: "Global"
 squareAvatars: "Mostrar iconos cuadrados"
@@ -751,28 +736,13 @@ pubSub: "Cuentas Pub/Sub"
 lastCommunication: "Última comunicación"
 resolved: "Resuelto"
 unresolved: "Sin resolver"
-itsOn: "¡Está encendido!"
-itsOff: "¡Está apagado!"
-emailRequiredForSignup: "Se requere una dirección de correo electrónico para el registro de la cuenta"
-unread: "No leído"
-filter: "Filtro"
 controlPanel: "Panel de control"
-manageAccounts: "Administrar cuenta"
-makeReactionsPublic: "Hacer el historial de reacciones público"
-makeReactionsPublicDescription: "Todas las reacciones que hayas hecho serán públicamente visibles."
-classic: "Clásico"
-muteThread: "Ocultar hilo"
-unmuteThread: "Mostrar hilo"
-ffVisibility: "Visibilidad de seguidores y seguidos"
 hide: "Ocultar"
-_ffVisibility:
-  public: "Publicar"
 _accountDelete:
   accountDelete: "Eliminar Cuenta"
 _ad:
   back: "Deseleccionar"
 _gallery:
-  my: "Mi galería"
   unlike: "Quitar me gusta"
 _email:
   _follow:
@@ -799,6 +769,39 @@ _mfm:
   flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
   font: "Fuente"
   rotate: "Rotar"
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Configuración del juego"
+  chooseBoard: "Elegir tablero"
+  blackOrWhite: "Blancas/Negras"
+  blackIs: "{name} juega con fichas negras"
+  rules: "Reglas"
+  botSettings: "Opciones del bot"
+  thisGameIsStartedSoon: "El juego empezará en segundos"
+  waitingForOther: "Esperando el turno del adversario"
+  waitingForMe: "Esperando mi turno"
+  waitingBoth: "Prepárate"
+  ready: "Listo"
+  cancelReady: "No estoy listo"
+  opponentTurn: "Turno del adversario"
+  myTurn: "Mi turno"
+  turnOf: "Turno de {name}"
+  pastTurnOf: "Turno de {name}"
+  surrender: "Rendirse"
+  surrendered: "Por rendirse"
+  drawn: "Empate"
+  won: "{name} ha ganado"
+  black: "Negro"
+  white: "Blanco"
+  total: "Total"
+  turnCount: "Turno {count}"
+  myGames: "Mis juegos"
+  allGames: "Todos los juegos"
+  ended: "Finalizado"
+  playing: "Jugando"
+  isLlotheo: "El que tenga menos fichas gana (LLoTheO)"
+  loopedMap: "Mapa en bucle"
+  canPutEverywhere: "Puedes colocar donde quieras"
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"
@@ -818,8 +821,6 @@ _channel:
   usersCount: "{n} participantes"
   notesCount: "{n} notas"
 _menuDisplay:
-  sideFull: "Horizontal"
-  sideIcon: "Horizontal (ícono)"
   hide: "Ocultar"
 _wordMute:
   muteWords: "Palabras que silenciar"
@@ -830,11 +831,6 @@ _wordMute:
   soft: "Suave"
   hard: "Duro"
   mutedNotes: "Notas silenciadas"
-_instanceMute:
-  instanceMuteDescription: "Silencia todas las notas y reposts de la instancias seleccionadas, incluyendo respuestas a los usuarios de las mismas"
-  instanceMuteDescription2: "Separar por líneas"
-  title: "Oculta las notas de las instancias listadas."
-  heading: "Instancias a silenciar"
 _theme:
   explore: "Explorar temas"
   install: "Instalar tema"
@@ -1121,6 +1117,68 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
+_rooms:
+  roomOf: "Cuarto de {user}"
+  addFurniture: "Colocar muebles"
+  translate: "Mover"
+  rotate: "Rotar"
+  exit: "Deseleccionar"
+  remove: "Quitar"
+  clear: "Quitar todo"
+  clearConfirm: "¿Quiere quitar todos los muebles?"
+  leaveConfirm: "Hay modificaciones sin guardar. ¿Desea irse?"
+  chooseImage: "Escoger una imagen"
+  roomType: "Estilo de cuarto"
+  carpetColor: "Color de piso"
+  _roomType:
+    default: "Predeterminado"
+    washitsu: "Estilo japonés"
+  _furnitures:
+    milk: "Cartón de leche"
+    bed: "Cama"
+    low-table: "Mesa chica"
+    desk: "Escritorio"
+    chair: "Silla"
+    chair2: "Silla 2"
+    fan: "Ventilador"
+    pc: "Computadora"
+    plant: "Planta decorativa"
+    plant2: "Planta decorativa 2"
+    eraser: "Goma de borrar"
+    pencil: "lápiz"
+    pudding: "Pudín"
+    cardboard-box: "Caja de cartón"
+    cardboard-box2: "Caja de cartón 2"
+    cardboard-box3: "Caja de cartón 3"
+    book: "Libro"
+    book2: "Libro 2"
+    piano: "Piano"
+    facial-tissue: "Caja de pañuelos"
+    server: "Servidor"
+    moon: "Luna"
+    corkboard: "Pizarra de corcho"
+    mousepad: "Alfombrilla de ratón"
+    monitor: "Monitor"
+    keyboard: "Teclado"
+    carpet-stripe: "Alfombra (a rayas)"
+    mat: "Tapete"
+    color-box: "Caja de colores"
+    wall-clock: "Reloj de pared"
+    photoframe: "Fotograma"
+    cube: "Cubo"
+    tv: "Televisor"
+    pinguin: "Pinguino"
+    rubik-cube: "Cubo rubik"
+    poster-h: "Poster (horizontal)"
+    poster-v: "Poster (vertical)"
+    sofa: "Sillón"
+    spiral: "Escalera en espiral"
+    bin: "Papelera"
+    cup-noodle: "Taza de sopa de fideos"
+    holo-display: "Poster holográfico"
+    energy-drink: "Bebida energética"
+    doll-ai: "Muñeca"
+    banknote: "Billetes"
 _pages:
   newPage: "Crear página"
   editPage: "Editar página"

locales/fr-FR.yml

@@ -19,7 +19,7 @@ noNotifications: "Aucune notification"
 instance: "Instance"
 settings: "Paramètres"
 basicSettings: "Paramètres généraux"
-otherSettings: "Paramètres avancés"
+otherSettings: "Autres paramètres"
 openInWindow: "Ouvrir dans une nouvelle fenêtre"
 profile: "Profil"
 timeline: "Fil"
@@ -106,7 +106,6 @@ clickToShow: "Cliquer pour afficher"
 sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
-reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."
 attachCancel: "Supprimer le fichier attaché"
@@ -242,6 +241,7 @@ uploadFromUrlDescription: "URL du fichier que vous souhaitez téléverser"
 uploadFromUrlRequested: "Téléversement demandé"
 uploadFromUrlMayTakeTime: "Le téléversement de votre fichier peut prendre un certain temps."
 explore: "Découvrir"
+games: "Jeux de Misskey"
 messageRead: "Lu"
 noMoreHistory: "Il n’y a plus d’historique"
 startMessaging: "Commencer à discuter"
@@ -535,6 +535,7 @@ yourAccountSuspendedDescription: "Ce compte est suspendu car vous avez enfreint
 menu: "Menu"
 divider: "Séparateur"
 addItem: "Ajouter un élément"
+rooms: "Chambre"
 relays: "Relais"
 addRelay: "Ajouter un relais"
 inboxUrl: "Inbox URL"
@@ -590,7 +591,6 @@ smtpSecure: "Utiliser SSL/TLS implicitement dans les connexions SMTP"
 smtpSecureInfo: "Désactiver cette option lorsque STARTTLS est utilisé"
 testEmail: "Tester la distribution de courriel"
 wordMute: "Filtre de mots"
-instanceMute: "Instance en sourdine"
 userSaysSomething: "{name} a dit quelque chose"
 makeActive: "Activer"
 display: "Affichage"
@@ -611,6 +611,7 @@ regenerateLoginToken: "Régénérer le jeton de connexion"
 regenerateLoginTokenDescription: "Générer un nouveau jeton d'authentification. Cette opération ne devrait pas être nécessaire ; lors de la génération d'un nouveau jeton, tous les appareils seront déconnectés. "
 setMultipleBySeparatingWithSpace: "Vous pouvez en définir plusieurs, en les séparant par des espaces."
 fileIdOrUrl: "ID du fichier ou URL"
+chatOpenBehavior: "Comportement de la fenêtre de discussion lors de son ouverture"
 behavior: "Comportement"
 sample: "Exemple"
 abuseReports: "Signalements"
@@ -618,9 +619,6 @@ reportAbuse: "Signaler"
 reportAbuseOf: "Signaler {name}"
 fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
 abuseReported: "Le rapport est envoyé. Merci."
-reporteeOrigin: "Origine du signalement"
-reporterOrigin: "Signalé par"
-forwardReport: "Transférer le signalement à l’instance distante"
 send: "Envoyer"
 abuseMarkAsResolved: "Marquer le signalement comme résolu"
 openInNewTab: "Ouvrir dans un nouvel onglet"
@@ -668,6 +666,7 @@ emailVerified: "Votre adresse e-mail a été vérifiée."
 noteFavoritesCount: "Nombre de notes dans les favoris"
 pageLikesCount: "Nombre de pages aimées"
 pageLikedCount: "Nombre de vos pages aimées"
+reversiCount: "Nombre de parties de Reversi"
 contact: "Contact"
 useSystemFont: "Utiliser la police par défaut du système"
 clips: "Clips"
@@ -682,7 +681,6 @@ center: "Centrer"
 wide: "Large"
 narrow: "Condensé"
 reloadToApplySetting: "Vos paramètres seront appliqués lorsque vous rechargerez la page. Souhaitez-vous recharger ?"
-needReloadToApply: "Ce paramètre s'appliquera après un rechargement."
 showTitlebar: "Afficher la barre de titre"
 clearCache: "Vider le cache"
 onlineUsersCount: "{n} utilisateur(s) en ligne"
@@ -791,7 +789,6 @@ pubSub: "Comptes Pub/Sub"
 lastCommunication: "Dernière communication"
 resolved: "Résolu"
 unresolved: "En attente"
-breakFollow: "Ne plus suivre"
 itsOn: "Activé"
 itsOff: "Désactivé"
 emailRequiredForSignup: "Une adresse e-mail est nécessaire pour créer un compte"
@@ -799,22 +796,9 @@ unread: "Non lu"
 filter: "Filtre"
 controlPanel: "Panneau de contrôle"
 manageAccounts: "Gérer les comptes"
-makeReactionsPublic: "Rendre les réactions publiques"
-makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions données publique."
 classic: "Classique"
-muteThread: "Mettre ce thread en sourdine"
-ffVisibility: "Visibilité des abonnés/abonnements"
-ffVisibilityDescription: "Permet de configurer qui peut voir les personnes que tu suis et les personnes qui te suivent."
-continueThread: "Afficher la suite du fil"
-deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
-incorrectPassword: "Le mot de passe est incorrect."
 hide: "Masquer"
-leaveGroup: "Quitter le groupe"
-leaveGroupConfirm: "Êtes vous sûr de vouloir quitter \"{name}\" ?"
-welcomeBackWithName: "Heureux de vous revoir, {name}"
-clickToFinishEmailVerification: "Veuillez cliquer sur [{ok}] afin de compléter la vérification par courriel."
 _emailUnavailable:
-  used: "Non disponible"
   format: "Le format de cette adresse de courriel est invalide"
   mx: "Ce serveur de courriels est invalide"
   smtp: "Ce serveur de courriels ne répond pas"
@@ -936,6 +920,39 @@ _mfm:
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
   rotate: "Pivoter"
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Réglages de la partie"
+  chooseBoard: "Choix du plateau"
+  blackOrWhite: "Pions blancs/Pions noirs"
+  blackIs: "{name} joue les pions noirs"
+  rules: "Règles"
+  botSettings: "Options du bot"
+  thisGameIsStartedSoon: "La partie commencera dans quelques secondes"
+  waitingForOther: "En attente que l'adversaire soit prêt"
+  waitingForMe: "En attente que vous soyez prêt"
+  waitingBoth: "Préparez-vous"
+  ready: "Prêt"
+  cancelReady: "Recommencer la préparation"
+  opponentTurn: "Tour de l’adversaire"
+  myTurn: "C’est votre tour"
+  turnOf: "Tour de {name}"
+  pastTurnOf: "Tour de {name}"
+  surrender: "Abandonner"
+  surrendered: "Par abandon"
+  drawn: "Match nul"
+  won: "{name} a gagné"
+  black: "Noirs"
+  white: "Blancs"
+  total: "Total"
+  turnCount: "Tour {count}"
+  myGames: "Mes parties"
+  allGames: "Toutes les parties"
+  ended: "Fin de partie"
+  playing: "En cours"
+  isLlotheo: "Celui ou celle qui a le moins de pièces gagne (Llotheo)"
+  loopedMap: "Carte en boucle"
+  canPutEverywhere: "Les pions peuvent être placés partout "
 _instanceTicker:
   none: "Cacher "
   remote: "Montrer pour les utilisateur·ice·s distant·e·s"
@@ -968,8 +985,6 @@ _wordMute:
   soft: "Doux"
   hard: "Strict"
   mutedNotes: "Notes filtrées"
-_instanceMute:
-  heading: "Instances à mettre en sourdine"
 _theme:
   explore: "Explorer les thèmes"
   install: "Installer un thème"
@@ -1052,6 +1067,8 @@ _sfx:
   chatBg: "Discussion (arrière-plan)"
   antenna: "Réception de l’antenne"
   channel: "Notifications de canal"
+  reversiPutBlack: "Reversi : les pions noirs ont joué"
+  reversiPutWhite: "Reversi : les pions blancs ont joué"
 _ago:
   unknown: "Inconnu"
   future: "Futur"
@@ -1241,7 +1258,6 @@ _exportOrImport:
   muteList: "Comptes masqués"
   blockingList: "Comptes bloqués"
   userLists: "Listes"
-  excludeInactiveUsers: "Exclure les utilisateur·rice·s inactifs"
 _charts:
   federationInstancesIncDec: "Variation du nombre d'instances fédérées"
   federationInstancesTotal: "Nombre total d'instances fédérées"
@@ -1273,6 +1289,68 @@ _timelines:
   local: "Local"
   social: "Social"
   global: "Global"
+_rooms:
+  roomOf: "Chambre de {user}"
+  addFurniture: "Placer des meubles"
+  translate: "Déplacer"
+  rotate: "Pivoter"
+  exit: "Retour"
+  remove: "Enlever"
+  clear: "Tout enlever"
+  clearConfirm: "Souhaitez-vous enlever tous les meubles de votre chambre ?"
+  leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous vraiment quitter ?"
+  chooseImage: "Sélectionnez une image"
+  roomType: "Type de chambre"
+  carpetColor: "Couleur du tapis"
+  _roomType:
+    default: "Par défaut"
+    washitsu: "Style japonnais"
+  _furnitures:
+    milk: "Brique de lait"
+    bed: "Lit"
+    low-table: "Table basse"
+    desk: "Bureau"
+    chair: "Chaise"
+    chair2: "Chaise 2"
+    fan: "Ventilateur"
+    pc: "Ordinateur"
+    plant: "Plante d’intérieur"
+    plant2: "Plante d’intérieur 2"
+    eraser: "Gomme"
+    pencil: "Crayon"
+    pudding: "Pudding"
+    cardboard-box: "Boîte en carton"
+    cardboard-box2: "Boîte en carton 2"
+    cardboard-box3: "Boîte en carton 3"
+    book: "Livre"
+    book2: "Livre 2"
+    piano: "Piano"
+    facial-tissue: "Boîte de mouchoirs"
+    server: "Serveurs"
+    moon: "Lune"
+    corkboard: "Tableau en liège"
+    mousepad: "Tapis de souris"
+    monitor: "Écran de contrôle"
+    keyboard: "Clavier"
+    carpet-stripe: "Tapis (zébré)"
+    mat: "Tapis"
+    color-box: "Étagère"
+    wall-clock: "Horloge murale"
+    photoframe: "Cadre photo"
+    cube: "Cube"
+    tv: "Télé"
+    pinguin: "Pingouin"
+    rubik-cube: "Cube de Rubik"
+    poster-h: "Affiche (horizontale)"
+    poster-v: "Affiche (verticale)"
+    sofa: "Canapé"
+    spiral: "Escaliers en spirale"
+    bin: "Corbeille"
+    cup-noodle: "Bol de nouilles"
+    holo-display: "Affichage holographique"
+    energy-drink: "Boisson énergétique"
+    doll-ai: "Poupée Ai"
+    banknote: "Billets de banque"
 _pages:
   newPage: "Créer une page"
   editPage: "Modifier une page"

locales/id-ID.yml

@@ -241,6 +241,7 @@ uploadFromUrlDescription: "URL berkas yang ingin kamu unggah"
 uploadFromUrlRequested: "Pengunggahan telah diminta"
 uploadFromUrlMayTakeTime: "Membutuhkan beberapa waktu hingga pengunggahan selesai"
 explore: "Jelajahi"
+games: "Permainan Misskey"
 messageRead: "Telah dibaca"
 noMoreHistory: "Tidak ada sejarah lagi"
 startMessaging: "Mulai mengirim pesan"
@@ -534,6 +535,7 @@ yourAccountSuspendedDescription: "Akun ini dibekukan karena melanggar ketentuan
 menu: "Menu"
 divider: "Pembagi"
 addItem: "Tambahkan item"
+rooms: "Ruang"
 relays: "Relay"
 addRelay: "Tambahkan relay"
 inboxUrl: "URL Kotak masuk"
@@ -609,6 +611,7 @@ regenerateLoginToken: "Perbarui token login"
 regenerateLoginTokenDescription: "Perbarui token yang digunakan secara internal saat login. Normalnya aksi ini tidak diperlukan. Jika diperbarui, semua perangkat akan dilogout."
 setMultipleBySeparatingWithSpace: "Kamu dapat menyetel banyak dengan memisahkannya menggunakan spasi."
 fileIdOrUrl: "File-ID atau URL"
+chatOpenBehavior: "Perilaku jendelan obrolan ketika dibuka"
 behavior: "Perilaku"
 sample: "Contoh"
 abuseReports: "Laporkan"
@@ -665,6 +668,7 @@ emailVerified: "Surel telah diverifikasi"
 noteFavoritesCount: "Jumlah catatan yang difavoritkan"
 pageLikesCount: "Jumlah suka yang diterima Halaman"
 pageLikedCount: "Jumlah Halaman yang disukai"
+reversiCount: "Jumlah pertandingan Reversi"
 contact: "Kontak"
 useSystemFont: "Gunakan font bawaan sistem operasi"
 clips: "Klip"
@@ -931,6 +935,39 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Pengaturan permainan"
+  chooseBoard: "Pilih papan"
+  blackOrWhite: "Hitam/Putih"
+  blackIs: "{name} bermain Hitam"
+  rules: "Peraturan"
+  botSettings: "Opsi bot"
+  thisGameIsStartedSoon: "Permainan akan mulai dalam beberapa detik"
+  waitingForOther: "Menunggu giliran lawan"
+  waitingForMe: "Menunggu giliran kamu"
+  waitingBoth: "Bersiap"
+  ready: "Siap"
+  cancelReady: "Batalkan siap"
+  opponentTurn: "Giliran lawan"
+  myTurn: "Giliran kamu"
+  turnOf: "Giliran {name}"
+  pastTurnOf: "Giliran {name}"
+  surrender: "Menyerah"
+  surrendered: "Karena menyerah"
+  drawn: "Seri"
+  won: "Kemenangan {name}"
+  black: "Hitam"
+  white: "Putih"
+  total: "Jumlah"
+  turnCount: "Giliran {count}"
+  myGames: "Rondeku"
+  allGames: "Semua ronde"
+  ended: "Selesai"
+  playing: "Sedang bermain"
+  isLlotheo: "Pemain dengan batu paling sedikitlah yang menang (Llotheo)"
+  loopedMap: "Peta melingkar"
+  canPutEverywhere: "Keping dapat ditaruh dimana saja"
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
@@ -1045,6 +1082,8 @@ _sfx:
   chatBg: "Obrolan (Latar Belakang)"
   antenna: "Penerimaan Antenna"
   channel: "Pemberitahuan saluran"
+  reversiPutBlack: "Reversi: Hitam bergerak"
+  reversiPutWhite: "Reversi: Putih bergerak"
 _ago:
   unknown: "Tidak diketahui"
   future: "Masa depan"
@@ -1265,6 +1304,68 @@ _timelines:
   local: "Lokal"
   social: "Sosial"
   global: "Global"
+_rooms:
+  roomOf: "Ruangan {user}"
+  addFurniture: "Letakkan perabotan"
+  translate: "Pindah"
+  rotate: "Putar"
+  exit: "Kembali"
+  remove: "Hapus"
+  clear: "Bersihkan"
+  clearConfirm: "Apakah kamu yakin ingin menghapus semua perabotan di ruanganmu?"
+  leaveConfirm: "Ada perubahan yang belum tersimpan. Apakah kamu ingin pergi?"
+  chooseImage: "Pilih gambar"
+  roomType: "Tipe ruangan"
+  carpetColor: "Warna karpet"
+  _roomType:
+    default: "Bawaan"
+    washitsu: "Gaya Jepang"
+  _furnitures:
+    milk: "Kardus susu"
+    bed: "Tempat tidur"
+    low-table: "Meja pendek"
+    desk: "Meja tulis"
+    chair: "Kursi"
+    chair2: "Kursi 2"
+    fan: "Kipas angin"
+    pc: "Komputer"
+    plant: "Tanaman"
+    plant2: "Tanaman 2"
+    eraser: "Karet Penghapus"
+    pencil: "Pensil"
+    pudding: "Puding"
+    cardboard-box: "Kotak Kardus"
+    cardboard-box2: "Kotak Kardus 2"
+    cardboard-box3: "Kotak Kardus 3"
+    book: "Buku"
+    book2: "Buku 2"
+    piano: "Piano"
+    facial-tissue: "Tisu Wajah"
+    server: "Server"
+    moon: "Bulan"
+    corkboard: "Papan buletin"
+    mousepad: "Mousepad"
+    monitor: "Layar Monitor"
+    keyboard: "Papan tombol"
+    carpet-stripe: "Karpet (Bergaris)"
+    mat: "Keset"
+    color-box: "Rak buku"
+    wall-clock: "Jam dinding"
+    photoframe: "Bingkai foto"
+    cube: "Kubus"
+    tv: "Televisi"
+    pinguin: "Pinguin"
+    rubik-cube: "Rubik"
+    poster-h: "Poster (Horizontal)"
+    poster-v: "Poster (Vertical)"
+    sofa: "Sofa"
+    spiral: "Tangga spiral"
+    bin: "Tempat sampah"
+    cup-noodle: "Migelas"
+    holo-display: "Layar hologram"
+    energy-drink: "Minuman energi"
+    doll-ai: "Boneka Ai"
+    banknote: "Uang"
 _pages:
   newPage: "Buat halaman baru"
   editPage: "Sunting halaman"

locales/it-IT.yml

@@ -80,9 +80,6 @@ error: "Errore"
 somethingHappened: "Si è verificato un problema"
 retry: "Riprova"
 pageLoadError: "Caricamento pagina non riuscito. "
-pageLoadErrorDescription: "Questo viene normalmente causato dalla rete o dalla cache del browser. Si prega di pulire la cache, o di attendere e riprovare più tardi."
-serverIsDead: "Il server non risponde. Si prega di attendere e riprovare più tardi."
-youShouldUpgradeClient: "Per visualizzare la pagina è necessario aggiornare il client alla nuova versione e ricaricare."
 enterListName: "Nome della lista"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Richiedi di approvare i follower manualmente"
@@ -106,7 +103,6 @@ clickToShow: "Clicca per visualizzare"
 sensitive: "Contenuto sensibile"
 add: "Aggiungi"
 reaction: "Reazione"
-reactionSetting: "Reazioni visualizzate sul pannello"
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
 attachCancel: "Rimuovi allegato"
@@ -136,7 +132,6 @@ emojiUrl: "URL dell'emoji"
 addEmoji: "Aggiungi un emoji"
 settingGuide: "Configurazione suggerita"
 cacheRemoteFiles: "Memorizzazione nella cache dei file remoti"
-cacheRemoteFilesDescription: "Disabilitando questa opzione, i file remoti verranno linkati direttamente senza essere memorizzati nella cache. Sarà possibile risparmiare spazio di archiviazione sul server, ma il traffico aumenterà in quanto non verranno generate anteprime."
 flagAsBot: "Io sono un robot"
 flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche, attiva quest'opzione. Quando attivata, opera come un segnalatore per gli altri sviluppatori allo scopo di prevenire catene d’interazione senza fine con altri bot, e di adeguare i sistemi interni di Misskey perché trattino questo account come un bot."
 flagAsCat: "Io sono un gatto"
@@ -153,14 +148,12 @@ searchWith: "Cerca: {q}"
 youHaveNoLists: "Non hai ancora creato nessuna lista"
 followConfirm: "Sei sicur@ di voler seguire {name}?"
 proxyAccount: "Account proxy"
-proxyAccountDescription: "Un account proxy è un account che funziona da follower remoto per gli utenti sotto certe condizioni. Ad esempio, quando un utente aggiunge un utente remoto alla lista, dato che se nessun utente locale segue quell'utente le sue attività non verranno distribuite, al suo posto lo seguirà un account proxy."
 host: "Server remoto"
 selectUser: "Seleziona utente"
 recipient: "Destinatario"
 annotation: "Descrizione"
 federation: "Federazione"
 instances: "Istanza"
-registeredAt: "Registrato presso"
 latestRequestSentAt: "Ultima richiesta inviata"
 latestRequestReceivedAt: "Ultima richiesta ricevuta"
 latestStatus: "Ultimo stato"
@@ -168,7 +161,6 @@ storageUsage: "Volume di dischi"
 charts: "Grafici"
 perHour: "All'ora"
 perDay: "al giorno"
-stopActivityDelivery: "Interrompi la distribuzione di attività"
 blockThisInstance: "Blocca l'istanza"
 operations: "Operazioni"
 software: "Software"
@@ -242,6 +234,7 @@ uploadFromUrlDescription: "URL del file che vuoi caricare"
 uploadFromUrlRequested: "Caricamento richiesto"
 uploadFromUrlMayTakeTime: "Il caricamento del file può richiedere tempo."
 explore: "Esplora"
+games: "Misskey Giochi"
 messageRead: "Visualizzato"
 noMoreHistory: "Non c'è più cronologia da visualizzare"
 startMessaging: "Nuovo messaggio"
@@ -322,13 +315,11 @@ registration: "Iscriviti"
 enableRegistration: "Permettere nuove registrazioni"
 invite: "Invita"
 proxyRemoteFiles: "Usare file remoti come proxy"
-proxyRemoteFilesDescription: "Attivando questa opzione i file remoti non salvati o cancellati perché eccedenti il limite di archiviazione verranno inoltrati tramite proxy, inclusa la generazione di anteprime. Non ha effetto sullo spazio di archiviazione del server."
 driveCapacityPerLocalAccount: "Volume del Drive per utente locale"
 driveCapacityPerRemoteAccount: "Volume del Drive per utente remoto"
 inMb: "in Megabytes"
 iconUrl: "URL di icona (favicon, ecc.)"
 bannerUrl: "URL dell'immagine d'intestazione"
-backgroundImageUrl: "URL dello sfondo"
 basicInfo: "Informazioni fondamentali"
 pinnedUsers: "Utenti in evidenza"
 pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagina \"Esplora\", un@ per riga."
@@ -447,12 +438,10 @@ uiLanguage: "Lingua di visualizzazione dell'interfaccia"
 groupInvited: "Invitat@ al gruppo"
 aboutX: "Informazioni su {x}"
 useOsNativeEmojis: "Usare le emoji native del sistema operativo"
-disableDrawer: "Non mostrare il menù sul drawer"
 youHaveNoGroups: "Nessun gruppo"
 joinOrCreateGroup: "Puoi creare il tuo gruppo o essere invitat@ a gruppi che già esistono."
 noHistory: "Nessuna cronologia"
 signinHistory: "Cronologia di accesso all'account"
-disableAnimatedMfm: "Disabilità i MFM animati"
 doing: "In corso..."
 category: "Categoria"
 tags: "Tag"
@@ -480,17 +469,12 @@ showFeaturedNotesInTimeline: "Mostrare le note di tendenza nella tua timeline"
 objectStorage: "Stoccaggio oggetti"
 useObjectStorage: "Utilizza stoccaggio oggetti"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "URL di riferimento. In caso di utilizzo di proxy o CDN l'URL è 'https://<bucket>.s3.amazonaws.com' per S3, 'https://storage.googleapis.com/<bucket>' per GCS eccetera. "
 objectStorageBucket: "Bucket"
-objectStorageBucketDesc: "Specificare il nome del bucket utilizzato dal provider."
 objectStoragePrefix: "Prefix"
 objectStoragePrefixDesc: "I file saranno conservati sotto la directory di questo prefisso."
 objectStorageEndpoint: "Endpoint"
-objectStorageEndpointDesc: "Lasciare vuoto se si sta utilizzando S3. In caso contrario si prega di specificare l'endpoint come '<host>' oppure '<host>:<port>' a seconda del servizio utilizzato."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Specificate una regione, quale 'xx-east-1'. Se il servizio in utilizzo non distingue tra regioni, lasciate vuoto o inserite 'us-east-1'."
 objectStorageUseSSL: "Usare SSL"
-objectStorageUseSSLDesc: "Disabilita quest'opzione se non utilizzi HTTPS per le connessioni API."
 objectStorageUseProxy: "Usa proxy"
 objectStorageUseProxyDesc: "Disabilita quest'opzione se non usi proxy per la connessione API."
 objectStorageSetPublicRead: "Imposta \"visibilità pubblica\" al momento di caricare"
@@ -520,7 +504,6 @@ sort: "Ordina per"
 ascendingOrder: "Ascendente"
 descendingOrder: "Discendente"
 scratchpad: "ScratchPad"
-scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Misskey."
 output: "Uscita"
 script: "Script"
 disablePagesScript: "Disabilita AiScript nelle pagine"
@@ -531,11 +514,9 @@ removeAllFollowing: "Cancella tutti i follows"
 removeAllFollowingDescription: "Cancella tutti i follows del server {host}. Per favore, esegui se, ad esempio, l'istanza non esiste più."
 userSuspended: "L'utente è sospes@."
 userSilenced: "L'utente è silenziat@."
-yourAccountSuspendedTitle: "Questo account è sospeso."
-yourAccountSuspendedDescription: "Questo account è stato sospeso a causa di una violazione dei termini di servizio del server. Contattare l'amministrazione per i dettagli. Si prega di non creare un nuovo account."
-menu: "Menù"
 divider: "Linea di separazione"
 addItem: "Aggiungi elemento"
+rooms: "Camera"
 relays: "Ripetitori"
 addRelay: "Aggiungi ripetitore"
 inboxUrl: "Inbox URL"
@@ -560,7 +541,6 @@ manage: "Gestione"
 plugins: "Estensioni"
 deck: "Deck"
 undeck: "Esci dal deck"
-useBlurEffectForModal: "Utilizza effetto sfocatura per i modali"
 useFullReactionPicker: "Usa la totalità del pannello di reazioni"
 width: "Larghezza"
 height: "Altezza"
@@ -591,7 +571,6 @@ smtpSecure: "Usare la porta SSL/TLS implicito per le connessioni SMTP"
 smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
 testEmail: "Testare la consegna di posta elettronica"
 wordMute: "Filtri parole"
-instanceMute: "Silenzia l'istanza"
 userSaysSomething: "{name} ha detto qualcosa"
 makeActive: "Attiva"
 display: "Visualizza"
@@ -610,18 +589,14 @@ useGlobalSettingDesc: "Se abilitato, le impostazioni notifiche dell'account verr
 other: "Avanzate"
 regenerateLoginToken: "Genera di nuovo un token di connessione"
 regenerateLoginTokenDescription: "Genera un nuovo token di autenticazione. Solitamente questa operazione non è necessaria: quando si genera un nuovo token, tutti i dispositivi vanno disconnessi."
-setMultipleBySeparatingWithSpace: "È possibile creare multiple voci separate da spazi."
 fileIdOrUrl: "ID o URL del file"
+chatOpenBehavior: "Comportamento della finestra di chat quando viene aperta"
 behavior: "Comportamento"
-sample: "Esempio"
 abuseReports: "Segnalazioni"
 reportAbuse: "Segnalazioni"
 reportAbuseOf: "Segnala {name}"
 fillAbuseReportDescription: "Si prega di spiegare il motivo della segnalazione. Se riguarda una nota precisa, si prega di collegare anche l'URL della nota."
 abuseReported: "La segnalazione è stata inviata. Grazie."
-reporter: "il corrispondente"
-reporteeOrigin: "Origine del segnalato"
-reporterOrigin: "Origine del segnalatore"
 send: "Inviare"
 abuseMarkAsResolved: "Contrassegna la segnalazione come risolta"
 openInNewTab: "Apri in una nuova scheda"
@@ -669,6 +644,7 @@ emailVerified: "Il tuo indirizzo email è stato verificato"
 noteFavoritesCount: "Conteggio note tra i preferiti"
 pageLikesCount: "Numero di pagine che ti piacciono"
 pageLikedCount: "Numero delle tue pagine che hanno ricevuto \"Mi piace\""
+reversiCount: "Numero di partite a Reversi"
 contact: "Contatti"
 useSystemFont: "Usa il carattere predefinito del sistema"
 clips: "Clip"
@@ -682,7 +658,6 @@ left: "Sinistra"
 center: "Centro"
 wide: "Largo"
 reloadToApplySetting: "Le tue preferenze verranno impostate dopo il ricaricamento della pagina. Vuoi ricaricare adesso?"
-needReloadToApply: "È necessario riavviare per rendere effettive le modifiche."
 showTitlebar: "Visualizza la barra del titolo"
 clearCache: "Svuota cache"
 onlineUsersCount: "{n} utenti online"
@@ -765,65 +740,13 @@ middle: "Media"
 low: "Bassa"
 emailNotConfiguredWarning: "Non hai impostato nessun indirizzo e-mail."
 ratio: "Rapporto"
-previewNoteText: "Anteprima del testo"
-customCss: "CSS personalizzato"
 global: "Federata"
-squareAvatars: "Mostra l'immagine del profilo come quadrato"
 sent: "Inviare"
-searchResult: "Risultati della Ricerca"
 hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
-useBlurEffect: "Utilizza effetto sfocatura per l'interfaccia utente"
-learnMore: "Più dettagli"
-misskeyUpdated: "Misskey è stato aggiornato!"
-whatIsNew: "Visualizza le informazioni sull'aggiornamento"
-translate: "Traduzione"
-translatedFrom: "Tradotto da {x}"
-accountDeletionInProgress: "La cancellazione dell'account è in corso"
-usernameInfo: "Un nome per identificare univocamente il tuo account sul server. È possibile utilizzare caratteri alfanumerici (a~z, A~Z, 0~9) e il trattino basso (_). Non sarà possibile cambiare il nome utente in seguito."
-aiChanMode: "Modalità Ai"
-keepCw: "Mantieni il CW"
-resolved: "Risolto"
-unresolved: "Non risolto"
-breakFollow: "Smetti di seguire"
-itsOn: "Abilitato"
-itsOff: "Disabilitato"
-emailRequiredForSignup: "È necessario un indirizzo mail per registrare un account"
-unread: "Non letto"
-filter: "Filtri"
-controlPanel: "Pannello di controllo"
-manageAccounts: "Gestisci account"
-classic: "Classico"
-muteThread: "Silenzia la discussione"
-unmuteThread: "Riattiva la discussione"
-deleteAccountConfirm: "L'account verrà cancellato. Procedere?"
-incorrectPassword: "La password è errata."
-voteConfirm: "Votare per「{choice}」?"
 hide: "Nascondere"
-leaveGroup: "Esci dal gruppo"
-leaveGroupConfirm: "Uscire da「{name}」?"
-useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
-welcomeBackWithName: "Bentornato/a, {name}"
-clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
-_emailUnavailable:
-  used: "Email già in uso"
-  format: "Formato email non valido"
-  disposable: "Email non riutilizzabile"
-  mx: "Server email non corretto"
-  smtp: "Il server email non risponde"
 _ffVisibility:
   public: "Pubblico"
-  followers: "Mostra solo ai follower"
-  private: "Invisibile"
-_signup:
-  almostThere: "Quasi completo"
-  emailAddressInfo: "Inserisci il tuo indirizzo email. Non verrà reso pubblico."
-_accountDelete:
-  accountDelete: "Cancellazione account"
-  sendEmail: "Al termine della cancellazione dell'account, verrà inviata una mail all'indirizzo a cui era registrato."
-  requestAccountDelete: "Richiesta di cancellazione account"
-  started: "Il processo di cancellazione è iniziato."
-  inProgress: "Cancellazione in corso"
 _ad:
   back: "Indietro"
   reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
@@ -879,27 +802,19 @@ _mfm:
   quote: "Cita il nota"
   emoji: "Emoji personalizzati"
   search: "Cerca"
-  flip: "Inverti"
-  jump: "Animazione(salto)"
-  jumpDescription: "Da un animazione che salta su e giù."
-  bounce: "Animazione(rimbalzo)"
-  bounceDescription: "Rende il testo rimbalzante"
-  shake: "rimbalzante"
-  shakeDescription: "Rende il testo traballante"
-  twitch: "testo"
-  twitchDescription: "Fa tremare il testo"
-  x2: "Più grande"
-  x2Description: "Mostra il contenuto ingrandito."
-  x3: "Molto più grande"
-  x3Description: "Mostra il contenuto molto più ingrandito."
-  x4: "Estremamente più grande"
-  x4Description: "Mostra il contenuto estremamente più ingrandito."
   blur: "Sfocatura"
-  blurDescription: "È possibile rendere sfocato il contenuto. Spostando il cursore su di esso tornerà visibile chiaramente."
   font: "Tipo di carattere"
   fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
   rainbow: "Arcobaleno"
   rotate: "Ruota"
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Impostazioni di gioco"
+  botSettings: "Opzioni del bot"
+  black: "Nero"
+  white: "Bianco"
+  total: "Totale"
+  ended: "Esci"
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per gli/le utenti remotə"
@@ -951,7 +866,6 @@ _theme:
   func: "Funzione"
   funcKind: "Tipo di funzione"
   argument: "Argomento"
-  alpha: "Opacità"
   darken: "Scuro"
   lighten: "Chiaro"
   inputConstantName: "Inserisci un nome per la costante"
@@ -989,7 +903,6 @@ _theme:
     inputBorder: "Inquadra casella di testo"
     listItemHoverBg: "Sfondo della voce di elenco (sorvolato)"
     driveFolderBg: "Sfondo della cartella di disco"
-    badge: "Distintivo"
     messageBg: "Sfondo della chat"
 _sfx:
   note: "Nota"
@@ -1207,6 +1120,68 @@ _timelines:
   local: "Locale"
   social: "Sociale"
   global: "Federata"
+_rooms:
+  roomOf: "Camera di {user}"
+  addFurniture: "Disponi mobilia"
+  translate: "Sposta"
+  rotate: "Ruota"
+  exit: "Indietro"
+  remove: "Togli"
+  clear: "Rimuovi tutto"
+  clearConfirm: "Sei sicur@ di voler rimuovere tutti i mobili dalla tua camera?"
+  leaveConfirm: "Hai fatto modifiche ancora non salvate. Vuoi davvero uscire?"
+  chooseImage: "Seleziona immagine"
+  roomType: "Tipo di stanza"
+  carpetColor: "Colore del suolo"
+  _roomType:
+    default: "Predefinito"
+    washitsu: "Washitsu"
+  _furnitures:
+    milk: "Cartone del latte"
+    bed: "Letto"
+    low-table: "Tavolino"
+    desk: "Tavolo"
+    chair: "Sedia"
+    chair2: "Sedia 2"
+    fan: "Ventilatore"
+    pc: "Computer"
+    plant: "Pianta da appartamento"
+    plant2: "Pianta da appartamento2"
+    eraser: "Gomma"
+    pencil: "Matita"
+    pudding: "Pudding"
+    cardboard-box: "Scatola di cartone"
+    cardboard-box2: "Scatola di cartone 2"
+    cardboard-box3: "Scatola di cartone 3"
+    book: "Libro"
+    book2: "Libro2"
+    piano: "Pianoforte"
+    facial-tissue: "Scatola di fazzolettini"
+    server: "Server"
+    moon: "Luna"
+    corkboard: "Bacheca"
+    mousepad: "Tappetino per il mouse"
+    monitor: "Monitor "
+    keyboard: "Tastiera"
+    carpet-stripe: "Tappeto (a strisce)"
+    mat: "Zerbino"
+    color-box: "Libreria"
+    wall-clock: "Orologio da parete"
+    photoframe: "Cornice"
+    cube: "Cubo"
+    tv: "TV"
+    pinguin: "Pinguino"
+    rubik-cube: "Cubo di Rubik"
+    poster-h: "Poster (orizzontale)"
+    poster-v: "Poster (verticale)"
+    sofa: "Divano"
+    spiral: "Scale a chiocciola"
+    bin: "Cestino"
+    cup-noodle: "Noodle istantanei"
+    holo-display: "Visualizzazione olografica"
+    energy-drink: "Bevanda energetica"
+    doll-ai: "Bambola Ai"
+    banknote: "Mazzetta di banconote"
 _pages:
   newPage: "Crea pagina"
   editPage: "Modifica pagina"
@@ -1404,10 +1379,6 @@ _pages:
       string: "Testo"
       array: "Liste"
       stringArray: "Lista di testo"
-_relayStatus:
-  requesting: "In attesa di approvazione"
-  accepted: "Approvato"
-  rejected: "Respinto"
 _notification:
   fileUploaded: "File caricato correttamente"
   youGotMention: "{name} ti ha menzionato"

locales/ja-JP.yml

@@ -242,6 +242,7 @@ uploadFromUrlDescription: "アップロードしたいファイルのURL"
 uploadFromUrlRequested: "アップロードをリクエストしました"
 uploadFromUrlMayTakeTime: "アップロードが完了するまで時間がかかる場合があります。"
 explore: "みつける"
+games: "Misskey Games"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
 startMessaging: "チャットを開始"
@@ -536,6 +537,7 @@ yourAccountSuspendedDescription: "このアカウントは、サーバーの利
 menu: "メニュー"
 divider: "分割線"
 addItem: "項目を追加"
+rooms: "ルーム"
 relays: "リレー"
 addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
@@ -619,11 +621,8 @@ reportAbuse: "通報"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
-reporter: "通報者"
 reporteeOrigin: "通報先"
 reporterOrigin: "通報元"
-forwardReport: "リモートインスタンスに通報を転送する"
-forwardReportIsAnonymous: "リモートインスタンスからはあなたの情報は見れず、匿名のシステムアカウントとして表示されます。"
 send: "送信"
 abuseMarkAsResolved: "対応済みにする"
 openInNewTab: "新しいタブで開く"
@@ -671,6 +670,7 @@ emailVerified: "メールアドレスが確認されました"
 noteFavoritesCount: "お気に入りノートの数"
 pageLikesCount: "Pageにいいねした数"
 pageLikedCount: "Pageにいいねされた数"
+reversiCount: "リバーシの対局数"
 contact: "連絡先"
 useSystemFont: "システムのデフォルトのフォントを使う"
 clips: "クリップ"
@@ -743,10 +743,9 @@ online: "オンライン"
 active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
-botProtection: "Botプロテクション"
+botProtection: "Bot防御"
 instanceBlocking: "インスタンスブロック"
 selectAccount: "アカウントを選択"
-switchAccount: "アカウントを切り替え"
 enabled: "有効"
 disabled: "無効"
 quickAction: "クイックアクション"
@@ -755,7 +754,7 @@ administration: "管理"
 accounts: "アカウント"
 switch: "切り替え"
 noMaintainerInformationWarning: "管理者情報が設定されていません。"
-noBotProtectionWarning: "Botプロテクションが設定されていません。"
+noBotProtectionWarning: "Bot防御が設定されていません。"
 configure: "設定する"
 postToGallery: "ギャラリーへ投稿"
 gallery: "ギャラリー"
@@ -959,6 +958,40 @@ _mfm:
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
 
+_reversi:
+  reversi: "リバーシ"
+  gameSettings: "対局の設定"
+  chooseBoard: "ボードを選択"
+  blackOrWhite: "先行/後攻"
+  blackIs: "{name}が黒(先行)"
+  rules: "ルール"
+  botSettings: "Botのオプション"
+  thisGameIsStartedSoon: "対局は数秒後に開始されます"
+  waitingForOther: "相手の準備が完了するのを待っています"
+  waitingForMe: "あなたの準備が完了するのを待っています"
+  waitingBoth: "準備してください"
+  ready: "準備完了"
+  cancelReady: "準備を再開"
+  opponentTurn: "相手のターンです"
+  myTurn: "あなたのターンです"
+  turnOf: "{name}のターンです"
+  pastTurnOf: "{name}のターン"
+  surrender: "投了"
+  surrendered: "投了により"
+  drawn: "引き分け"
+  won: "{name}の勝ち"
+  black: "黒"
+  white: "白"
+  total: "合計"
+  turnCount: "{count}ターン目"
+  myGames: "自分の対局"
+  allGames: "みんなの対局"
+  ended: "終了"
+  playing: "対局中"
+  isLlotheo: "石の少ない方が勝ち(ロセオ)"
+  loopedMap: "ループマップ"
+  canPutEverywhere: "どこでも置けるモード"
+
 _instanceTicker:
   none: "表示しない"
   remote: "リモートユーザーに表示"
@@ -1086,6 +1119,8 @@ _sfx:
   chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
+  reversiPutBlack: "リバーシ: 黒が打ったとき"
+  reversiPutWhite: "リバーシ: 白が打ったとき"
 
 _ago:
   unknown: "謎"
@@ -1327,6 +1362,69 @@ _timelines:
   social: "ソーシャル"
   global: "グローバル"
 
+_rooms:
+  roomOf: "{user}のルーム"
+  addFurniture: "家具を置く"
+  translate: "移動"
+  rotate: "回転"
+  exit: "戻る"
+  remove: "しまう"
+  clear: "片付け"
+  clearConfirm: "全ての家具をしまいますか？"
+  leaveConfirm: "未保存の変更があります、移動しますか？"
+  chooseImage: "画像を選択"
+  roomType: "部屋のタイプ"
+  carpetColor: "床の色"
+  _roomType:
+    default: "デフォルト"
+    washitsu: "和室"
+  _furnitures:
+    milk: "牛乳パック"
+    bed: "ベッド"
+    low-table: "ローテーブル"
+    desk: "デスク"
+    chair: "チェア"
+    chair2: "チェア2"
+    fan: "換気扇"
+    pc: "パソコン"
+    plant: "観葉植物"
+    plant2: "観葉植物2"
+    eraser: "消しゴム"
+    pencil: "鉛筆"
+    pudding: "プリン"
+    cardboard-box: "段ボール箱"
+    cardboard-box2: "段ボール箱2"
+    cardboard-box3: "段ボール箱3"
+    book: "本"
+    book2: "本2"
+    piano: "ピアノ"
+    facial-tissue: "ティッシュボックス"
+    server: "サーバー"
+    moon: "月"
+    corkboard: "コルクボード"
+    mousepad: "マウスパッド"
+    monitor: "モニター"
+    keyboard: "キーボード"
+    carpet-stripe: "カーペット(縞)"
+    mat: "マット"
+    color-box: "カラーボックス"
+    wall-clock: "壁掛け時計"
+    photoframe: "額縁"
+    cube: "キューブ"
+    tv: "テレビ"
+    pinguin: "ピンギン"
+    rubik-cube: "ルービックキューブ"
+    poster-h: "ポスター(横長)"
+    poster-v: "ポスター(縦長)"
+    sofa: "ソファ"
+    spiral: "螺旋階段"
+    bin: "ゴミ箱"
+    cup-noodle: "カップ麺"
+    holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"
+    doll-ai: "藍ちゃん人形"
+    banknote: "札束"
+
 _pages:
   newPage: "ページの作成"
   editPage: "ページの編集"

locales/ja-KS.yml

@@ -239,6 +239,7 @@ uploadFromUrlDescription: "このURLのファイルをアップロードした
 uploadFromUrlRequested: "アップロードしたい言うといたで"
 uploadFromUrlMayTakeTime: "アップロード終わるんにちょい時間かかるかもしれへんわ。"
 explore: "みつける"
+games: "Misskey Games"
 messageRead: "もう読んだ"
 noMoreHistory: "これより過去の履歴はあらへんで"
 startMessaging: "チャットやるで"
@@ -514,6 +515,7 @@ removeAllFollowingDescription: "{host}からのフォローをすべて解除す
 userSuspended: "このユーザーは...凍結されとる。"
 userSilenced: "このユーザーは...サイレンスされとる。"
 divider: "分割線"
+rooms: "ルーム"
 relays: "リレー"
 addRelay: "リレーの追加"
 inboxUrl: "inboxのURL"
@@ -699,6 +701,29 @@ _mfm:
   blur: "ぼかし"
   font: "フォント"
   rotate: "回転"
+_reversi:
+  reversi: "リバーシ"
+  gameSettings: "対局の設定"
+  chooseBoard: "ボードを選択"
+  blackOrWhite: "先行/後攻"
+  blackIs: "{name}が黒(先行)"
+  rules: "ルール"
+  botSettings: "Botのオプション"
+  pastTurnOf: "{name}のターン"
+  surrender: "投了"
+  surrendered: "投了により"
+  drawn: "引き分け"
+  won: "{name}の勝ち"
+  black: "黒"
+  white: "白"
+  total: "合計"
+  turnCount: "{count}ターン目"
+  myGames: "自分の対局"
+  allGames: "みんなの対局"
+  ended: "終了"
+  playing: "対局中"
+  isLlotheo: "石の少ない方が勝ち(ロセオ)"
+  loopedMap: "ループマップ"
 _instanceTicker:
   none: "表示せん"
   remote: "リモートユーザーに表示"
@@ -911,6 +936,68 @@ _timelines:
   local: "ローカル"
   social: "ソーシャル"
   global: "グローバル"
+_rooms:
+  roomOf: "{user}のルーム"
+  addFurniture: "家具を置く"
+  translate: "移動"
+  rotate: "回転"
+  exit: "戻る"
+  remove: "しまう"
+  clear: "片付け"
+  clearConfirm: "家具ぜんぶしまうけど、ホンマにええん？"
+  leaveConfirm: "未保存の変更があるけど、移動してええか？"
+  chooseImage: "画像を選ぶ"
+  roomType: "部屋のタイプ"
+  carpetColor: "床の色"
+  _roomType:
+    default: "デフォルト"
+    washitsu: "和室"
+  _furnitures:
+    milk: "牛乳パック"
+    bed: "ベッド"
+    low-table: "ローテーブル"
+    desk: "デスク"
+    chair: "チェア"
+    chair2: "チェア2"
+    fan: "換気扇"
+    pc: "パソコン"
+    plant: "観葉植物"
+    plant2: "観葉植物2"
+    eraser: "消しゴム"
+    pencil: "鉛筆"
+    pudding: "プリン"
+    cardboard-box: "段ボール箱"
+    cardboard-box2: "段ボール箱2"
+    cardboard-box3: "段ボール箱3"
+    book: "本"
+    book2: "本2"
+    piano: "ピアノ"
+    facial-tissue: "ティッシュボックス"
+    server: "サーバー"
+    moon: "月"
+    corkboard: "コルクボード"
+    mousepad: "マウスパッド"
+    monitor: "モニター"
+    keyboard: "キーボード"
+    carpet-stripe: "カーペット(縞)"
+    mat: "マット"
+    color-box: "カラーボックス"
+    wall-clock: "壁掛け時計"
+    photoframe: "額縁"
+    cube: "キューブ"
+    tv: "テレビ"
+    pinguin: "ピンギン"
+    rubik-cube: "ルービックキューブ"
+    poster-h: "ルービックキューブ"
+    poster-v: "ポスター(縦長)"
+    sofa: "ソファ"
+    spiral: "螺旋階段"
+    bin: "ゴミ箱"
+    cup-noodle: "カップ麺"
+    holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"
+    doll-ai: "藍ちゃん人形"
+    banknote: "札束"
 _pages:
   newPage: "ページを作る"
   editPage: "ページの編集"

locales/ko-KR.yml

@@ -241,6 +241,7 @@ uploadFromUrlDescription: "업로드하려는 파일의 URL"
 uploadFromUrlRequested: "업로드를 요청했습니다"
 uploadFromUrlMayTakeTime: "업로드가 완료될 때까지 시간이 소요될 수 있습니다."
 explore: "발견하기"
+games: "Misskey Games"
 messageRead: "읽음"
 noMoreHistory: "이것보다 과거의 기록이 없습니다"
 startMessaging: "대화 시작하기"
@@ -534,6 +535,7 @@ yourAccountSuspendedDescription: "이 계정은 서버의 이용 약관을 위
 menu: "메뉴"
 divider: "구분선"
 addItem: "항목 추가"
+rooms: "방"
 relays: "릴레이"
 addRelay: "릴레이 추가"
 inboxUrl: "Inbox 주소"
@@ -610,6 +612,7 @@ regenerateLoginToken: "로그인 토큰을 재생성"
 regenerateLoginTokenDescription: "로그인할 때 사용되는 내부 토큰을 재생성합니다. 일반적으로 이 작업을 실행할 필요는 없습니다. 이 기능을 사용하면 이 계정으로 로그인한 모든 기기에서 로그아웃됩니다."
 setMultipleBySeparatingWithSpace: "공백으로 구분하여 여러 개 설정할 수 있습니다."
 fileIdOrUrl: "파일 ID 또는 URL"
+chatOpenBehavior: "대화를 열 때의 동작"
 behavior: "동작"
 sample: "예시"
 abuseReports: "신고"
@@ -666,6 +669,7 @@ emailVerified: "메일 주소가 확인되었습니다."
 noteFavoritesCount: "즐겨찾기한 노트 수"
 pageLikesCount: "좋아요 한 Page 수"
 pageLikedCount: "Page에 받은 좋아요 수"
+reversiCount: "리버시 대국 횟수"
 contact: "연락처"
 useSystemFont: "시스템 기본 글꼴을 사용"
 clips: "클립"
@@ -933,6 +937,39 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
+_reversi:
+  reversi: "리버시"
+  gameSettings: "대국 설정"
+  chooseBoard: "보드 선택"
+  blackOrWhite: "선공/후공"
+  blackIs: "{name}님이 흑(선공)"
+  rules: "규칙"
+  botSettings: "Bot 설정"
+  thisGameIsStartedSoon: "잠시 후에 대국이 시작됩니다"
+  waitingForOther: "상대의 준비가 완료될 때까지 기다리고 있습니다"
+  waitingForMe: "당신의 준비 완료를 기다리고 있습니다"
+  waitingBoth: "준비해 주세요"
+  ready: "준비 완료"
+  cancelReady: "준비 취소"
+  opponentTurn: "상대의 차례입니다"
+  myTurn: "당신의 차례입니다"
+  turnOf: "{name}님의 차례입니다"
+  pastTurnOf: "{name}님의 차례"
+  surrender: "기권"
+  surrendered: "기권에 의해"
+  drawn: "무승부"
+  won: "{name}님의 승리"
+  black: "흑"
+  white: "백"
+  total: "합계"
+  turnCount: "{count}턴 째"
+  myGames: "내 대국"
+  allGames: "모두의 대국"
+  ended: "종료"
+  playing: "지금 대국 중"
+  isLlotheo: "돌이 적은 사람이 승리 (llotheo)"
+  loopedMap: "루프 지도"
+  canPutEverywhere: "어디에나 놓을 수 있음"
 _instanceTicker:
   none: "보이지 않음"
   remote: "리모트 유저에게만 보이기"
@@ -1052,6 +1089,8 @@ _sfx:
   chatBg: "대화 (백그라운드)"
   antenna: "안테나 수신"
   channel: "채널 알림"
+  reversiPutBlack: "리버시: 흑돌을 두었을 때"
+  reversiPutWhite: "리버시: 백돌을 두었을 때"
 _ago:
   unknown: "알 수 없음"
   future: "미래"
@@ -1274,6 +1313,68 @@ _timelines:
   local: "로컬"
   social: "소셜"
   global: "글로벌"
+_rooms:
+  roomOf: "{user}의 방"
+  addFurniture: "가구를 배치"
+  translate: "이동"
+  rotate: "회전"
+  exit: "뒤로"
+  remove: "치우기"
+  clear: "모두 치우기"
+  clearConfirm: "정말 방 안의 모든 가구를 치우시겠습니까?"
+  leaveConfirm: "저장되지 않은 변경 사항이 있습니다. 정말 나가시겠습니까?"
+  chooseImage: "이미지 선택"
+  roomType: "방 스타일"
+  carpetColor: "바닥 색상"
+  _roomType:
+    default: "기본값"
+    washitsu: "일본식"
+  _furnitures:
+    milk: "우유 팩"
+    bed: "침대"
+    low-table: "낮은 테이블"
+    desk: "책상"
+    chair: "의자"
+    chair2: "의자 2"
+    fan: "환기구"
+    pc: "컴퓨터"
+    plant: "관엽식물"
+    plant2: "관엽식물 2"
+    eraser: "지우개"
+    pencil: "연필"
+    pudding: "푸딩"
+    cardboard-box: "골판지 상자"
+    cardboard-box2: "골판지 상자 2"
+    cardboard-box3: "골판지 상자 3"
+    book: "책"
+    book2: "책 2"
+    piano: "피아노"
+    facial-tissue: "휴지 상자"
+    server: "서버"
+    moon: "달"
+    corkboard: "게시판"
+    mousepad: "마우스 패드"
+    monitor: "모니터"
+    keyboard: "키보드"
+    carpet-stripe: "카페트 (줄무늬)"
+    mat: "매트"
+    color-box: "책장"
+    wall-clock: "벽걸이 시계"
+    photoframe: "액자"
+    cube: "큐브"
+    tv: "TV"
+    pinguin: "펭귄"
+    rubik-cube: "루빅스 큐브"
+    poster-h: "포스터 (가로)"
+    poster-v: "포스터 (세로)"
+    sofa: "소파"
+    spiral: "나선형 계단"
+    bin: "휴지통"
+    cup-noodle: "컵라면"
+    holo-display: "홀로그램"
+    energy-drink: "에너지 드링크"
+    doll-ai: "아이쨩 인형"
+    banknote: "지폐뭉치"
 _pages:
   newPage: "페이지 만들기"
   editPage: "페이지 수정"

locales/nl-NL.yml

@@ -212,6 +212,7 @@ uploadFromUrlDescription: "URL van het bestand dat je wil uploaden"
 uploadFromUrlRequested: "Uploadverzoek"
 uploadFromUrlMayTakeTime: "Het kan even duren voordat het uploaden voltooid is."
 explore: "Verkennen"
+games: "Misskey spellen"
 messageRead: "Lezen"
 noMoreHistory: "Er is geen verdere geschiedenis"
 startMessaging: "Start een gesprek"
@@ -293,6 +294,11 @@ _exportOrImport:
   excludeInactiveUsers: "Negeer inactieve gebruikers"
 _timelines:
   home: "Startpagina"
+_rooms:
+  _roomType:
+    default: "Standaard"
+  _furnitures:
+    monitor: "Monitor"
 _pages:
   blocks:
     image: "Afbeeldingen"

locales/pl-PL.yml

@@ -81,8 +81,6 @@ somethingHappened: "Coś poszło nie tak"
 retry: "Spróbuj ponownie"
 pageLoadError: "Nie udało się załadować strony"
 pageLoadErrorDescription: "Zwykle jest to spowodowane problemem z siecią lub cache przeglądarki. Spróbuj wyczyścić cache i sprawdź jeszcze raz za chwilę."
-serverIsDead: "Serwer nie odpowiada. Zaczekaj chwilę i spróbuj ponownie."
-youShouldUpgradeClient: "Odśwież stronę, by zaaktualizować klienta."
 enterListName: "Nazwa listy"
 privacy: "Prywatność"
 makeFollowManuallyApprove: "Prośby o możliwość obserwacji wymagają zatwierdzenia"
@@ -106,7 +104,6 @@ clickToShow: "Kliknij, aby wyświetlić"
 sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
-reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
 reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
 attachCancel: "Usuń załącznik"
@@ -183,7 +180,6 @@ instanceInfo: "Informacje o instancji"
 statistics: "Statystyki"
 clearQueue: "Wyczyść kolejkę"
 clearQueueConfirmTitle: "Czy na pewno chcesz wyczyścić kolejkę?"
-clearQueueConfirmText: "Wszystkie niewysłane wpisy z kolejki nie zostaną wysłane. Zwykle to nie jest konieczne."
 clearCachedFiles: "Wyczyść pamięć podręczną"
 clearCachedFilesConfirm: "Czy na pewno chcesz usunąć wszystkie zdalne pliki z pamięci podręcznej?"
 blockedInstances: "Zablokowane instancje"
@@ -223,7 +219,6 @@ more: "Więcej!"
 featured: "Wyróżnione"
 usernameOrUserId: "Nazwa lub id użytkownika"
 noSuchUser: "Nie znaleziono użytkownika"
-lookup: "Zapytania"
 announcements: "Ogłoszenia"
 imageUrl: "Adres URL obrazka"
 remove: "Usuń"
@@ -241,6 +236,7 @@ uploadFromUrlDescription: "Adres URL pliku, który chcesz wysłać"
 uploadFromUrlRequested: "Zażądano wysłania"
 uploadFromUrlMayTakeTime: "Wysyłanie może chwilę potrwać."
 explore: "Eksploruj"
+games: "Gry Misskey"
 messageRead: "Przeczytano"
 noMoreHistory: "Nie ma dalszej historii"
 startMessaging: "Rozpocznij czat"
@@ -312,28 +308,22 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Strony"
 integration: "Integracja"
-connectService: "Połącz"
-disconnectService: "Rozłącz"
 enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
 disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
 enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
-proxyRemoteFiles: "Przekierowuj pliki obcych instancji przez proxy"
-proxyRemoteFilesDescription: "Gdy ta opcja jest włączona, zdalne pliki które nie są przechowywane lokalnie, lub zostały usunięte z powodu przekroczenia limitu miejsca będą kierowane przez proxy, razem z generowaniem miniatur. Nie ma to żadnego wpływu na przestrzeń dyskową serwera."
 driveCapacityPerLocalAccount: "Powierzchnia dyskowa na lokalnego użytkownika"
 driveCapacityPerRemoteAccount: "Powierzchnia dyskowa na zdalnego użytkownika"
 inMb: "W megabajtach"
 iconUrl: "Adres URL ikony"
 bannerUrl: "Adres URL banera"
-backgroundImageUrl: "Adres URL tła"
 basicInfo: "Podstawowe informacje"
 pinnedUsers: "Przypięty użytkownik"
 pinnedUsersDescription: "Wypisz po jednej nazwie użytkownika w wierszu. Podani użytkownicy zostaną przypięci pod kartą „Eksploruj”."
 pinnedPages: "Przypięte strony"
 pinnedPagesDescription: "Wprowadź ścieżki stron które chcesz przypiąć na głównej stronie instancji, oddzielone znakiem nowego wiersza."
-pinnedClipId: "ID przypiętego klipu"
 pinnedNotes: "Przypięty wpis"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Włącz hCaptcha"
@@ -348,9 +338,7 @@ antennas: "Anteny"
 manageAntennas: "Zarządzaj Antenami"
 name: "Nazwa"
 antennaSource: "Źródło Anteny"
-antennaKeywords: "Słowa kluczowe do obserwacji"
 antennaExcludeKeywords: "Wykluczone słowa kluczowe"
-antennaKeywordsDescription: "Oddziel spacjami dla warunku AND, albo wymuś koniec linii dla warunku OR"
 notifyAntenna: "Powiadamiaj o nowych wpisach"
 withFileAntenna: "Filtruj tylko wpisy z załączonym plikiem"
 enableServiceworker: "Włącz ServiceWorker"
@@ -527,6 +515,7 @@ userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
+rooms: "Pokój"
 relays: "Przekaźniki"
 addRelay: "Dodaj przekaźnik"
 inboxUrl: "Adres URL skrzynki nadawczej"
@@ -597,9 +586,8 @@ useGlobalSetting: "Użyj globalnych ustawień"
 useGlobalSettingDesc: "Jeżeli włączone, zostaną wykorzystane ustawienia powiadomień Twojego konta. Jeżeli wyłączone, mogą zostać wykonane oddzielne konfiguracje."
 other: "Inne"
 regenerateLoginToken: "Generuj token logowania ponownie"
-regenerateLoginTokenDescription: "Regeneruje token używany wewnętrznie podczas logowania. Zazwyczaj nie jest to konieczne. Po regeneracji wszystkie urządzenia zostaną wylogowane."
 setMultipleBySeparatingWithSpace: "Możesz ustawić wiele, oddzielając je spacjami."
-fileIdOrUrl: "ID pliku albo URL"
+chatOpenBehavior: "Zachowanie okna czatu po otwarciu"
 behavior: "Zachowanie"
 sample: "Przykład"
 abuseReports: "Zgłoszenia"
@@ -607,8 +595,6 @@ reportAbuse: "Zgłoś"
 reportAbuseOf: "Zgłoś {name}"
 fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy ono określonego wpisu, uwzględnij jego adres URL."
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
-reporteeOrigin: "Pochodzenie zgłoszonego"
-reporterOrigin: "Pochodzenie zgłaszającego"
 send: "Wyślij"
 abuseMarkAsResolved: "Oznacz zgłoszenie jako rozwiązane"
 openInNewTab: "Otwórz w nowej karcie"
@@ -621,7 +607,7 @@ random: "Losowe"
 system: "System"
 switchUi: "Przełącz interfejs użytkownika"
 desktop: "Pulpit"
-createNew: "Utwórz nowy"
+createNew: "Utworzy nowy"
 optional: "Nieobowiązkowe"
 public: "Publiczny"
 i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
@@ -644,7 +630,6 @@ driveFilesCount: "Liczba plików na dysku"
 driveUsage: "Użycie przestrzeni dyskowej"
 noCrawle: "Odrzuć indeksowanie przez crawlery"
 noCrawleDescription: "Proś wyszukiwarki internetowe, aby nie indeksowały Twojego profilu, wpisów, stron itd."
-lockedAccountInfo: "Dopóki nie ustawisz widoczności wpisu na \"Obserwujący\", twoje wpisy będą mogli widzieć wszyscy, nawet jeśli ustawisz manualne zatwierdzanie obserwujących."
 alwaysMarkSensitive: "Oznacz domyślnie jako NSFW"
 loadRawImages: "Wyświetlaj zdjęcia w załącznikach w całości zamiast miniatur"
 disableShowingAnimatedImages: "Nie odtwarzaj animowanych obrazów"
@@ -654,6 +639,7 @@ emailVerified: "Adres e-mail został potwierdzony"
 noteFavoritesCount: "Liczba polubionych wpisów"
 pageLikesCount: "Liczba otrzymanych polubień stron"
 pageLikedCount: "Liczba polubionych stron"
+reversiCount: "Liczba rozgrywek Reversi"
 contact: "Kontakt"
 useSystemFont: "Używaj domyślnej czcionki systemu"
 experimentalFeatures: "Eksperymentalne funkcje"
@@ -667,7 +653,6 @@ center: "Wyśsrodkuj"
 wide: "Szerokie"
 narrow: "Wąskie"
 reloadToApplySetting: "To ustawienie zostanie zastosowane po odświeżeniu strony. Chcesz odświeżyć?"
-needReloadToApply: "To ustawienie zostanie zastosowane po odświeżeniu strony"
 showTitlebar: "Pokazuj pasek tytułowy"
 clearCache: "Wyczyść pamięć podręczną"
 onlineUsersCount: "{n} osób jest online"
@@ -712,8 +697,6 @@ unlikeConfirm: "Na pewno chcesz usunąć polubienie?"
 fullView: "Pełny widok"
 quitFullView: "Opuść pełny widok"
 addDescription: "Dodaj opis"
-userPagePinTip: "Możesz wyświetlać wpisy w tym miejscu po wybraniu \"Przypnij do profilu\" z menu pojedyńczego wpisu"
-notSpecifiedMentionWarning: "Ten wpis zawiera wzmianki o użytkownikach niezawartych jako odbiorcy"
 info: "Informacje"
 userInfo: "Informacje o użykowniku"
 unknown: "Nieznane"
@@ -751,15 +734,9 @@ middle: "Średnie"
 low: "Niski"
 emailNotConfiguredWarning: "Nie podano adresu e-mail"
 ratio: "Stosunek"
-previewNoteText: "Pokaż podgląd"
-customCss: "Własny CSS"
-customCssWarn: "Używaj tego ustawienia tylko wtedy, gdy wiesz co ono robi. Nieprawidłowe wpisy mogą spowodować, że klient przestanie działać poprawnie."
 global: "Globalna"
-squareAvatars: "Wyświetlaj kwadratowe awatary"
 sent: "Wyślij"
-received: "Otrzymane"
 hashtags: "Hashtag"
-pubSub: "Konta Pub/Sub"
 hide: "Ukryj"
 _ffVisibility:
   public: "Publikuj"
@@ -839,6 +816,36 @@ _mfm:
   font: "Czcionka"
   fontDescription: "Wybiera czcionkę do wyświetlania treści."
   rotate: "Obróć"
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Ustawienia gry"
+  chooseBoard: "Wybierz tablicę"
+  blackOrWhite: "Czarne/białe"
+  blackIs: "{name} gra czarnymi"
+  rules: "Zasady"
+  botSettings: "Opcje bota"
+  thisGameIsStartedSoon: "Gra rozpocznie się za kilka sekund"
+  waitingForOther: "Oczekiwanie na ruch przeciwnika"
+  waitingForMe: "Oczekiwanie na Twój ruch"
+  waitingBoth: "Przygotuj się"
+  ready: "Gotowy(-a)"
+  cancelReady: "Anuluj gotowość"
+  opponentTurn: "Kolej przeciwnika"
+  myTurn: "Twoja kolej"
+  turnOf: "Kolej {name}"
+  pastTurnOf: "Kolej {name}"
+  surrender: "Poddaj się"
+  surrendered: "Przez poddanie się"
+  drawn: "Remis"
+  won: "{name} wygrał(a)"
+  black: "Czarny"
+  white: "Biały"
+  total: "Łącznie"
+  turnCount: "Ruch {count}"
+  myGames: "Moje gry"
+  allGames: "Wszystkie gry"
+  ended: "Zakończono"
+  playing: "W trakcie gry"
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
@@ -946,6 +953,8 @@ _sfx:
   chat: "Wiadomości"
   chatBg: "Rozmowy (tło)"
   channel: "Powiadomienia kanału"
+  reversiPutBlack: "Reversi: Czarny wykonuje ruch"
+  reversiPutWhite: "Reversi: Biały wykonuje ruch"
 _ago:
   unknown: "Nieznane"
   future: "W przyszłości"
@@ -968,7 +977,6 @@ _tutorial:
   step1_3: "Twoja oś czasu jest jeszcze pusta, ponieważ nie opublikowałeś(-aś) jeszcze żadnych wpisów i nie obserwujesz jeszcze nikogo."
   step2_1: "Ukończmy konfigurację profilu zanim utworzymy wpis lub zaczniemy kogoś obserwować."
   step3_1: "Zakończyłeś(-aś) konfigurację profilu?"
-  step3_3: "Wypełnij pole i kliknij przycisk w prawym górnym rogu by wysłać post."
 _2fa:
   registerDevice: "Zarejestruj nowe urządzenie"
   step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
@@ -1040,7 +1048,7 @@ _poll:
   deadlineDate: "Data zakończenia"
   deadlineTime: "godz."
   duration: "Czas trwania"
-  votesCount: "{n} głosów"
+  votesCount: "{} głosów"
   totalVotes: "Łącznie {n} głosów"
   vote: "Głosowanie w ankiecie"
   showResult: "Pokaż wyniki"
@@ -1101,6 +1109,65 @@ _timelines:
   local: "Lokalne"
   social: "Społeczność"
   global: "Globalna"
+_rooms:
+  roomOf: "Pokój {user}"
+  addFurniture: "Umieść meble"
+  translate: "Przenieś"
+  rotate: "Obróć"
+  exit: "Wróć"
+  remove: "Usuń"
+  clear: "Usuń wszystkie"
+  clearConfirm: "Czy na pewno chcesz usunąć wszystkie meble ze swojego pokoju?"
+  leaveConfirm: "Masz niezapisane zmiany. Czy na pewno chcesz wyjść?"
+  chooseImage: "Wybierz obraz"
+  roomType: "Typ pokoju"
+  carpetColor: "Kolor dywanu"
+  _roomType:
+    default: "Domyślne"
+    washitsu: "W japońskim stylu"
+  _furnitures:
+    milk: "Karton mleka"
+    bed: "Łóżko"
+    low-table: "Niski stolik"
+    desk: "Biurko"
+    chair: "Krzesło"
+    chair2: "Krzesło 2"
+    fan: "Chłodzenie"
+    pc: "Komputer"
+    plant: "Roślina domowa"
+    plant2: "Roślina domowa 2"
+    eraser: "Gumka"
+    pencil: "Ołówek"
+    pudding: "Budyń"
+    cardboard-box: "Pudło tekturowe"
+    cardboard-box2: "Pudło tekturowe 2"
+    cardboard-box3: "Pudło tekturowe 3"
+    book: "Książka"
+    book2: "Książka 2"
+    piano: "Fortepian"
+    server: "Serwery"
+    moon: "Księżyc"
+    corkboard: "Tablica korkowa"
+    mousepad: "Podkładka pod mysz"
+    monitor: "Monitor"
+    keyboard: "Klawiatura"
+    carpet-stripe: "Dywan (w paski)"
+    color-box: "Biblioteczka"
+    wall-clock: "Zegar ścienny"
+    photoframe: "Ramka do zdjęć"
+    cube: "Kostka"
+    tv: "Telewizor"
+    pinguin: "Pingwin"
+    rubik-cube: "Kostka Rubika"
+    poster-h: "Plakat (poziomy)"
+    poster-v: "Plakat (pionowy)"
+    sofa: "Kanapa"
+    spiral: "Schody spiralne"
+    bin: "Kosz"
+    holo-display: "Wyświetlacz holograficzny"
+    energy-drink: "Napój energetyczny"
+    doll-ai: "Lalka AI"
+    banknote: "Banknot"
 _pages:
   newPage: "Utwórz stronę"
   editPage: "Edytuj tę stronę"

locales/ru-RU.yml

@@ -106,7 +106,6 @@ clickToShow: "Нажмите для просмотра"
 sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
-reactionSetting: "Реакции, отображаемые в палитре"
 reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
 attachCancel: "Удалить вложение"
@@ -128,7 +127,7 @@ selectAntenna: "Выберите антенну"
 selectWidget: "Выберите виджет"
 editWidgets: "Редактировать виджеты"
 editWidgetsExit: "Готово"
-customEmojis: "Собственные эмодзи"
+customEmojis: "Эмодзи пользователя"
 emoji: "Эмодзи"
 emojis: "Эмодзи"
 emojiName: "Название эмодзи"
@@ -201,7 +200,7 @@ done: "Готово"
 processing: "Обработка"
 preview: "Предпросмотр"
 default: "По умолчанию"
-noCustomEmojis: "Собственные эмодзи отсутствуют"
+noCustomEmojis: "Эмодзи пользователя отсутствуют"
 noJobs: "Нет заданий"
 federating: "Федерируется"
 blocked: "Заблокировано"
@@ -242,6 +241,7 @@ uploadFromUrlDescription: "Ссылка на файл, который хотит
 uploadFromUrlRequested: "Загрузка выбранного"
 uploadFromUrlMayTakeTime: "Загрузка может занять некоторое время."
 explore: "Обзор"
+games: "Игры Misskey"
 messageRead: "Прочитали"
 noMoreHistory: "История закончилась"
 startMessaging: "Начать общение"
@@ -447,7 +447,6 @@ uiLanguage: "Язык интерфейса"
 groupInvited: "Приглашение в группу"
 aboutX: "Описание {x}"
 useOsNativeEmojis: "Использовать эмодзи операционной системы"
-disableDrawer: "Не использовать выдвижные меню"
 youHaveNoGroups: "У вас нет ни одной группы"
 joinOrCreateGroup: "Получайте приглашения в группы или создавайте свои собственные"
 noHistory: "История пока пуста"
@@ -536,6 +535,7 @@ yourAccountSuspendedDescription: "Эта учетная запись была з
 menu: "Меню"
 divider: "Линия-разделитель"
 addItem: "Добавить элемент"
+rooms: "Комната"
 relays: "Ретрансляторы"
 addRelay: "Добавить ретранслятор"
 inboxUrl: "URL ящика входящих сообщений"
@@ -591,7 +591,6 @@ smtpSecure: "Использовать SSL/TLS для SMTP-соединений"
 smtpSecureInfo: "Выключите при использовании STARTTLS."
 testEmail: "Проверка доставки электронной почты"
 wordMute: "Скрытие слов"
-instanceMute: "Глушение инстансов"
 userSaysSomething: "{name} что-то сообщает"
 makeActive: "Активировать"
 display: "Отображение"
@@ -612,6 +611,7 @@ regenerateLoginToken: "Создать новый токен для входа"
 regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы во время входа. Обычно в этом нет необходимости. При создании все устройства будут отключены."
 setMultipleBySeparatingWithSpace: "Можно написать несколько через пробел"
 fileIdOrUrl: "Идентификатор файла или ссылка"
+chatOpenBehavior: "Поведение окна чата при открытии"
 behavior: "Поведение"
 sample: "Пример"
 abuseReports: "Жалобы"
@@ -619,8 +619,8 @@ reportAbuse: "Жалоба"
 reportAbuseOf: "Пожаловаться на пользователя {name}"
 fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь о конкретной заметке, будьте добры приложить ссылку на неё."
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
-reporteeOrigin: "О ком сообщено"
+reporteeOrigin: "Куда сообщать"
-reporterOrigin: "Кто сообщил"
+reporterOrigin: "Сообщено"
 send: "Отправить"
 abuseMarkAsResolved: "Отметить жалобу как решённую"
 openInNewTab: "Открыть в новой вкладке"
@@ -668,6 +668,7 @@ emailVerified: "Адрес электронной почты подтвержд
 noteFavoritesCount: "Количество добавленного в избранное"
 pageLikesCount: "Количество понравившихся страниц"
 pageLikedCount: "Количество страниц, понравившихся другим"
+reversiCount: "Количество сыгранных игр в реверси"
 contact: "Как связаться"
 useSystemFont: "Использовать шрифт, предлагаемый системой"
 clips: "Подборки"
@@ -682,7 +683,6 @@ center: "По центру"
 wide: "Толстый"
 narrow: "Тонкий"
 reloadToApplySetting: "Это настройка вступает в силу при загрузке страницы. Перезагрузить сейчас?"
-needReloadToApply: "Изменения вступят в силу после перезагрузки страницы."
 showTitlebar: "Показать заголовок"
 clearCache: "Очистить кэш"
 onlineUsersCount: "Пользователей сейчас в сети: {n}"
@@ -767,7 +767,7 @@ middle: "Средне"
 low: "Низкий"
 emailNotConfiguredWarning: "Не указан адрес электронной почты"
 ratio: "Соотношение"
-previewNoteText: "Предварительный просмотр"
+previewNoteText: "Предварительный просмотр текста"
 customCss: "Индивидуальный CSS"
 customCssWarn: "Используйте эту настройку только если знаете, что делаете. Ошибки здесь чреваты тем, что сайт перестанет нормально работать у вас."
 global: "Всеобщая"
@@ -782,19 +782,16 @@ learnMore: "Подробнее"
 misskeyUpdated: "Misskey обновился!"
 whatIsNew: "Что новенького?"
 translate: "Перевод"
-translatedFrom: "Перевод. Язык оригинала — {x}"
+translatedFrom: "{x}Перевод с английского"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
 usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
 aiChanMode: "ИИ режим"
 keepCw: "Сохраняйте Предупреждения о содержимом"
-pubSub: "Учётные записи Pub/Sub"
 lastCommunication: "Последнее сообщение"
-resolved: "Решено"
+resolved: "Решен"
-unresolved: "Без решения"
+unresolved: "Неразрешенные"
-breakFollow: "Отписка"
+itsOff: "Он выключен!"
-itsOn: "Включено"
+emailRequiredForSignup: "Требуется адрес электронной почты для регистрации аккаунта"
-itsOff: "Выключено"
-emailRequiredForSignup: "Для регистрации учётной записи нужен адрес электронной почты"
 unread: "Непрочитанное"
 filter: "Фильтры"
 controlPanel: "Панель управления"
@@ -802,38 +799,25 @@ manageAccounts: "Управление аккаунтом"
 makeReactionsPublic: "Опубликовать список реакций"
 makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра всем желающим."
 classic: "Классика"
-muteThread: "Заглушить цепочку"
+unmuteThread: "Отключить звук"
-unmuteThread: "Отменить глушение цепочки"
+ffVisibilityDescription: "Вы можете установить объем вашей следующей/последней информации."
-ffVisibility: "Видимость подписок и подписчиков"
-ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и подписчиков."
-continueThread: "Показать следующие ответы"
-deleteAccountConfirm: "Учётная запись будет безвозвратно удалена. Подтверждаете?"
-incorrectPassword: "Пароль неверен."
-voteConfirm: "Отдать голос за «{choice}»?"
 hide: "Спрятать"
-leaveGroup: "Покинуть группу"
+leaveGroupConfirm: "Вы хотите оставить \"{name}\"?"
-leaveGroupConfirm: "Покинуть группу «{name}»?"
-useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
-welcomeBackWithName: "С возвращением, {name}!"
-clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
 _emailUnavailable:
   used: "Уже используется"
-  format: "Неверный формат"
+  format: "Неправильный формат"
-  disposable: "Временный адрес электронной почты не принимается"
-  mx: "Неверный почтовый сервер"
   smtp: "Почтовый сервер не отвечает"
 _ffVisibility:
-  public: "Общедоступны"
+  public: "Опубликовать"
-  followers: "Показываются только подписчикам"
+  private: "Частный"
-  private: "Показываются только вам"
 _signup:
   almostThere: "Почти готово!"
-  emailAddressInfo: "Введите ваш адрес электронной почты."
+  emailAddressInfo: "Пожалуйста, введите адрес электронной почты, который вы используете."
-  emailSent: "На указанный вами адрес электронной почты ({email}) отправлено письмо. Перейдите по ссылке в письме, чтобы завершить регистрацию."
+  emailSent: "На указанный вами адрес электронной почты ({email}) было отправлено письмо с подтверждением. Перейдите по ссылке в электронном письме, чтобы завершить создание учетной записи."
 _accountDelete:
-  accountDelete: "Удалить свою учётную запись"
+  accountDelete: "Удалить свой аккаунт"
-  mayTakeTime: "Удаление учётной записи — ресурсозатратный процесс. Он может занять много времени, если вы много писали и загружали файлов."
+  mayTakeTime: "Удаление учетной записи - это тяжелый процесс, который может занять много времени, если у вас создано много контента или загружено много файлов."
-  sendEmail: "Когда ваша учетная запись будет удалена, мы сообщим на указанную вами электронную почту."
+  sendEmail: "Мы отправим уведомление на зарегистрированный вами адрес электронной почты, когда ваша учетная запись будет удалена."
   requestAccountDelete: "Запросить удаление вашей учетной записи"
   started: "Процесс удаления начался."
   inProgress: "Удаление в процессе"
@@ -905,7 +889,7 @@ _mfm:
   blockMathDescription: "Оформляет математическое выражение (KaTeX) на отдельной строке."
   quote: "Цитата"
   quoteDescription: "Так можно процитировать чей-то текст."
-  emoji: "Собственные эмодзи"
+  emoji: "Эмодзи пользователя"
   emojiDescription: "Можно вставить эмодзи в текст, окружив название двоеточиями."
   search: "Поиск"
   searchDescription: "Можно добавить форму для поиска, сразу задав, что искать."
@@ -937,10 +921,43 @@ _mfm:
   fontDescription: "Так можно писать произвольным шрифтом."
   rainbow: "Радуга"
   rainbowDescription: "Заставлять содержимое отображаться в цветах радуги."
-  sparkle: "Искры"
+  sparkle: "Блеск"
-  sparkleDescription: "Добавляет эффект искрящихся частиц."
+  sparkleDescription: "Добавьте эффект искрящихся частиц."
   rotate: "Повернуть"
-  rotateDescription: "Поворачивает на заданный угол."
+  rotateDescription: "Повернуть на указанный угол."
+_reversi:
+  reversi: "Реверси"
+  gameSettings: "Настройки игры"
+  chooseBoard: "Выберите доску"
+  blackOrWhite: "Черные/Белые"
+  blackIs: "{name} за чёрных"
+  rules: "Правила"
+  botSettings: "Настройки бота"
+  thisGameIsStartedSoon: "Игра скоро начнётся."
+  waitingForOther: "Ожидание соперника..."
+  waitingForMe: "В ожидании, когда будете готовы."
+  waitingBoth: "Приготовьтесь."
+  ready: "Готово"
+  cancelReady: "Возврат к подготовке"
+  opponentTurn: "Ход соперника"
+  myTurn: "Ваш ход"
+  turnOf: "Ходит {name}."
+  pastTurnOf: "Ходит {name}."
+  surrender: "Сдаться"
+  surrendered: "Противник сдался"
+  drawn: "Ничья"
+  won: "Победитель — {name}"
+  black: "Чёрные"
+  white: "Белые"
+  total: "Всего"
+  turnCount: "Ход {count}"
+  myGames: "Сыгранное вами"
+  allGames: "Все игры"
+  ended: "Завершена"
+  playing: "Идёт игра"
+  isLlotheo: "Выигрывает меньшее число камней (LLoTheO)"
+  loopedMap: "Замкнутая в кольцо доска"
+  canPutEverywhere: "Камни можно ставить везде"
 _instanceTicker:
   none: "Не показывать"
   remote: "Только для других сайтов"
@@ -973,8 +990,6 @@ _wordMute:
   soft: "Мягкий"
   hard: "Жёсткий"
   mutedNotes: "Скрытые заметки"
-_instanceMute:
-  heading: "Список заглушенных инстансов"
 _theme:
   explore: "Обзор"
   install: "Установить тему"
@@ -1057,6 +1072,8 @@ _sfx:
   chatBg: "Сообщения (фон)"
   antenna: "Антенна"
   channel: "Канал"
+  reversiPutBlack: "Реверси — ход чёрных"
+  reversiPutWhite: "Реверси — ход белых"
 _ago:
   unknown: "Когда-то"
   future: "Из будущего"
@@ -1134,10 +1151,10 @@ _permissions:
   "write:user-groups": "Изменять и удалять группы пользователей"
   "read:channels": "Смотреть каналы"
   "write:channels": "Изменять каналы"
-  "read:gallery": "Просмотр галереи"
+  "read:gallery": "Смотреть галерею"
-  "write:gallery": "Редактирование галереи"
+  "write:gallery": "Работа с галереей"
-  "read:gallery-likes": "Просмотр списка понравившегося в галерее"
+  "read:gallery-likes": "Посмотреть галерею лайков"
-  "write:gallery-likes": "Изменение списка понравившегося в галерее"
+  "write:gallery-likes": "Манипулируйте понравившейся галереей"
 _auth:
   shareAccess: "Дать доступ для «{name}» к вашей учётной записи?"
   shareAccessAsk: "Уверены, что хотите дать приложению доступ к своей учётной записи?"
@@ -1246,8 +1263,6 @@ _exportOrImport:
   muteList: "Скрытые"
   blockingList: "Заблокированные"
   userLists: "Списки"
-  excludeMutingUsers: "За исключением заглушенных пользователей"
-  excludeInactiveUsers: "Без неактивных учётных записей"
 _charts:
   federationInstancesIncDec: "Изменение внешних связей"
   federationInstancesTotal: "Количество внешних связей"
@@ -1279,6 +1294,68 @@ _timelines:
   local: "Местная"
   social: "Социальная"
   global: "Всеобщая"
+_rooms:
+  roomOf: "Комната {user}"
+  addFurniture: "Добавить обстановку"
+  translate: "Передвинуть"
+  rotate: "Повернуть"
+  exit: "Выход"
+  remove: "Выбросить"
+  clear: "Очистить"
+  clearConfirm: "Уверены что стоит убрать всю обстановку из вашей комнаты?"
+  leaveConfirm: "Изменения не сохранены, правда хотите покинуть комнату?"
+  chooseImage: "Выберите изображение"
+  roomType: "Стиль комнаты"
+  carpetColor: "Цвет ковра"
+  _roomType:
+    default: "По умолчанию"
+    washitsu: "Японская"
+  _furnitures:
+    milk: "Пакет молока"
+    bed: "Кровать"
+    low-table: "Журнальный стол"
+    desk: "Письменный стол"
+    chair: "Стул"
+    chair2: "Стул 2"
+    fan: "Вентилятор"
+    pc: "Системный блок"
+    plant: "Растение в горшке"
+    plant2: "Растение в горшке 2"
+    eraser: "Ластик"
+    pencil: "Карандаш"
+    pudding: "Пудинг"
+    cardboard-box: "Картонная коробка"
+    cardboard-box2: "Картонная коробка 2"
+    cardboard-box3: "Картонная коробка 3"
+    book: "Книга"
+    book2: "Книга про Misskey"
+    piano: "Пианино"
+    facial-tissue: "Салфетки"
+    server: "Сервер"
+    moon: "Луна"
+    corkboard: "Пробковая доска"
+    mousepad: "Коврик для мыши"
+    monitor: "Монитор"
+    keyboard: "Клавиатура"
+    carpet-stripe: "Полосатый ковёр"
+    mat: "Мат"
+    color-box: "Книжная полка"
+    wall-clock: "Настенные часы"
+    photoframe: "Картина в раме"
+    cube: "Куб"
+    tv: "Телевизор"
+    pinguin: "Пингвин"
+    rubik-cube: "Кубик Рубика"
+    poster-h: "Плакат (альбомная ориентация)"
+    poster-v: "Плакат (портретная ориентация)"
+    sofa: "Диван"
+    spiral: "Спиральная лестница"
+    bin: "Мусорное ведро"
+    cup-noodle: "Стакан лапши"
+    holo-display: "Голографический проектор"
+    energy-drink: "Банка энергетического напитка"
+    doll-ai: "Кукла Ай-тян"
+    banknote: "Пачка денег"
 _pages:
   newPage: "Создать страницу"
   editPage: "Править страницу"

locales/uk-UA.yml

@@ -236,6 +236,7 @@ uploadFromUrlDescription: "Посилання на файл для завант
 uploadFromUrlRequested: "Завантаження розпочалось"
 uploadFromUrlMayTakeTime: "Завантаження може зайняти деякий час."
 explore: "Огляд"
+games: "Ігри Misskey"
 messageRead: "Прочитано"
 noMoreHistory: "Подальшої історії немає"
 startMessaging: "Розпочати діалог"
@@ -518,6 +519,7 @@ userSuspended: "Обліковий запис заблокований."
 userSilenced: "Обліковий запис приглушений."
 divider: "Розділювач"
 addItem: "Додати елемент"
+rooms: "Кімнати"
 relays: "Ретранслятори"
 addRelay: "Додати ретранслятор"
 inboxUrl: "Inbox URL"
@@ -590,6 +592,7 @@ regenerateLoginToken: "Оновити Login Token"
 regenerateLoginTokenDescription: "Регенерувати внутрішній ключ використовуваний під час входу. Зазвичай цього не потрібно робити. При регенерації всі пристрої вийдуть з системи."
 setMultipleBySeparatingWithSpace: "Можна вказати кілька значень, відділивши їх пробілом."
 fileIdOrUrl: "Ідентифікатор файлу або посилання"
+chatOpenBehavior: "Поводження вікна переписки під час відкриття"
 behavior: "Поведінка"
 sample: "Приклад"
 abuseReports: "Скарги"
@@ -644,6 +647,7 @@ emailVerified: "Електронну пошту підтверджено."
 noteFavoritesCount: "Кількість улюблених нотаток"
 pageLikesCount: "Кількість отриманих вподобань сторінки"
 pageLikedCount: "Кількість вподобаних сторінок"
+reversiCount: "Кількість матчів \"Реверсі\""
 contact: "Контакт"
 useSystemFont: "Використовувати стандартний шрифт системи"
 clips: "Добірка"
@@ -768,6 +772,37 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
+_reversi:
+  reversi: "Реверсі"
+  gameSettings: "Налаштування гри"
+  chooseBoard: "Вибір дошки"
+  blackOrWhite: "Чорні / Білі"
+  blackIs: "{name} грає чорними"
+  rules: "Правила"
+  botSettings: "Параметри бота"
+  thisGameIsStartedSoon: "Гра розпочнеться через кілька секунд"
+  waitingForOther: "Чекаємо на хід суперника"
+  waitingForMe: "Чекаємо на ваш хід"
+  waitingBoth: "Приготуйтесь"
+  ready: "Готовність"
+  cancelReady: "Скасувати готовність"
+  opponentTurn: "Хід суперника"
+  myTurn: "Ваш хід"
+  turnOf: "Хід {name}"
+  pastTurnOf: "Хід {name}"
+  surrender: "Здатися"
+  drawn: "Нічия"
+  won: "Перемога {name}"
+  black: "Чорні"
+  white: "Білі"
+  total: "Всього"
+  turnCount: "Хід {count}"
+  myGames: "Мої ігри"
+  allGames: "Усі ігри"
+  ended: "Завершено"
+  playing: "В даний момент у процесі гри"
+  isLlotheo: "Гравець з найменшою кількістю фігур виграє (Llotheo)"
+  canPutEverywhere: "Фігури можна ставити в будь якії позиції"
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
@@ -867,6 +902,8 @@ _sfx:
   chatBg: "Чати (фон)"
   antenna: "Прийом антени"
   channel: "Повідомлення каналу"
+  reversiPutBlack: "Реверсі: хід Чорного"
+  reversiPutWhite: "Реверсі: хід Білого"
 _ago:
   unknown: "Невідомо"
   future: "Майбутнє"
@@ -1059,6 +1096,68 @@ _timelines:
   local: "Локальна"
   social: "Соціальна"
   global: "Глобальна"
+_rooms:
+  roomOf: "Кімната {user}"
+  addFurniture: "Розмістити меблі"
+  translate: "Пересунути"
+  rotate: "Обертати"
+  exit: "Назад"
+  remove: "Видалити"
+  clear: "Видалити все"
+  clearConfirm: "Ви дійсно хочете позбутись усіх речей у вашій кімнаті?"
+  leaveConfirm: "Є незбережені зміни. Ви дійсно хочете вийти?"
+  chooseImage: "Виберіть зображення"
+  roomType: "Тип кімнати"
+  carpetColor: "Колір килима"
+  _roomType:
+    default: "За замовчуванням"
+    washitsu: "В японському стилі"
+  _furnitures:
+    milk: "Пакет молока"
+    bed: "Ліжко"
+    low-table: "Журнальний стіл"
+    desk: "Письмовий стіл"
+    chair: "Стілець"
+    chair2: "Стілець 2"
+    fan: "Вентилятор"
+    pc: "Комп’ютер"
+    plant: "Кімнатна рослина"
+    plant2: "Кімнатна рослина 2"
+    eraser: "Ластик"
+    pencil: "Олівець"
+    pudding: "Пудинг"
+    cardboard-box: "Картонна коробка"
+    cardboard-box2: "Картонна коробка 2"
+    cardboard-box3: "Картонна коробка 3"
+    book: "Книга"
+    book2: "Книга 2"
+    piano: "Піаніно"
+    facial-tissue: "Серветки"
+    server: "Сервер"
+    moon: "Місяць"
+    corkboard: "Коркова дошка"
+    mousepad: "Килимок для миші"
+    monitor: "Монітор"
+    keyboard: "Клавіатура"
+    carpet-stripe: "Смугастий килим"
+    mat: "Мат"
+    color-box: "Книжкова полиця"
+    wall-clock: "Настінний годинник"
+    photoframe: "Фоторамка"
+    cube: "Куб"
+    tv: "Телевізор"
+    pinguin: "Пінгвін"
+    rubik-cube: "Кубик Рубіка"
+    poster-h: "Плакат (горизонтальний)"
+    poster-v: "Плакат (вертикальний)"
+    sofa: "Диван"
+    spiral: "Гвинтові сходи"
+    bin: "Смітник"
+    cup-noodle: "Локшина в чашці"
+    holo-display: "Голографічний дисплей"
+    energy-drink: "Енергетичний напій"
+    doll-ai: "Лялька Аі-тян"
+    banknote: "Пачка грошей"
 _pages:
   newPage: "Створити сторінку"
   editPage: "Редагувати сторінку"

locales/zh-CN.yml

@@ -242,6 +242,7 @@ uploadFromUrlDescription: "输入文件的URL"
 uploadFromUrlRequested: "请求上传"
 uploadFromUrlMayTakeTime: "上传可能需要一些时间完成。"
 explore: "发现"
+games: "Misskey游戏"
 messageRead: "已读"
 noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
@@ -447,7 +448,6 @@ uiLanguage: "显示语言"
 groupInvited: "您有新的群组邀请"
 aboutX: "关于 {x}"
 useOsNativeEmojis: "使用系统的原生表情符号"
-disableDrawer: "不显示抽屉菜单"
 youHaveNoGroups: "没有群组"
 joinOrCreateGroup: "请加入一个现有的群组，或者创建新群组。"
 noHistory: "没有历史记录"
@@ -536,6 +536,7 @@ yourAccountSuspendedDescription: "由于违反了服务器的服务条款或其
 menu: "菜单"
 divider: "分割线"
 addItem: "添加项目"
+rooms: "房间"
 relays: "中继"
 addRelay: "添加中继"
 inboxUrl: "Inbox URL"
@@ -612,6 +613,7 @@ regenerateLoginToken: "重新生成登录令牌"
 regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多个项目。"
 fileIdOrUrl: "文件ID或者URL"
+chatOpenBehavior: "聊天窗口打开时的行为"
 behavior: "行为"
 sample: "示例"
 abuseReports: "举报"
@@ -668,6 +670,7 @@ emailVerified: "电子邮件地址已验证"
 noteFavoritesCount: "收藏的帖子数"
 pageLikesCount: "页面点赞次数"
 pageLikedCount: "页面被点赞次数"
+reversiCount: "黑白棋对战次数"
 contact: "联系人"
 useSystemFont: "使用系统默认字体"
 clips: "书签"
@@ -682,7 +685,6 @@ center: "中央"
 wide: "宽"
 narrow: "窄"
 reloadToApplySetting: "页面刷新后设置才会生效。是否现在刷新页面？"
-needReloadToApply: "重启后应用才会生效。"
 showTitlebar: "显示标题栏"
 clearCache: "清除缓存"
 onlineUsersCount: "{n}人在线"
@@ -743,7 +745,6 @@ notRecommended: "不推荐"
 botProtection: "Bot防御"
 instanceBlocking: "被阻拦的实例"
 selectAccount: "选择账户"
-switchAccount: "切换账户"
 enabled: "已启用"
 disabled: "已禁用 "
 quickAction: "快捷操作"
@@ -815,8 +816,6 @@ hide: "隐藏"
 leaveGroup: "离开群组"
 leaveGroupConfirm: "确定离开「{name}」？"
 useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
-welcomeBackWithName: "欢迎回来，{name}"
-clickToFinishEmailVerification: "点击 [{ok}] 完成电子邮件地址认证。"
 _emailUnavailable:
   used: "已经被使用过"
   format: "无效的格式"
@@ -942,6 +941,39 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
+_reversi:
+  reversi: "黑白棋"
+  gameSettings: "对局设置"
+  chooseBoard: "棋盘选择"
+  blackOrWhite: "先手/后手"
+  blackIs: "{name}执黑(先走)"
+  rules: "规则"
+  botSettings: "机器人设置"
+  thisGameIsStartedSoon: "对局在几秒后开始"
+  waitingForOther: "等待对手准备"
+  waitingForMe: "等待您的准备"
+  waitingBoth: "请准备"
+  ready: "准备就绪"
+  cancelReady: "重新准备"
+  opponentTurn: "对手的会合"
+  myTurn: "您的回合"
+  turnOf: "{name}的回合"
+  pastTurnOf: "{name}的回合"
+  surrender: "认输 "
+  surrendered: "对手认输"
+  drawn: "平局"
+  won: "{name}获胜"
+  black: "黑"
+  white: "白"
+  total: "总计"
+  turnCount: "{count}回合"
+  myGames: "我的对局"
+  allGames: "所有对局"
+  ended: "结束"
+  playing: "对局中"
+  isLlotheo: "棋子较少一方获胜(LLoTheO规则)"
+  loopedMap: "循环棋盘"
+  canPutEverywhere: "可以下在任意位置"
 _instanceTicker:
   none: "不显示"
   remote: "显示给远程用户"
@@ -1061,6 +1093,8 @@ _sfx:
   chatBg: "聊天背景"
   antenna: "天线接收"
   channel: "频道通知"
+  reversiPutBlack: "黑白棋：黑方下子时"
+  reversiPutWhite: "黑白棋：白方下子时"
 _ago:
   unknown: "未知"
   future: "未来"
@@ -1283,6 +1317,68 @@ _timelines:
   local: "本地"
   social: "社交"
   global: "全局"
+_rooms:
+  roomOf: "{user}的房间"
+  addFurniture: "放置家具"
+  translate: "移动"
+  rotate: "旋转"
+  exit: "返回"
+  remove: "移除"
+  clear: "清理"
+  clearConfirm: "是否清除所有家具？"
+  leaveConfirm: "有尚未保存的修改。是否离开？"
+  chooseImage: "选择图片"
+  roomType: "房间类型"
+  carpetColor: "地板颜色"
+  _roomType:
+    default: "默认"
+    washitsu: "和式房间"
+  _furnitures:
+    milk: "牛奶纸箱"
+    bed: "床"
+    low-table: "矮桌"
+    desk: "书桌"
+    chair: "椅子"
+    chair2: "椅子2"
+    fan: "换气扇"
+    pc: "电脑"
+    plant: "观叶植物"
+    plant2: "观叶植物2"
+    eraser: "橡皮擦"
+    pencil: "铅笔"
+    pudding: "布丁"
+    cardboard-box: "纸箱"
+    cardboard-box2: "纸箱2"
+    cardboard-box3: "纸箱3"
+    book: "书"
+    book2: "书2"
+    piano: "钢琴"
+    facial-tissue: "纸巾盒"
+    server: "服务器"
+    moon: "月亮"
+    corkboard: "软木板"
+    mousepad: "鼠标垫"
+    monitor: "显示器"
+    keyboard: "键盘"
+    carpet-stripe: "地毯(条纹)"
+    mat: "垫子"
+    color-box: "收纳柜"
+    wall-clock: "挂钟"
+    photoframe: "相框"
+    cube: "立方体"
+    tv: "电视"
+    pinguin: "企鹅君"
+    rubik-cube: "魔方"
+    poster-h: "海报(横向)"
+    poster-v: "海报(纵向)"
+    sofa: "沙发"
+    spiral: "螺旋楼梯"
+    bin: "垃圾箱"
+    cup-noodle: "杯面"
+    holo-display: "全息显示器"
+    energy-drink: "能量饮料"
+    doll-ai: "小蓝的玩偶"
+    banknote: "钞票"
 _pages:
   newPage: "创建页面"
   editPage: "编辑页面"

locales/zh-TW.yml

@@ -239,6 +239,7 @@ uploadFromUrlDescription: "您要上傳的文件的URL"
 uploadFromUrlRequested: "已請求上傳"
 uploadFromUrlMayTakeTime: "還需要一些時間才能完成上傳。"
 explore: "探索"
+games: "Misskey 遊戲"
 messageRead: "已讀"
 noMoreHistory: "沒有更多歷史紀錄"
 startMessaging: "開始傳送訊息"
@@ -524,6 +525,7 @@ userSuspended: "該使用者已被停用"
 userSilenced: "該用戶已被禁言。"
 divider: "分割線"
 addItem: "新增項目"
+rooms: "房間"
 relays: "中繼"
 addRelay: "新增中繼"
 inboxUrl: "收件夾URL"
@@ -595,6 +597,7 @@ regenerateLoginToken: "重新產生登入權杖"
 regenerateLoginTokenDescription: "重新產生用於登入的內部權杖。一般情況下是不需要這樣做的。一旦重產，所有裝置將會被登出。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多個項目。"
 fileIdOrUrl: "檔案ID或URL"
+chatOpenBehavior: "開啟聊天窗口時的行為"
 behavior: "行為"
 sample: "範例"
 abuseReports: "檢舉"
@@ -649,6 +652,7 @@ emailVerified: "已成功驗證您的電郵"
 noteFavoritesCount: "我的最愛貼文的數目"
 pageLikesCount: "頁面被按讚次數"
 pageLikedCount: "頁面被按讚次數"
+reversiCount: "黑白棋對戰次數"
 contact: "聯絡人"
 useSystemFont: "使用系統預設的字型"
 clips: "摘錄"
@@ -837,6 +841,37 @@ _mfm:
   font: "字型"
   fontDescription: "您可以設定顯示內容的字型"
   rotate: "旋轉"
+_reversi:
+  reversi: "黑白棋"
+  gameSettings: "對弈設定"
+  chooseBoard: "選擇棋盤"
+  blackOrWhite: "黑棋/白棋"
+  blackIs: "{name}在玩黑棋"
+  rules: "規則"
+  botSettings: "機器人設定"
+  thisGameIsStartedSoon: "遊戲即將開始"
+  waitingForOther: "等待對手準備"
+  waitingForMe: "等待您的準備"
+  waitingBoth: "請準備"
+  ready: "已就緒"
+  cancelReady: "重新準備"
+  opponentTurn: "對手回合"
+  myTurn: "你的回合"
+  turnOf: "{name}的回合"
+  pastTurnOf: "{name}的回合"
+  surrender: "認輸"
+  surrendered: "對手認輸"
+  drawn: "平手"
+  won: "{name}獲勝"
+  black: "黑"
+  white: "白"
+  total: "合計"
+  turnCount: "{count}回合"
+  myGames: "我的對弈"
+  allGames: "所有對弈"
+  ended: "已結束"
+  playing: "正在對弈"
+  loopedMap: "循環棋盤"
 _instanceTicker:
   none: "隱藏"
   remote: "向遠端使用者顯示"
@@ -1142,6 +1177,67 @@ _timelines:
   local: "本地"
   social: "社群"
   global: "公開"
+_rooms:
+  roomOf: "{user}的房間"
+  addFurniture: "擺放家具"
+  translate: "移動 "
+  rotate: "旋轉"
+  exit: "返回"
+  remove: "移除"
+  clear: "全部移除"
+  clearConfirm: "確定要移除全部家具嗎？"
+  leaveConfirm: "修改未儲存，是否要離開？"
+  chooseImage: "選擇圖像"
+  roomType: "房間種類"
+  carpetColor: "地板顏色"
+  _roomType:
+    default: "預設"
+    washitsu: "和室"
+  _furnitures:
+    milk: "牛奶盒"
+    bed: "床"
+    low-table: "咖啡桌"
+    desk: "書桌"
+    chair: "椅子"
+    chair2: "椅子2"
+    fan: "通風機"
+    pc: "電腦"
+    plant: "觀葉植物"
+    plant2: "觀葉植物2"
+    eraser: "橡皮擦"
+    pencil: "鉛筆"
+    pudding: "布丁"
+    cardboard-box: "紙板箱"
+    cardboard-box2: "紙板箱2"
+    cardboard-box3: "紙板箱3"
+    book: "讀物"
+    book2: "讀物2"
+    piano: "鋼琴"
+    server: "伺服器"
+    moon: "月亮"
+    corkboard: "木栓板"
+    mousepad: "滑鼠墊"
+    monitor: "監視器"
+    keyboard: "鍵盤"
+    carpet-stripe: "條紋地毯"
+    mat: "地毯"
+    color-box: "層架"
+    wall-clock: "壁鐘"
+    photoframe: "相框"
+    cube: "立方體"
+    tv: "電視"
+    pinguin: "企鵝蠟像"
+    rubik-cube: "魔術方塊"
+    poster-h: "海報(橫向)"
+    poster-v: "海報(直向)"
+    sofa: " 沙發"
+    spiral: "螺旋式樓梯"
+    bin: "垃圾箱"
+    cup-noodle: "杯面"
+    holo-display: "投影機"
+    energy-drink: "能量飲料"
+    doll-ai: "小藍的人偶公仔"
+    banknote: "大疊鈔票"
 _pages:
   newPage: "建立頁面"
   editPage: "編輯頁面"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.102.0",
+	"version": "12.100.2",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -42,12 +42,12 @@
 		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.79",
+		"@redocly/openapi-core": "1.0.0-beta.54",
-		"@types/fluent-ffmpeg": "2.1.20",
+		"@types/fluent-ffmpeg": "2.1.17",
-		"@typescript-eslint/parser": "5.10.0",
+		"@typescript-eslint/parser": "5.4.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.3.1",
+		"cypress": "9.1.0",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.5.5"
+		"typescript": "4.5.2"
 	}
 }

packages/backend/migration/1637320813000-forwarded-report.js

@@ -1,13 +0,0 @@
-const { QueryRunner } = require('typeorm');
-
-module.exports = class forwardedReport1637320813000 {
-	name = 'forwardedReport1637320813000';
-
-	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "forwarded" boolean NOT NULL DEFAULT false`);
-	}
-
-	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "forwarded"`);
-	}
-};

packages/backend/migration/1642611822809-emoji-url.js

@@ -1,15 +0,0 @@
-const { MigrationInterface, QueryRunner } = require("typeorm");
-
-module.exports = class emojiUrl1642611822809 {
-		name = 'emojiUrl1642611822809'
-
-		async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "emoji" RENAME COLUMN "url" TO "originalUrl"`);
-			await queryRunner.query(`ALTER TABLE "emoji" ADD "publicUrl" character varying(512) NOT NULL DEFAULT ''`);
-		}
-
-		async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "publicUrl"`);
-			await queryRunner.query(`ALTER TABLE "emoji" RENAME COLUMN "originalUrl" TO "url"`);
-		}
-}

packages/backend/migration/1642613870898-drive-file-webpublic-type.js

@@ -1,13 +0,0 @@
-const { MigrationInterface, QueryRunner } = require("typeorm");
-
-module.exports = class driveFileWebpublicType1642613870898 {
-    name = 'driveFileWebpublicType1642613870898'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "webpublicType" character varying(128)`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "webpublicType"`);
-    }
-}

packages/backend/package.json

@@ -22,78 +22,87 @@
 		"@sinonjs/fake-timers": "7.1.2",
 		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.15.7",
+		"@types/bull": "3.15.5",
 		"@types/cbor": "6.0.0",
 		"@types/dateformat": "3.0.1",
-		"@types/escape-regexp": "0.0.1",
+		"@types/escape-regexp": "0.0.0",
 		"@types/glob": "7.2.0",
 		"@types/is-url": "1.2.30",
-		"@types/js-yaml": "4.0.5",
+		"@types/js-yaml": "4.0.4",
-		"@types/jsdom": "16.2.14",
+		"@types/jsdom": "16.2.13",
 		"@types/jsonld": "1.5.6",
 		"@types/koa": "2.13.4",
-		"@types/koa-bodyparser": "4.3.5",
+		"@types/koa-bodyparser": "4.3.3",
 		"@types/koa-cors": "0.0.2",
 		"@types/koa-favicon": "2.0.21",
 		"@types/koa-logger": "3.1.2",
 		"@types/koa-mount": "4.0.1",
 		"@types/koa-send": "4.1.3",
 		"@types/koa-views": "7.0.0",
-		"@types/koa__cors": "3.1.1",
+		"@types/koa__cors": "3.0.3",
 		"@types/koa__multer": "2.0.4",
-		"@types/koa__router": "8.0.11",
+		"@types/koa__router": "8.0.8",
 		"@types/mocha": "8.2.3",
-		"@types/node": "17.0.10",
+		"@types/node": "16.11.7",
-		"@types/node-fetch": "3.0.3",
+		"@types/node-fetch": "2.5.12",
 		"@types/nodemailer": "6.4.4",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "6.0.3",
 		"@types/portscanner": "2.1.1",
-		"@types/pug": "2.0.6",
+		"@types/pug": "2.0.5",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.4.2",
+		"@types/qrcode": "1.4.1",
 		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "3.4.3",
+		"@types/ratelimiter": "3.4.2",
-		"@types/redis": "4.0.11",
+		"@types/redis": "2.8.32",
 		"@types/rename": "1.0.4",
 		"@types/request-stats": "3.0.0",
-		"@types/sanitize-html": "2.6.2",
+		"@types/sanitize-html": "2.5.0",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.29.5",
+		"@types/sharp": "0.29.3",
 		"@types/sinonjs__fake-timers": "6.0.4",
-		"@types/speakeasy": "2.0.7",
+		"@types/speakeasy": "2.0.6",
 		"@types/throttle-debounce": "2.1.0",
 		"@types/tinycolor2": "1.4.3",
-		"@types/tmp": "0.2.3",
+		"@types/tmp": "0.2.2",
-		"@types/uuid": "8.3.4",
+		"@types/uuid": "8.3.1",
 		"@types/web-push": "3.3.2",
 		"@types/webpack": "5.28.0",
 		"@types/webpack-stream": "3.2.12",
 		"@types/websocket": "1.0.4",
-		"@types/ws": "8.2.2",
+		"@types/ws": "8.2.0",
-		"@typescript-eslint/eslint-plugin": "5.10.0",
+		"@typescript-eslint/eslint-plugin": "5.3.1",
-		"@typescript-eslint/parser": "5.10.0",
+		"@typescript-eslint/parser": "5.1.0",
 		"abort-controller": "3.0.0",
 		"archiver": "5.3.0",
 		"autobind-decorator": "2.4.0",
+		"autosize": "4.0.4",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1061.0",
+		"aws-sdk": "2.1013.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.4",
-		"broadcast-channel": "4.9.0",
+		"broadcast-channel": "4.5.0",
-		"bull": "4.2.1",
+		"bull": "4.1.0",
 		"cacheable-lookup": "6.0.4",
 		"cafy": "15.2.1",
 		"cbor": "8.1.0",
 		"chalk": "4.1.2",
+		"chart.js": "3.6.0",
+		"chartjs-adapter-date-fns": "2.0.0",
+		"chartjs-plugin-zoom": "1.1.1",
 		"cli-highlight": "2.1.11",
-		"content-disposition": "0.5.4",
+		"compare-versions": "3.6.0",
+		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
+		"css-loader": "6.5.1",
+		"cssnano": "5.0.10",
+		"date-fns": "2.25.0",
 		"dateformat": "4.5.1",
-		"deep-email-validator": "0.1.21",
+		"deep-email-validator": "0.1.18",
 		"escape-regexp": "0.0.1",
-		"eslint": "8.7.0",
+		"eslint": "8.2.0",
-		"eslint-plugin-import": "2.25.4",
+		"eslint-plugin-import": "2.25.3",
+		"eslint-plugin-vue": "8.0.3",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.2",
 		"file-type": "16.5.3",
@@ -101,9 +110,11 @@
 		"glob": "7.2.0",
 		"got": "11.8.2",
 		"hpagent": "0.1.2",
-		"http-signature": "1.3.6",
+		"http-signature": "1.3.5",
+		"idb-keyval": "5.1.3",
+		"insert-text-at-cursor": "0.3.0",
 		"ip-cidr": "3.0.4",
-		"is-svg": "4.3.2",
+		"is-svg": "4.3.1",
 		"js-yaml": "4.1.0",
 		"jsdom": "16.7.0",
 		"json5": "2.2.0",
@@ -120,29 +131,30 @@
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
 		"langmap": "0.0.16",
-		"mfm-js": "0.21.0",
+		"mfm-js": "0.20.0",
 		"mime-types": "2.1.34",
-		"misskey-js": "0.0.13",
+		"misskey-js": "0.0.8",
 		"mocha": "8.4.0",
 		"ms": "3.0.0-canary.1",
-		"multer": "1.4.4",
+		"multer": "1.4.3",
 		"nested-property": "4.0.0",
 		"node-fetch": "2.6.1",
-		"nodemailer": "6.7.2",
+		"nodemailer": "6.7.0",
 		"os-utils": "0.0.14",
 		"parse5": "6.0.1",
 		"pg": "8.7.1",
 		"portscanner": "2.2.0",
+		"prismjs": "1.25.0",
 		"private-ip": "2.3.3",
-		"probe-image-size": "7.2.2",
+		"probe-image-size": "7.2.1",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
 		"punycode": "2.1.1",
-		"pureimage": "0.3.8",
+		"pureimage": "0.3.5",
-		"qrcode": "1.5.0",
+		"qrcode": "1.4.4",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.17.3",
+		"re2": "1.16.0",
 		"redis": "3.1.2",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
@@ -151,9 +163,9 @@
 		"require-all": "3.0.0",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sanitize-html": "2.6.1",
+		"sanitize-html": "2.5.3",
 		"seedrandom": "3.0.5",
-		"sharp": "0.29.3",
+		"sharp": "0.29.2",
 		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
@@ -167,21 +179,20 @@
 		"ts-loader": "9.2.6",
 		"ts-node": "10.4.0",
 		"tsc-alias": "1.4.1",
-		"tsconfig-paths": "3.12.0",
+		"tsconfig-paths": "3.11.0",
 		"twemoji-parser": "13.1.0",
-		"typeorm": "0.2.41",
+		"typeorm": "0.2.39",
-		"typescript": "4.5.5",
+		"typescript": "4.4.4",
 		"ulid": "2.3.0",
-		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
 		"web-push": "3.4.5",
 		"websocket": "1.0.34",
-		"ws": "8.4.2",
+		"ws": "8.2.3",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.79",
+		"@redocly/openapi-core": "1.0.0-beta.54",
-		"@types/fluent-ffmpeg": "2.1.20",
+		"@types/fluent-ffmpeg": "2.1.17",
 		"cross-env": "7.0.3",
 		"execa": "6.0.0"
 	}

packages/backend/src/db/postgre.ts

@@ -40,6 +40,8 @@ import { Signin } from '@/models/entities/signin';
 import { AuthSession } from '@/models/entities/auth-session';
 import { FollowRequest } from '@/models/entities/follow-request';
 import { Emoji } from '@/models/entities/emoji';
+import { ReversiGame } from '@/models/entities/games/reversi/game';
+import { ReversiMatching } from '@/models/entities/games/reversi/matching';
 import { UserNotePining } from '@/models/entities/user-note-pining';
 import { Poll } from '@/models/entities/poll';
 import { UserKeypair } from '@/models/entities/user-keypair';
@@ -164,6 +166,8 @@ export const entities = [
 	AntennaNote,
 	PromoNote,
 	PromoRead,
+	ReversiGame,
+	ReversiMatching,
 	Relay,
 	MutedNote,
 	Channel,
@@ -220,9 +224,7 @@ export async function resetDb() {
 		WHERE nspname NOT IN ('pg_catalog', 'information_schema')
 			AND C.relkind = 'r'
 			AND nspname !~ '^pg_toast';`);
-		for (const table of tables) {
+		await Promise.all(tables.map(t => t.table).map(x => conn.query(`DELETE FROM "${x}" CASCADE`)));
-			await conn.query(`DELETE FROM "${table.table}" CASCADE`);
-		}
 	};
 
 	for (let i = 1; i <= 3; i++) {

packages/backend/src/games/reversi/core.ts

@@ -0,0 +1,263 @@
+import { count, concat } from '@/prelude/array';
+
+// MISSKEY REVERSI ENGINE
+
+/**
+ * true ... 黒
+ * false ... 白
+ */
+export type Color = boolean;
+const BLACK = true;
+const WHITE = false;
+
+export type MapPixel = 'null' | 'empty';
+
+export type Options = {
+	isLlotheo: boolean;
+	canPutEverywhere: boolean;
+	loopedBoard: boolean;
+};
+
+export type Undo = {
+	/**
+	 * 色
+	 */
+	color: Color;
+
+	/**
+	 * どこに打ったか
+	 */
+	pos: number;
+
+	/**
+	 * 反転した石の位置の配列
+	 */
+	effects: number[];
+
+	/**
+	 * ターン
+	 */
+	turn: Color | null;
+};
+
+/**
+ * リバーシエンジン
+ */
+export default class Reversi {
+	public map: MapPixel[];
+	public mapWidth: number;
+	public mapHeight: number;
+	public board: (Color | null | undefined)[];
+	public turn: Color | null = BLACK;
+	public opts: Options;
+
+	public prevPos = -1;
+	public prevColor: Color | null = null;
+
+	private logs: Undo[] = [];
+
+	/**
+	 * ゲームを初期化します
+	 */
+	constructor(map: string[], opts: Options) {
+		//#region binds
+		this.put = this.put.bind(this);
+		//#endregion
+
+		//#region Options
+		this.opts = opts;
+		if (this.opts.isLlotheo == null) this.opts.isLlotheo = false;
+		if (this.opts.canPutEverywhere == null) this.opts.canPutEverywhere = false;
+		if (this.opts.loopedBoard == null) this.opts.loopedBoard = false;
+		//#endregion
+
+		//#region Parse map data
+		this.mapWidth = map[0].length;
+		this.mapHeight = map.length;
+		const mapData = map.join('');
+
+		this.board = mapData.split('').map(d => d === '-' ? null : d === 'b' ? BLACK : d === 'w' ? WHITE : undefined);
+
+		this.map = mapData.split('').map(d => d === '-' || d === 'b' || d === 'w' ? 'empty' : 'null');
+		//#endregion
+
+		// ゲームが始まった時点で片方の色の石しかないか、始まった時点で勝敗が決定するようなマップの場合がある
+		if (!this.canPutSomewhere(BLACK)) this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
+	}
+
+	/**
+	 * 黒石の数
+	 */
+	public get blackCount() {
+		return count(BLACK, this.board);
+	}
+
+	/**
+	 * 白石の数
+	 */
+	public get whiteCount() {
+		return count(WHITE, this.board);
+	}
+
+	public transformPosToXy(pos: number): number[] {
+		const x = pos % this.mapWidth;
+		const y = Math.floor(pos / this.mapWidth);
+		return [x, y];
+	}
+
+	public transformXyToPos(x: number, y: number): number {
+		return x + (y * this.mapWidth);
+	}
+
+	/**
+	 * 指定のマスに石を打ちます
+	 * @param color 石の色
+	 * @param pos 位置
+	 */
+	public put(color: Color, pos: number) {
+		this.prevPos = pos;
+		this.prevColor = color;
+
+		this.board[pos] = color;
+
+		// 反転させられる石を取得
+		const effects = this.effects(color, pos);
+
+		// 反転させる
+		for (const pos of effects) {
+			this.board[pos] = color;
+		}
+
+		const turn = this.turn;
+
+		this.logs.push({
+			color,
+			pos,
+			effects,
+			turn,
+		});
+
+		this.calcTurn();
+	}
+
+	private calcTurn() {
+		// ターン計算
+		this.turn =
+			this.canPutSomewhere(!this.prevColor) ? !this.prevColor :
+			this.canPutSomewhere(this.prevColor!) ? this.prevColor :
+			null;
+	}
+
+	public undo() {
+		const undo = this.logs.pop()!;
+		this.prevColor = undo.color;
+		this.prevPos = undo.pos;
+		this.board[undo.pos] = null;
+		for (const pos of undo.effects) {
+			const color = this.board[pos];
+			this.board[pos] = !color;
+		}
+		this.turn = undo.turn;
+	}
+
+	/**
+	 * 指定した位置のマップデータのマスを取得します
+	 * @param pos 位置
+	 */
+	public mapDataGet(pos: number): MapPixel {
+		const [x, y] = this.transformPosToXy(pos);
+		return x < 0 || y < 0 || x >= this.mapWidth || y >= this.mapHeight ? 'null' : this.map[pos];
+	}
+
+	/**
+	 * 打つことができる場所を取得します
+	 */
+	public puttablePlaces(color: Color): number[] {
+		return Array.from(this.board.keys()).filter(i => this.canPut(color, i));
+	}
+
+	/**
+	 * 打つことができる場所があるかどうかを取得します
+	 */
+	public canPutSomewhere(color: Color): boolean {
+		return this.puttablePlaces(color).length > 0;
+	}
+
+	/**
+	 * 指定のマスに石を打つことができるかどうかを取得します
+	 * @param color 自分の色
+	 * @param pos 位置
+	 */
+	public canPut(color: Color, pos: number): boolean {
+		return (
+			this.board[pos] !== null ? false : // 既に石が置いてある場所には打てない
+			this.opts.canPutEverywhere ? this.mapDataGet(pos) == 'empty' : // 挟んでなくても置けるモード
+			this.effects(color, pos).length !== 0); // 相手の石を1つでも反転させられるか
+	}
+
+	/**
+	 * 指定のマスに石を置いた時の、反転させられる石を取得します
+	 * @param color 自分の色
+	 * @param initPos 位置
+	 */
+	public effects(color: Color, initPos: number): number[] {
+		const enemyColor = !color;
+
+		const diffVectors: [number, number][] = [
+			[  0,  -1], // 上
+			[ +1,  -1], // 右上
+			[ +1,   0], // 右
+			[ +1,  +1], // 右下
+			[  0,  +1], // 下
+			[ -1,  +1], // 左下
+			[ -1,   0], // 左
+			[ -1,  -1],  // 左上
+		];
+
+		const effectsInLine = ([dx, dy]: [number, number]): number[] => {
+			const nextPos = (x: number, y: number): [number, number] => [x + dx, y + dy];
+
+			const found: number[] = []; // 挟めるかもしれない相手の石を入れておく配列
+			let [x, y] = this.transformPosToXy(initPos);
+			while (true) {
+				[x, y] = nextPos(x, y);
+
+				// 座標が指し示す位置がボード外に出たとき
+				if (this.opts.loopedBoard && this.transformXyToPos(
+					(x = ((x % this.mapWidth) + this.mapWidth) % this.mapWidth),
+					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos) {
+						// 盤面の境界でループし、自分が石を置く位置に戻ってきたとき、挟めるようにしている (ref: Test4のマップ)
+					return found;
+				} else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight) {
+					return []; // 挟めないことが確定 (盤面外に到達)
+				}
+
+				const pos = this.transformXyToPos(x, y);
+				if (this.mapDataGet(pos) === 'null') return []; // 挟めないことが確定 (配置不可能なマスに到達)
+				const stone = this.board[pos];
+				if (stone === null) return []; // 挟めないことが確定 (石が置かれていないマスに到達)
+				if (stone === enemyColor) found.push(pos); // 挟めるかもしれない (相手の石を発見)
+				if (stone === color) return found; // 挟めることが確定 (対となる自分の石を発見)
+			}
+		};
+
+		return concat(diffVectors.map(effectsInLine));
+	}
+
+	/**
+	 * ゲームが終了したか否か
+	 */
+	public get isEnded(): boolean {
+		return this.turn === null;
+	}
+
+	/**
+	 * ゲームの勝者 (null = 引き分け)
+	 */
+	public get winner(): Color | null {
+		return this.isEnded ?
+			this.blackCount == this.whiteCount ? null :
+			this.opts.isLlotheo === this.blackCount > this.whiteCount ? WHITE : BLACK :
+			undefined as never;
+	}
+}

packages/backend/src/games/reversi/maps.ts

@@ -0,0 +1,896 @@
+/**
+ * 組み込みマップ定義
+ *
+ * データ値:
+ * (スペース) ... マス無し
+ * - ... マス
+ * b ... 初期配置される黒石
+ * w ... 初期配置される白石
+ */
+
+export type Map = {
+	name?: string;
+	category?: string;
+	author?: string;
+	data: string[];
+};
+
+export const fourfour: Map = {
+	name: '4x4',
+	category: '4x4',
+	data: [
+		'----',
+		'-wb-',
+		'-bw-',
+		'----',
+	],
+};
+
+export const sixsix: Map = {
+	name: '6x6',
+	category: '6x6',
+	data: [
+		'------',
+		'------',
+		'--wb--',
+		'--bw--',
+		'------',
+		'------',
+	],
+};
+
+export const roundedSixsix: Map = {
+	name: '6x6 rounded',
+	category: '6x6',
+	author: 'syuilo',
+	data: [
+		' ---- ',
+		'------',
+		'--wb--',
+		'--bw--',
+		'------',
+		' ---- ',
+	],
+};
+
+export const roundedSixsix2: Map = {
+	name: '6x6 rounded 2',
+	category: '6x6',
+	author: 'syuilo',
+	data: [
+		'  --  ',
+		' ---- ',
+		'--wb--',
+		'--bw--',
+		' ---- ',
+		'  --  ',
+	],
+};
+
+export const eighteight: Map = {
+	name: '8x8',
+	category: '8x8',
+	data: [
+		'--------',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------',
+	],
+};
+
+export const eighteightH1: Map = {
+	name: '8x8 handicap 1',
+	category: '8x8',
+	data: [
+		'b-------',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------',
+	],
+};
+
+export const eighteightH2: Map = {
+	name: '8x8 handicap 2',
+	category: '8x8',
+	data: [
+		'b-------',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'-------b',
+	],
+};
+
+export const eighteightH3: Map = {
+	name: '8x8 handicap 3',
+	category: '8x8',
+	data: [
+		'b------b',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'-------b',
+	],
+};
+
+export const eighteightH4: Map = {
+	name: '8x8 handicap 4',
+	category: '8x8',
+	data: [
+		'b------b',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'b------b',
+	],
+};
+
+export const eighteightH28: Map = {
+	name: '8x8 handicap 28',
+	category: '8x8',
+	data: [
+		'bbbbbbbb',
+		'b------b',
+		'b------b',
+		'b--wb--b',
+		'b--bw--b',
+		'b------b',
+		'b------b',
+		'bbbbbbbb',
+	],
+};
+
+export const roundedEighteight: Map = {
+	name: '8x8 rounded',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		' ------ ',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		' ------ ',
+	],
+};
+
+export const roundedEighteight2: Map = {
+	name: '8x8 rounded 2',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'  ----  ',
+		' ------ ',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		' ------ ',
+		'  ----  ',
+	],
+};
+
+export const roundedEighteight3: Map = {
+	name: '8x8 rounded 3',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'   --   ',
+		'  ----  ',
+		' ------ ',
+		'---wb---',
+		'---bw---',
+		' ------ ',
+		'  ----  ',
+		'   --   ',
+	],
+};
+
+export const eighteightWithNotch: Map = {
+	name: '8x8 with notch',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'---  ---',
+		'--------',
+		'--------',
+		' --wb-- ',
+		' --bw-- ',
+		'--------',
+		'--------',
+		'---  ---',
+	],
+};
+
+export const eighteightWithSomeHoles: Map = {
+	name: '8x8 with some holes',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'--- ----',
+		'----- --',
+		'-- -----',
+		'---wb---',
+		'---bw- -',
+		' -------',
+		'--- ----',
+		'--------',
+	],
+};
+
+export const circle: Map = {
+	name: 'Circle',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'   --   ',
+		' ------ ',
+		' ------ ',
+		'---wb---',
+		'---bw---',
+		' ------ ',
+		' ------ ',
+		'   --   ',
+	],
+};
+
+export const smile: Map = {
+	name: 'Smile',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		' ------ ',
+		'--------',
+		'-- -- --',
+		'---wb---',
+		'-- bw --',
+		'---  ---',
+		'--------',
+		' ------ ',
+	],
+};
+
+export const window: Map = {
+	name: 'Window',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'--------',
+		'-  --  -',
+		'-  --  -',
+		'---wb---',
+		'---bw---',
+		'-  --  -',
+		'-  --  -',
+		'--------',
+	],
+};
+
+export const reserved: Map = {
+	name: 'Reserved',
+	category: '8x8',
+	author: 'Aya',
+	data: [
+		'w------b',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'b------w',
+	],
+};
+
+export const x: Map = {
+	name: 'X',
+	category: '8x8',
+	author: 'Aya',
+	data: [
+		'w------b',
+		'-w----b-',
+		'--w--b--',
+		'---wb---',
+		'---bw---',
+		'--b--w--',
+		'-b----w-',
+		'b------w',
+	],
+};
+
+export const parallel: Map = {
+	name: 'Parallel',
+	category: '8x8',
+	author: 'Aya',
+	data: [
+		'--------',
+		'--------',
+		'--------',
+		'---bb---',
+		'---ww---',
+		'--------',
+		'--------',
+		'--------',
+	],
+};
+
+export const lackOfBlack: Map = {
+	name: 'Lack of Black',
+	category: '8x8',
+	data: [
+		'--------',
+		'--------',
+		'--------',
+		'---w----',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------',
+	],
+};
+
+export const squareParty: Map = {
+	name: 'Square Party',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'--------',
+		'-wwwbbb-',
+		'-w-wb-b-',
+		'-wwwbbb-',
+		'-bbbwww-',
+		'-b-bw-w-',
+		'-bbbwww-',
+		'--------',
+	],
+};
+
+export const minesweeper: Map = {
+	name: 'Minesweeper',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'b-b--w-w',
+		'-w-wb-b-',
+		'w-b--w-b',
+		'-b-wb-w-',
+		'-w-bw-b-',
+		'b-w--b-w',
+		'-b-bw-w-',
+		'w-w--b-b',
+	],
+};
+
+export const tenthtenth: Map = {
+	name: '10x10',
+	category: '10x10',
+	data: [
+		'----------',
+		'----------',
+		'----------',
+		'----------',
+		'----wb----',
+		'----bw----',
+		'----------',
+		'----------',
+		'----------',
+		'----------',
+	],
+};
+
+export const hole: Map = {
+	name: 'The Hole',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'----------',
+		'----------',
+		'--wb--wb--',
+		'--bw--bw--',
+		'----  ----',
+		'----  ----',
+		'--wb--wb--',
+		'--bw--bw--',
+		'----------',
+		'----------',
+	],
+};
+
+export const grid: Map = {
+	name: 'Grid',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'----------',
+		'- - -- - -',
+		'----------',
+		'- - -- - -',
+		'----wb----',
+		'----bw----',
+		'- - -- - -',
+		'----------',
+		'- - -- - -',
+		'----------',
+	],
+};
+
+export const cross: Map = {
+	name: 'Cross',
+	category: '10x10',
+	author: 'Aya',
+	data: [
+		'   ----   ',
+		'   ----   ',
+		'   ----   ',
+		'----------',
+		'----wb----',
+		'----bw----',
+		'----------',
+		'   ----   ',
+		'   ----   ',
+		'   ----   ',
+	],
+};
+
+export const charX: Map = {
+	name: 'Char X',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'---    ---',
+		'----  ----',
+		'----------',
+		' -------- ',
+		'  --wb--  ',
+		'  --bw--  ',
+		' -------- ',
+		'----------',
+		'----  ----',
+		'---    ---',
+	],
+};
+
+export const charY: Map = {
+	name: 'Char Y',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'---    ---',
+		'----  ----',
+		'----------',
+		' -------- ',
+		'  --wb--  ',
+		'  --bw--  ',
+		'  ------  ',
+		'  ------  ',
+		'  ------  ',
+		'  ------  ',
+	],
+};
+
+export const walls: Map = {
+	name: 'Walls',
+	category: '10x10',
+	author: 'Aya',
+	data: [
+		' bbbbbbbb ',
+		'w--------w',
+		'w--------w',
+		'w--------w',
+		'w---wb---w',
+		'w---bw---w',
+		'w--------w',
+		'w--------w',
+		'w--------w',
+		' bbbbbbbb ',
+	],
+};
+
+export const cpu: Map = {
+	name: 'CPU',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		' b b  b b ',
+		'w--------w',
+		' -------- ',
+		'w--------w',
+		' ---wb--- ',
+		' ---bw--- ',
+		'w--------w',
+		' -------- ',
+		'w--------w',
+		' b b  b b ',
+	],
+};
+
+export const checker: Map = {
+	name: 'Checker',
+	category: '10x10',
+	author: 'Aya',
+	data: [
+		'----------',
+		'----------',
+		'----------',
+		'---wbwb---',
+		'---bwbw---',
+		'---wbwb---',
+		'---bwbw---',
+		'----------',
+		'----------',
+		'----------',
+	],
+};
+
+export const japaneseCurry: Map = {
+	name: 'Japanese curry',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'w-b-b-b-b-',
+		'-w-b-b-b-b',
+		'w-w-b-b-b-',
+		'-w-w-b-b-b',
+		'w-w-wwb-b-',
+		'-w-wbb-b-b',
+		'w-w-w-b-b-',
+		'-w-w-w-b-b',
+		'w-w-w-w-b-',
+		'-w-w-w-w-b',
+	],
+};
+
+export const mosaic: Map = {
+	name: 'Mosaic',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'- - - - - ',
+		' - - - - -',
+		'- - - - - ',
+		' - w w - -',
+		'- - b b - ',
+		' - w w - -',
+		'- - b b - ',
+		' - - - - -',
+		'- - - - - ',
+		' - - - - -',
+	],
+};
+
+export const arena: Map = {
+	name: 'Arena',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'- - -- - -',
+		' - -  - - ',
+		'- ------ -',
+		' -------- ',
+		'- --wb-- -',
+		'- --bw-- -',
+		' -------- ',
+		'- ------ -',
+		' - -  - - ',
+		'- - -- - -',
+	],
+};
+
+export const reactor: Map = {
+	name: 'Reactor',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'-w------b-',
+		'b- -  - -w',
+		'- --wb-- -',
+		'---b  w---',
+		'- b wb w -',
+		'- w bw b -',
+		'---w  b---',
+		'- --bw-- -',
+		'w- -  - -b',
+		'-b------w-',
+	],
+};
+
+export const sixeight: Map = {
+	name: '6x8',
+	category: 'Special',
+	data: [
+		'------',
+		'------',
+		'------',
+		'--wb--',
+		'--bw--',
+		'------',
+		'------',
+		'------',
+	],
+};
+
+export const spark: Map = {
+	name: 'Spark',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		' -      - ',
+		'----------',
+		' -------- ',
+		' -------- ',
+		' ---wb--- ',
+		' ---bw--- ',
+		' -------- ',
+		' -------- ',
+		'----------',
+		' -      - ',
+	],
+};
+
+export const islands: Map = {
+	name: 'Islands',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'--------  ',
+		'---wb---  ',
+		'---bw---  ',
+		'--------  ',
+		'  -    -  ',
+		'  -    -  ',
+		'  --------',
+		'  --------',
+		'  --------',
+		'  --------',
+	],
+};
+
+export const galaxy: Map = {
+	name: 'Galaxy',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'   ------   ',
+		'  --www---  ',
+		' ------w--- ',
+		'---bbb--w---',
+		'--b---b-w-b-',
+		'-b--wwb-w-b-',
+		'-b-w-bww--b-',
+		'-b-w-b---b--',
+		'---w--bbb---',
+		' ---w------ ',
+		'  ---www--  ',
+		'   ------   ',
+	],
+};
+
+export const triangle: Map = {
+	name: 'Triangle',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'    --    ',
+		'    --    ',
+		'   ----   ',
+		'   ----   ',
+		'  --wb--  ',
+		'  --bw--  ',
+		' -------- ',
+		' -------- ',
+		'----------',
+		'----------',
+	],
+};
+
+export const iphonex: Map = {
+	name: 'iPhone X',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		' --  -- ',
+		'--------',
+		'--------',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------',
+		'--------',
+		' ------ ',
+	],
+};
+
+export const dealWithIt: Map = {
+	name: 'Deal with it!',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'------------',
+		'--w-b-------',
+		' --b-w------',
+		'  --w-b---- ',
+		'   -------  ',
+	],
+};
+
+export const experiment: Map = {
+	name: 'Let\'s experiment',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		' ------------ ',
+		'------wb------',
+		'------bw------',
+		'--------------',
+		'    -    -    ',
+		'------  ------',
+		'bbbbbb  wwwwww',
+		'bbbbbb  wwwwww',
+		'bbbbbb  wwwwww',
+		'bbbbbb  wwwwww',
+		'wwwwww  bbbbbb',
+	],
+};
+
+export const bigBoard: Map = {
+	name: 'Big board',
+	category: 'Special',
+	data: [
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'-------wb-------',
+		'-------bw-------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+	],
+};
+
+export const twoBoard: Map = {
+	name: 'Two board',
+	category: 'Special',
+	author: 'Aya',
+	data: [
+		'-------- --------',
+		'-------- --------',
+		'-------- --------',
+		'---wb--- ---wb---',
+		'---bw--- ---bw---',
+		'-------- --------',
+		'-------- --------',
+		'-------- --------',
+	],
+};
+
+export const test1: Map = {
+	name: 'Test1',
+	category: 'Test',
+	data: [
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+	],
+};
+
+export const test2: Map = {
+	name: 'Test2',
+	category: 'Test',
+	data: [
+		'------',
+		'------',
+		'-b--w-',
+		'-w--b-',
+		'-w--b-',
+	],
+};
+
+export const test3: Map = {
+	name: 'Test3',
+	category: 'Test',
+	data: [
+		'-w-',
+		'--w',
+		'w--',
+		'-w-',
+		'--w',
+		'w--',
+		'-w-',
+		'--w',
+		'w--',
+		'-w-',
+		'---',
+		'b--',
+	],
+};
+
+export const test4: Map = {
+	name: 'Test4',
+	category: 'Test',
+	data: [
+		'-w--b-',
+		'-w--b-',
+		'------',
+		'-w--b-',
+		'-w--b-',
+	],
+};
+
+// 検証用: この盤面で藍(lv3)が黒で始めると何故か(?)A1に打ってしまう
+export const test6: Map = {
+	name: 'Test6',
+	category: 'Test',
+	data: [
+		'--wwwww-',
+		'wwwwwwww',
+		'wbbbwbwb',
+		'wbbbbwbb',
+		'wbwbbwbb',
+		'wwbwbbbb',
+		'--wbbbbb',
+		'-wwwww--',
+	],
+};
+
+// 検証用: この盤面で藍(lv3)が黒で始めると何故か(?)G7に打ってしまう
+export const test7: Map = {
+	name: 'Test7',
+	category: 'Test',
+	data: [
+		'b--w----',
+		'b-wwww--',
+		'bwbwwwbb',
+		'wbwwwwb-',
+		'wwwwwww-',
+		'-wwbbwwb',
+		'--wwww--',
+		'--wwww--',
+	],
+};
+
+// 検証用: この盤面で藍(lv5)が黒で始めると何故か(?)A1に打ってしまう
+export const test8: Map = {
+	name: 'Test8',
+	category: 'Test',
+	data: [
+		'--------',
+		'-----w--',
+		'w--www--',
+		'wwwwww--',
+		'bbbbwww-',
+		'wwwwww--',
+		'--www---',
+		'--ww----',
+	],
+};

packages/backend/src/games/reversi/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "misskey-reversi",
+  "version": "0.0.5",
+  "description": "Misskey reversi engine",
+  "keywords": [
+    "misskey"
+  ],
+  "author": "syuilo <i@syuilo.com>",
+  "license": "MIT",
+  "repository": "https://github.com/misskey-dev/misskey.git",
+  "bugs": "https://github.com/misskey-dev/misskey/issues",
+  "main": "./built/core.js",
+  "types": "./built/core.d.ts",
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {}
+}

packages/backend/src/games/reversi/tsconfig.json

@@ -0,0 +1,21 @@
+{
+	"compilerOptions": {
+		"noEmitOnError": false,
+		"noImplicitAny": false,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"experimentalDecorators": true,
+		"declaration": true,
+		"sourceMap": false,
+		"target": "es2017",
+		"module": "commonjs",
+		"removeComments": false,
+		"noLib": false,
+		"outDir": "./built",
+		"rootDir": "./"
+	},
+	"compileOnSave": false,
+	"include": [
+		"./core.ts"
+	]
+}

packages/backend/src/mfm/from-html.ts

@@ -168,7 +168,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string | null {
 			case 'blockquote': {
 				const t = getText(node);
 				if (t) {
-					text += '\n> ';
+					text += '> ';
 					text += t.split('\n').join(`\n> `);
 				}
 				break;

packages/backend/src/misc/gen-avatar.ts

@@ -1,6 +1,5 @@
 /**
- * Identicon generator
+ * Random avatar generator
- * https://en.wikipedia.org/wiki/Identicon
  */
 
 import * as p from 'pureimage';
@@ -35,9 +34,9 @@ const cellSize = actualSize / n;
 const sideN = Math.floor(n / 2);
 
 /**
- * Generate buffer of an identicon by seed
+ * Generate buffer of random avatar by seed
  */
-export function genIdenticon(seed: string, stream: WriteStream): Promise<void> {
+export function genAvatar(seed: string, stream: WriteStream): Promise<void> {
 	const rand = gen.create(seed);
 	const canvas = p.make(size, size);
 	const ctx = canvas.getContext('2d');

packages/backend/src/misc/populate-emojis.ts

@@ -62,8 +62,7 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu
 	if (emoji == null) return null;
 
 	const isLocal = emoji.host == null;
-	const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため
+	const url = isLocal ? emoji.url : `${config.url}/proxy/image.png?${query({ url: emoji.url })}`;
-	const url = isLocal ? emojiUrl : `${config.url}/proxy/image.png?${query({ url: emojiUrl })}`;
 
 	return {
 		name: emojiName,
@@ -117,7 +116,7 @@ export async function prefetchEmojis(emojis: { name: string; host: string | null
 	}
 	const _emojis = emojisQuery.length > 0 ? await Emojis.find({
 		where: emojisQuery,
-		select: ['name', 'host', 'originalUrl', 'publicUrl'],
+		select: ['name', 'host', 'url'],
 	}) : [];
 	for (const emoji of _emojis) {
 		cache.set(`${emoji.name} ${emoji.host}`, emoji);

packages/backend/src/misc/schema.ts

@@ -1,44 +1,32 @@
-import {
+import { SimpleObj, SimpleSchema } from './simple-schema';
-	packedUserLiteSchema,
+import { packedUserSchema } from '@/models/repositories/user';
-	packedUserDetailedNotMeOnlySchema,
+import { packedNoteSchema } from '@/models/repositories/note';
-	packedMeDetailedOnlySchema,
+import { packedUserListSchema } from '@/models/repositories/user-list';
-	packedUserDetailedNotMeSchema,
+import { packedAppSchema } from '@/models/repositories/app';
-	packedMeDetailedSchema,
+import { packedMessagingMessageSchema } from '@/models/repositories/messaging-message';
-	packedUserDetailedSchema,
+import { packedNotificationSchema } from '@/models/repositories/notification';
-	packedUserSchema,
+import { packedDriveFileSchema } from '@/models/repositories/drive-file';
-} from '@/models/schema/user';
+import { packedDriveFolderSchema } from '@/models/repositories/drive-folder';
-import { packedNoteSchema } from '@/models/schema/note';
+import { packedFollowingSchema } from '@/models/repositories/following';
-import { packedUserListSchema } from '@/models/schema/user-list';
+import { packedMutingSchema } from '@/models/repositories/muting';
-import { packedAppSchema } from '@/models/schema/app';
+import { packedBlockingSchema } from '@/models/repositories/blocking';
-import { packedMessagingMessageSchema } from '@/models/schema/messaging-message';
+import { packedNoteReactionSchema } from '@/models/repositories/note-reaction';
-import { packedNotificationSchema } from '@/models/schema/notification';
+import { packedHashtagSchema } from '@/models/repositories/hashtag';
-import { packedDriveFileSchema } from '@/models/schema/drive-file';
+import { packedPageSchema } from '@/models/repositories/page';
-import { packedDriveFolderSchema } from '@/models/schema/drive-folder';
+import { packedUserGroupSchema } from '@/models/repositories/user-group';
-import { packedFollowingSchema } from '@/models/schema/following';
+import { packedNoteFavoriteSchema } from '@/models/repositories/note-favorite';
-import { packedMutingSchema } from '@/models/schema/muting';
+import { packedChannelSchema } from '@/models/repositories/channel';
-import { packedBlockingSchema } from '@/models/schema/blocking';
+import { packedAntennaSchema } from '@/models/repositories/antenna';
-import { packedNoteReactionSchema } from '@/models/schema/note-reaction';
+import { packedClipSchema } from '@/models/repositories/clip';
-import { packedHashtagSchema } from '@/models/schema/hashtag';
+import { packedFederationInstanceSchema } from '@/models/repositories/federation-instance';
-import { packedPageSchema } from '@/models/schema/page';
+import { packedQueueCountSchema } from '@/models/repositories/queue';
-import { packedUserGroupSchema } from '@/models/schema/user-group';
+import { packedGalleryPostSchema } from '@/models/repositories/gallery-post';
-import { packedNoteFavoriteSchema } from '@/models/schema/note-favorite';
+import { packedEmojiSchema } from '@/models/repositories/emoji';
-import { packedChannelSchema } from '@/models/schema/channel';
+import { packedReversiGameSchema } from '@/models/repositories/games/reversi/game';
-import { packedAntennaSchema } from '@/models/schema/antenna';
+import { packedReversiMatchingSchema } from '@/models/repositories/games/reversi/matching';
-import { packedClipSchema } from '@/models/schema/clip';
-import { packedFederationInstanceSchema } from '@/models/schema/federation-instance';
-import { packedQueueCountSchema } from '@/models/schema/queue';
-import { packedGalleryPostSchema } from '@/models/schema/gallery-post';
-import { packedEmojiSchema } from '@/models/schema/emoji';
 
 export const refs = {
-	UserLite: packedUserLiteSchema,
-	UserDetailedNotMeOnly: packedUserDetailedNotMeOnlySchema,
-	MeDetailedOnly: packedMeDetailedOnlySchema,
-	UserDetailedNotMe: packedUserDetailedNotMeSchema,
-	MeDetailed: packedMeDetailedSchema,
-	UserDetailed: packedUserDetailedSchema,
 	User: packedUserSchema,
-
 	UserList: packedUserListSchema,
 	UserGroup: packedUserGroupSchema,
 	App: packedAppSchema,
@@ -61,52 +49,16 @@ export const refs = {
 	FederationInstance: packedFederationInstanceSchema,
 	GalleryPost: packedGalleryPostSchema,
 	Emoji: packedEmojiSchema,
+	ReversiGame: packedReversiGameSchema,
+	ReversiMatching: packedReversiMatchingSchema,
 };
 
-// Packed = SchemaTypeDef<typeof refs[x]>; とすると展開されてマウスホバー時に型表示が使い物にならなくなる
+export type Packed<x extends keyof typeof refs> = ObjType<(typeof refs[x])['properties']>;
-// ObjType<r['properties']>を指定すると（なぜか）展開されずにPacked<'Hoge'>と表示される
-type PackedDef<r extends { properties?: Obj; oneOf?: ReadonlyArray<MinimumSchema>; allOf?: ReadonlyArray<MinimumSchema> }> =
-	r['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<r['allOf']>> :
-	r['oneOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<r['oneOf']> :
-	r['properties'] extends Obj ? ObjType<r['properties']> :
-	never;
-export type Packed<x extends keyof typeof refs> = PackedDef<typeof refs[x]>;
 
-type TypeStringef = 'boolean' | 'number' | 'string' | 'array' | 'object' | 'any';
+export interface Schema extends SimpleSchema {
-type StringDefToType<T extends TypeStringef> =
+	items?: Schema;
-	T extends 'boolean' ? boolean :
+	properties?: Obj;
-	T extends 'number' ? number :
+	ref?: keyof typeof refs;
-	T extends 'string' ? string | Date :
-	T extends 'array' ? ReadonlyArray<any> :
-	T extends 'object' ? Record<string, any> :
-	any;
-
-// https://swagger.io/specification/?sbsearch=optional#schema-object
-type OfSchema = {
-	readonly anyOf?: ReadonlyArray<MinimumSchema>;
-	readonly oneOf?: ReadonlyArray<MinimumSchema>;
-	readonly allOf?: ReadonlyArray<MinimumSchema>;
-}
-
-export interface MinimumSchema extends OfSchema {
-	readonly type?: TypeStringef;
-	readonly nullable?: boolean;
-	readonly optional?: boolean;
-	readonly items?: MinimumSchema;
-	readonly properties?: Obj;
-	readonly description?: string;
-	readonly example?: any;
-	readonly format?: string;
-	readonly ref?: keyof typeof refs;
-	readonly enum?: ReadonlyArray<string>;
-	readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
-	readonly maxLength?: number;
-	readonly minLength?: number;
-}
-
-export interface Schema extends MinimumSchema {
-	readonly nullable: boolean;
-	readonly optional: boolean;
 }
 
 type NonUndefinedPropertyNames<T extends Obj> = {
@@ -117,13 +69,22 @@ type UndefinedPropertyNames<T extends Obj> = {
 	[K in keyof T]: T[K]['optional'] extends true ? K : never
 }[keyof T];
 
-export interface Obj { [key: string]: Schema; }
+type OnlyRequired<T extends Obj> = Pick<T, NonUndefinedPropertyNames<T>>;
+type OnlyOptional<T extends Obj> = Pick<T, UndefinedPropertyNames<T>>;
+
+export interface Obj extends SimpleObj { [key: string]: Schema; }
 
 export type ObjType<s extends Obj> =
-	{ -readonly [P in UndefinedPropertyNames<s>]?: SchemaType<s[P]> } &
+	{ [P in keyof OnlyOptional<s>]?: SchemaType<s[P]> } &
-	{ -readonly [P in NonUndefinedPropertyNames<s>]: SchemaType<s[P]> };
+	{ [P in keyof OnlyRequired<s>]: SchemaType<s[P]> };
 
-type NullOrUndefined<p extends MinimumSchema, T> =
+// https://qiita.com/hrsh7th@github/items/84e8968c3601009cdcf2
+type MyType<T extends Schema> = {
+	0: any;
+	1: SchemaType<T>;
+}[T extends Schema ? 1 : 0];
+
+type NullOrUndefined<p extends Schema, T> =
 	p['nullable'] extends true
 		?	p['optional'] extends true
 			? (T | null | undefined)
@@ -132,41 +93,15 @@ type NullOrUndefined<p extends MinimumSchema, T> =
 			? (T | undefined)
 			: T;
 
-// 共用体型を交差型にする型 https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
+export type SchemaType<p extends Schema> =
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+	p['type'] extends 'number' ? NullOrUndefined<p, number> :
-
+	p['type'] extends 'string' ? NullOrUndefined<p, string> :
-// https://github.com/misskey-dev/misskey/pull/8144#discussion_r785287552
+	p['type'] extends 'boolean' ? NullOrUndefined<p, boolean> :
-// 単純にSchemaTypeDef<X>で判定するだけではダメ
+	p['type'] extends 'array' ? NullOrUndefined<p, MyType<NonNullable<p['items']>>[]> :
-type UnionSchemaType<a extends readonly any[], X extends MinimumSchema = a[number]> = X extends any ? SchemaType<X> : never;
-type ArrayUnion<T> = T extends any ? Array<T> : never; 
-
-export type SchemaTypeDef<p extends MinimumSchema> =
-	p['type'] extends 'number' ? number :
-	p['type'] extends 'string' ? (
-		p['enum'] extends readonly string[] ?
-			p['enum'][number] :
-			p['format'] extends 'date-time' ? string : // Dateにする？？
-			string
-	) :
-	p['type'] extends 'boolean' ? boolean :
 	p['type'] extends 'object' ? (
-		p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
+		p['ref'] extends keyof typeof refs
-		p['properties'] extends NonNullable<Obj> ? ObjType<p['properties']> :
+			? NullOrUndefined<p, Packed<p['ref']>>
-		p['anyOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<p['anyOf']> & Partial<UnionToIntersection<UnionSchemaType<p['anyOf']>>> :
+			: NullOrUndefined<p, ObjType<NonNullable<p['properties']>>>
-		p['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
-		any
 	) :
-	p['type'] extends 'array' ? (
+	p['type'] extends 'any' ? NullOrUndefined<p, any> :
-		p['items'] extends OfSchema ? (
-			p['items']['anyOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
-			p['items']['oneOf'] extends ReadonlyArray<MinimumSchema> ? ArrayUnion<UnionSchemaType<NonNullable<p['items']['oneOf']>>> :
-			p['items']['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<NonNullable<p['items']['allOf']>>>[] :
-			never
-		) :
-		p['items'] extends NonNullable<MinimumSchema> ? SchemaTypeDef<p['items']>[] :
-		any[]
-	) :
-	p['oneOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<p['oneOf']> :
 	any;
-
-export type SchemaType<p extends MinimumSchema> = NullOrUndefined<p, SchemaTypeDef<p>>;

packages/backend/src/misc/simple-schema.ts

@@ -0,0 +1,15 @@
+export interface SimpleSchema {
+	type: 'boolean' | 'number' | 'string' | 'array' | 'object' | 'any';
+	nullable: boolean;
+	optional: boolean;
+	items?: SimpleSchema;
+	properties?: SimpleObj;
+	description?: string;
+	example?: any;
+	format?: string;
+	ref?: string;
+	enum?: string[];
+	default?: boolean | null;
+}
+
+export interface SimpleObj { [key: string]: SimpleSchema; }

packages/backend/src/models/entities/abuse-user-report.ts

@@ -51,11 +51,6 @@ export class AbuseUserReport {
 	})
 	public resolved: boolean;
 
-	@Column('boolean', {
-		default: false
-	})
-	public forwarded: boolean;
-
 	@Column('varchar', {
 		length: 2048,
 	})

packages/backend/src/models/entities/drive-file.ts

@@ -101,11 +101,6 @@ export class DriveFile {
 	})
 	public webpublicUrl: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-	})
-	public webpublicType: string | null;
-
 	@Index({ unique: true })
 	@Column('varchar', {
 		length: 256, nullable: true,

packages/backend/src/models/entities/emoji.ts

@@ -32,19 +32,13 @@ export class Emoji {
 	@Column('varchar', {
 		length: 512,
 	})
-	public originalUrl: string;
+	public url: string;
-
-	@Column('varchar', {
-		length: 512,
-	})
-	public publicUrl: string;
 
 	@Column('varchar', {
 		length: 512, nullable: true,
 	})
 	public uri: string | null;
 
-	// publicUrlの方のtypeが入る
 	@Column('varchar', {
 		length: 64, nullable: true,
 	})

packages/backend/src/models/entities/games/reversi/game.ts

@@ -0,0 +1,133 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from '../../user';
+import { id } from '../../../id';
+
+@Entity()
+export class ReversiGame {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the ReversiGame.',
+	})
+	public createdAt: Date;
+
+	@Column('timestamp with time zone', {
+		nullable: true,
+		comment: 'The started date of the ReversiGame.',
+	})
+	public startedAt: Date | null;
+
+	@Column(id())
+	public user1Id: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user1: User | null;
+
+	@Column(id())
+	public user2Id: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user2: User | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public user1Accepted: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public user2Accepted: boolean;
+
+	/**
+	 * どちらのプレイヤーが先行(黒)か
+	 * 1 ... user1
+	 * 2 ... user2
+	 */
+	@Column('integer', {
+		nullable: true,
+	})
+	public black: number | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isStarted: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isEnded: boolean;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public winnerId: User['id'] | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public surrendered: User['id'] | null;
+
+	@Column('jsonb', {
+		default: [],
+	})
+	public logs: {
+		at: Date;
+		color: boolean;
+		pos: number;
+	}[];
+
+	@Column('varchar', {
+		array: true, length: 64,
+	})
+	public map: string[];
+
+	@Column('varchar', {
+		length: 32,
+	})
+	public bw: string;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isLlotheo: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public canPutEverywhere: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public loopedBoard: boolean;
+
+	@Column('jsonb', {
+		nullable: true, default: null,
+	})
+	public form1: any | null;
+
+	@Column('jsonb', {
+		nullable: true, default: null,
+	})
+	public form2: any | null;
+
+	/**
+	 * ログのposを文字列としてすべて連結したもののCRC32値
+	 */
+	@Column('varchar', {
+		length: 32, nullable: true,
+	})
+	public crc32: string | null;
+}

packages/backend/src/models/entities/games/reversi/matching.ts

@@ -0,0 +1,35 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from '../../user';
+import { id } from '../../../id';
+
+@Entity()
+export class ReversiMatching {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the ReversiMatching.',
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column(id())
+	public parentId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public parent: User | null;
+
+	@Index()
+	@Column(id())
+	public childId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public child: User | null;
+}

packages/backend/src/models/entities/user-profile.ts

@@ -124,7 +124,6 @@ export class UserProfile {
 	})
 	public clientData: Record<string, any>;
 
-	// TODO: そのうち消す
 	@Column('jsonb', {
 		default: {},
 		comment: 'The room data of the User.',

packages/backend/src/models/index.ts

@@ -18,6 +18,7 @@ import { AccessToken } from './entities/access-token';
 import { UserNotePining } from './entities/user-note-pining';
 import { SigninRepository } from './repositories/signin';
 import { MessagingMessageRepository } from './repositories/messaging-message';
+import { ReversiGameRepository } from './repositories/games/reversi/game';
 import { UserListRepository } from './repositories/user-list';
 import { UserListJoining } from './entities/user-list-joining';
 import { UserGroupRepository } from './repositories/user-group';
@@ -29,6 +30,7 @@ import { BlockingRepository } from './repositories/blocking';
 import { NoteReactionRepository } from './repositories/note-reaction';
 import { NotificationRepository } from './repositories/notification';
 import { NoteFavoriteRepository } from './repositories/note-favorite';
+import { ReversiMatchingRepository } from './repositories/games/reversi/matching';
 import { UserPublickey } from './entities/user-publickey';
 import { UserKeypair } from './entities/user-keypair';
 import { AppRepository } from './repositories/app';
@@ -105,6 +107,8 @@ export const AuthSessions = getCustomRepository(AuthSessionRepository);
 export const AccessTokens = getRepository(AccessToken);
 export const Signins = getCustomRepository(SigninRepository);
 export const MessagingMessages = getCustomRepository(MessagingMessageRepository);
+export const ReversiGames = getCustomRepository(ReversiGameRepository);
+export const ReversiMatchings = getCustomRepository(ReversiMatchingRepository);
 export const Pages = getCustomRepository(PageRepository);
 export const PageLikes = getCustomRepository(PageLikeRepository);
 export const GalleryPosts = getCustomRepository(GalleryPostRepository);

packages/backend/src/models/repositories/abuse-user-report.ts

@@ -27,7 +27,6 @@ export class AbuseUserReportRepository extends Repository<AbuseUserReport> {
 			assignee: report.assigneeId ? Users.pack(report.assignee || report.assigneeId, null, {
 				detail: true,
 			}) : null,
-			forwarded: report.forwarded,
 		});
 	}
 

packages/backend/src/models/repositories/antenna.ts

@@ -31,3 +31,94 @@ export class AntennaRepository extends Repository<Antenna> {
 		};
 	}
 }
+
+export const packedAntennaSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		keywords: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+			items: {
+				type: 'array' as const,
+				optional: false as const, nullable: false as const,
+				items: {
+					type: 'string' as const,
+					optional: false as const, nullable: false as const,
+				},
+			},
+		},
+		excludeKeywords: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+			items: {
+				type: 'array' as const,
+				optional: false as const, nullable: false as const,
+				items: {
+					type: 'string' as const,
+					optional: false as const, nullable: false as const,
+				},
+			},
+		},
+		src: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			enum: ['home', 'all', 'users', 'list', 'group'],
+		},
+		userListId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+		},
+		userGroupId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+		},
+		users: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+			},
+		},
+		caseSensitive: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+			default: false,
+		},
+		notify: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		withReplies: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+			default: false,
+		},
+		withFile: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		hasUnreadNote: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+			default: false,
+		},
+	},
+};

packages/backend/src/models/repositories/app.ts

@@ -38,3 +38,38 @@ export class AppRepository extends Repository<App> {
 		};
 	}
 }
+
+export const packedAppSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		callbackUrl: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		permission: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+			},
+		},
+		secret: {
+			type: 'string' as const,
+			optional: true as const, nullable: false as const,
+		},
+		isAuthorized: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/blocking.ts

@@ -30,3 +30,31 @@ export class BlockingRepository extends Repository<Blocking> {
 		return Promise.all(blockings.map(x => this.pack(x, me)));
 	}
 }
+
+export const packedBlockingSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		blockeeId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		blockee: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+	},
+};

packages/backend/src/models/repositories/channel.ts

@@ -40,3 +40,56 @@ export class ChannelRepository extends Repository<Channel> {
 		};
 	}
 }
+
+export const packedChannelSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		lastNotedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'date-time',
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		description: {
+			type: 'string' as const,
+			nullable: true as const, optional: false as const,
+		},
+		bannerUrl: {
+			type: 'string' as const,
+			format: 'url',
+			nullable: true as const, optional: false as const,
+		},
+		notesCount: {
+			type: 'number' as const,
+			nullable: false as const, optional: false as const,
+		},
+		usersCount: {
+			type: 'number' as const,
+			nullable: false as const, optional: false as const,
+		},
+		isFollowing: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		userId: {
+			type: 'string' as const,
+			nullable: true as const, optional: false as const,
+			format: 'id',
+		},
+	},
+};

packages/backend/src/models/repositories/clip.ts

@@ -29,3 +29,42 @@ export class ClipRepository extends Repository<Clip> {
 	}
 }
 
+export const packedClipSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User' as const,
+			optional: false as const, nullable: false as const,
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		description: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		isPublic: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/drive-file.ts

@@ -3,7 +3,7 @@ import { DriveFile } from '@/models/entities/drive-file';
 import { Users, DriveFolders } from '../index';
 import { User } from '@/models/entities/user';
 import { toPuny } from '@/misc/convert-host';
-import { awaitAll, Promiseable } from '@/prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
 import { Packed } from '@/misc/schema';
 import config from '@/config/index';
 import { query, appendQuery } from '@/prelude/url';
@@ -126,7 +126,7 @@ export class DriveFileRepository extends Repository<DriveFile> {
 
 		const meta = await fetchMeta();
 
-		return await awaitAll<Packed<'DriveFile'>>({
+		return await awaitAll({
 			id: file.id,
 			createdAt: file.createdAt.toISOString(),
 			name: file.name,
@@ -156,3 +156,112 @@ export class DriveFileRepository extends Repository<DriveFile> {
 		return items.filter(x => x != null);
 	}
 }
+
+export const packedDriveFileSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			example: 'lenna.jpg',
+		},
+		type: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			example: 'image/jpeg',
+		},
+		md5: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'md5',
+			example: '15eca7fba0480996e2245f5185bf39f2',
+		},
+		size: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+			example: 51469,
+		},
+		isSensitive: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		blurhash: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		properties: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			properties: {
+				width: {
+					type: 'number' as const,
+					optional: true as const, nullable: false as const,
+					example: 1280,
+				},
+				height: {
+					type: 'number' as const,
+					optional: true as const, nullable: false as const,
+					example: 720,
+				},
+				orientation: {
+					type: 'number' as const,
+					optional: true as const, nullable: false as const,
+					example: 8,
+				},
+				avgColor: {
+					type: 'string' as const,
+					optional: true as const, nullable: false as const,
+					example: 'rgb(40,65,87)',
+				},
+			},
+		},
+		url: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'url',
+		},
+		thumbnailUrl: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'url',
+		},
+		comment: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		folderId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		folder: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'DriveFolder' as const,
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		user: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'User' as const,
+		},
+	},
+};

packages/backend/src/models/repositories/drive-folder.ts

@@ -48,3 +48,44 @@ export class DriveFolderRepository extends Repository<DriveFolder> {
 		});
 	}
 }
+
+export const packedDriveFolderSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		foldersCount: {
+			type: 'number' as const,
+			optional: true as const, nullable: false as const,
+		},
+		filesCount: {
+			type: 'number' as const,
+			optional: true as const, nullable: false as const,
+		},
+		parentId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		parent: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'DriveFolder' as const,
+		},
+	},
+};

packages/backend/src/models/repositories/emoji.ts

@@ -15,8 +15,7 @@ export class EmojiRepository extends Repository<Emoji> {
 			name: emoji.name,
 			category: emoji.category,
 			host: emoji.host,
-			// || emoji.originalUrl してるのは後方互換性のため
+			url: emoji.url,
-			url: emoji.publicUrl || emoji.originalUrl,
 		};
 	}
 
@@ -26,3 +25,41 @@ export class EmojiRepository extends Repository<Emoji> {
 		return Promise.all(emojis.map(x => this.pack(x)));
 	}
 }
+
+export const packedEmojiSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		aliases: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id',
+			},
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		category: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		host: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		url: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/federation-instance.ts

@@ -1,2 +1,106 @@
 import config from '@/config/index';
 
+export const packedFederationInstanceSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		caughtAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		host: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			example: 'misskey.example.com',
+		},
+		usersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		notesCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		followingCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		followersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		driveUsage: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		driveFiles: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		latestRequestSentAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'date-time',
+		},
+		lastCommunicatedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		isNotResponding: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		isSuspended: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		softwareName: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			example: 'misskey',
+		},
+		softwareVersion: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			example: config.version,
+		},
+		openRegistrations: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: true as const,
+			example: true,
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		description: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		maintainerName: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		maintainerEmail: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		iconUrl: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'url',
+		},
+		infoUpdatedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'date-time',
+		},
+	},
+};

packages/backend/src/models/repositories/following.ts

@@ -84,3 +84,41 @@ export class FollowingRepository extends Repository<Following> {
 		return Promise.all(followings.map(x => this.pack(x, me, opts)));
 	}
 }
+
+export const packedFollowingSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		followeeId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		followee: {
+			type: 'object' as const,
+			optional: true as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+		followerId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		follower: {
+			type: 'object' as const,
+			optional: true as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+	},
+};

packages/backend/src/models/repositories/gallery-post.ts

@@ -38,3 +38,74 @@ export class GalleryPostRepository extends Repository<GalleryPost> {
 		return Promise.all(posts.map(x => this.pack(x, me)));
 	}
 }
+
+export const packedGalleryPostSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		updatedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		title: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		description: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User' as const,
+			optional: false as const, nullable: false as const,
+		},
+		fileIds: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id',
+			},
+		},
+		files: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'object' as const,
+				optional: false as const, nullable: false as const,
+				ref: 'DriveFile' as const,
+			},
+		},
+		tags: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+			},
+		},
+		isSensitive: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/games/reversi/game.ts

@@ -0,0 +1,191 @@
+import { User } from '@/models/entities/user';
+import { EntityRepository, Repository } from 'typeorm';
+import { Users } from '../../../index';
+import { ReversiGame } from '@/models/entities/games/reversi/game';
+import { Packed } from '@/misc/schema';
+
+@EntityRepository(ReversiGame)
+export class ReversiGameRepository extends Repository<ReversiGame> {
+	public async pack(
+		src: ReversiGame['id'] | ReversiGame,
+		me?: { id: User['id'] } | null | undefined,
+		options?: {
+			detail?: boolean
+		}
+	): Promise<Packed<'ReversiGame'>> {
+		const opts = Object.assign({
+			detail: true,
+		}, options);
+
+		const game = typeof src === 'object' ? src : await this.findOneOrFail(src);
+
+		return {
+			id: game.id,
+			createdAt: game.createdAt.toISOString(),
+			startedAt: game.startedAt && game.startedAt.toISOString(),
+			isStarted: game.isStarted,
+			isEnded: game.isEnded,
+			form1: game.form1,
+			form2: game.form2,
+			user1Accepted: game.user1Accepted,
+			user2Accepted: game.user2Accepted,
+			user1Id: game.user1Id,
+			user2Id: game.user2Id,
+			user1: await Users.pack(game.user1Id, me),
+			user2: await Users.pack(game.user2Id, me),
+			winnerId: game.winnerId,
+			winner: game.winnerId ? await Users.pack(game.winnerId, me) : null,
+			surrendered: game.surrendered,
+			black: game.black,
+			bw: game.bw,
+			isLlotheo: game.isLlotheo,
+			canPutEverywhere: game.canPutEverywhere,
+			loopedBoard: game.loopedBoard,
+			...(opts.detail ? {
+				logs: game.logs.map(log => ({
+					at: log.at.toISOString(),
+					color: log.color,
+					pos: log.pos,
+				})),
+				map: game.map,
+			} : {}),
+		};
+	}
+}
+
+export const packedReversiGameSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		startedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'date-time',
+		},
+		isStarted: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		isEnded: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		form1: {
+			type: 'any' as const,
+			optional: false as const, nullable: true as const,
+		},
+		form2: {
+			type: 'any' as const,
+			optional: false as const, nullable: true as const,
+		},
+		user1Accepted: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		user2Accepted: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		user1Id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		user2Id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		user1: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+		user2: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+		winnerId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		winner: {
+			type: 'object' as const,
+			optional: false as const, nullable: true as const,
+			ref: 'User' as const,
+		},
+		surrendered: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		black: {
+			type: 'number' as const,
+			optional: false as const, nullable: true as const,
+		},
+		bw: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		isLlotheo: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		canPutEverywhere: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		loopedBoard: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		logs: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'object' as const,
+				optional: true as const, nullable: false as const,
+				properties: {
+					at: {
+						type: 'string' as const,
+						optional: false as const, nullable: false as const,
+						format: 'date-time',
+					},
+					color: {
+						type: 'boolean' as const,
+						optional: false as const, nullable: false as const,
+					},
+					pos: {
+						type: 'number' as const,
+						optional: false as const, nullable: false as const,
+					},
+				},
+			},
+		},
+		map: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+			},
+		},
+	},
+};

packages/backend/src/models/repositories/games/reversi/matching.ts

@@ -0,0 +1,69 @@
+import { EntityRepository, Repository } from 'typeorm';
+import { ReversiMatching } from '@/models/entities/games/reversi/matching';
+import { Users } from '../../../index';
+import { awaitAll } from '@/prelude/await-all';
+import { User } from '@/models/entities/user';
+import { Packed } from '@/misc/schema';
+
+@EntityRepository(ReversiMatching)
+export class ReversiMatchingRepository extends Repository<ReversiMatching> {
+	public async pack(
+		src: ReversiMatching['id'] | ReversiMatching,
+		me: { id: User['id'] }
+	): Promise<Packed<'ReversiMatching'>> {
+		const matching = typeof src === 'object' ? src : await this.findOneOrFail(src);
+
+		return await awaitAll({
+			id: matching.id,
+			createdAt: matching.createdAt.toISOString(),
+			parentId: matching.parentId,
+			parent: Users.pack(matching.parentId, me, {
+				detail: true,
+			}),
+			childId: matching.childId,
+			child: Users.pack(matching.childId, me, {
+				detail: true,
+			}),
+		});
+	}
+}
+
+export const packedReversiMatchingSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		parentId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		parent: {
+			type: 'object' as const,
+			optional: false as const, nullable: true as const,
+			ref: 'User' as const,
+		},
+		childId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		child: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+	},
+};

packages/backend/src/models/repositories/hashtag.ts

@@ -24,3 +24,39 @@ export class HashtagRepository extends Repository<Hashtag> {
 		return Promise.all(hashtags.map(x => this.pack(x)));
 	}
 }
+
+export const packedHashtagSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		tag: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			example: 'misskey',
+		},
+		mentionedUsersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		mentionedLocalUsersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		mentionedRemoteUsersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		attachedUsersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		attachedLocalUsersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		attachedRemoteUsersCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/messaging-message.ts

@@ -42,3 +42,78 @@ export class MessagingMessageRepository extends Repository<MessagingMessage> {
 		};
 	}
 }
+
+export const packedMessagingMessageSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User' as const,
+			optional: true as const, nullable: false as const,
+		},
+		text: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		fileId: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+			format: 'id',
+		},
+		file: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'DriveFile' as const,
+		},
+		recipientId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+		},
+		recipient: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'User' as const,
+		},
+		groupId: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+			format: 'id',
+		},
+		group: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'UserGroup' as const,
+		},
+		isRead: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		reads: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id',
+			},
+		},
+	},
+};

packages/backend/src/models/repositories/muting.ts

@@ -30,3 +30,31 @@ export class MutingRepository extends Repository<Muting> {
 		return Promise.all(mutings.map(x => this.pack(x, me)));
 	}
 }
+
+export const packedMutingSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		muteeId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		mutee: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+	},
+};

packages/backend/src/models/repositories/note-favorite.ts

@@ -26,3 +26,31 @@ export class NoteFavoriteRepository extends Repository<NoteFavorite> {
 		return Promise.all(favorites.map(x => this.pack(x, me)));
 	}
 }
+
+export const packedNoteFavoriteSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		note: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'Note' as const,
+		},
+		noteId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+	},
+};

packages/backend/src/models/repositories/note-reaction.ts

@@ -31,3 +31,30 @@ export class NoteReactionRepository extends Repository<NoteReaction> {
 		};
 	}
 }
+
+export const packedNoteReactionSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		user: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'User' as const,
+		},
+		type: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/note.ts

@@ -218,7 +218,7 @@ export class NoteRepository extends Repository<Note> {
 
 		const reactionEmojiNames = Object.keys(note.reactions).filter(x => x?.startsWith(':')).map(x => decodeReaction(x).reaction).map(x => x.replace(/:/g, ''));
 
-		const packed: Packed<'Note'> = await awaitAll({
+		const packed = await awaitAll({
 			id: note.id,
 			createdAt: note.createdAt.toISOString(),
 			userId: note.userId,
@@ -320,3 +320,188 @@ export class NoteRepository extends Repository<Note> {
 		})));
 	}
 }
+
+export const packedNoteSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		text: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		cw: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User' as const,
+			optional: false as const, nullable: false as const,
+		},
+		replyId: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		renoteId: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		reply: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'Note' as const,
+		},
+		renote: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			ref: 'Note' as const,
+		},
+		isHidden: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		visibility: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		mentions: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id',
+			},
+		},
+		visibleUserIds: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id',
+			},
+		},
+		fileIds: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id',
+			},
+		},
+		files: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'object' as const,
+				optional: false as const, nullable: false as const,
+				ref: 'DriveFile' as const,
+			},
+		},
+		tags: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+			},
+		},
+		poll: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+		},
+		channelId: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		channel: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+			items: {
+				type: 'object' as const,
+				optional: false as const, nullable: false as const,
+				properties: {
+					id: {
+						type: 'string' as const,
+						optional: false as const, nullable: false as const,
+					},
+					name: {
+						type: 'string' as const,
+						optional: false as const, nullable: true as const,
+					},
+				},
+			},
+		},
+		localOnly: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		emojis: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+			items: {
+				type: 'object' as const,
+				optional: false as const, nullable: false as const,
+				properties: {
+					name: {
+						type: 'string' as const,
+						optional: false as const, nullable: false as const,
+					},
+					url: {
+						type: 'string' as const,
+						optional: false as const, nullable: true as const,
+					},
+				},
+			},
+		},
+		reactions: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+		},
+		renoteCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		repliesCount: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		uri: {
+			type: 'string' as const,
+			optional: true as const, nullable: false as const,
+		},
+		url: {
+			type: 'string' as const,
+			optional: true as const, nullable: false as const,
+		},
+
+		myReaction: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+		},
+	},
+};

packages/backend/src/models/repositories/notification.ts

@@ -107,3 +107,69 @@ export class NotificationRepository extends Repository<Notification> {
 		})));
 	}
 }
+
+export const packedNotificationSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		isRead: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+		type: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			enum: [...notificationTypes],
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User' as const,
+			optional: true as const, nullable: true as const,
+		},
+		userId: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+			format: 'id',
+		},
+		note: {
+			type: 'object' as const,
+			ref: 'Note' as const,
+			optional: true as const, nullable: true as const,
+		},
+		reaction: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+		},
+		choice: {
+			type: 'number' as const,
+			optional: true as const, nullable: true as const,
+		},
+		invitation: {
+			type: 'object' as const,
+			optional: true as const, nullable: true as const,
+		},
+		body: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+		},
+		header: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+		},
+		icon: {
+			type: 'string' as const,
+			optional: true as const, nullable: true as const,
+		},
+	},
+};

packages/backend/src/models/repositories/page.ts

@@ -87,3 +87,56 @@ export class PageRepository extends Repository<Page> {
 		return Promise.all(pages.map(x => this.pack(x, me)));
 	}
 }
+
+export const packedPageSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		updatedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		title: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		summary: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		content: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+		},
+		variables: {
+			type: 'array' as const,
+			optional: false as const, nullable: false as const,
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/queue.ts

@@ -0,0 +1,30 @@
+export const packedQueueCountSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		waiting: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		active: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		completed: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		failed: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		delayed: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+		paused: {
+			type: 'number' as const,
+			optional: false as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/repositories/user-group.ts

@@ -23,3 +23,39 @@ export class UserGroupRepository extends Repository<UserGroup> {
 		};
 	}
 }
+
+export const packedUserGroupSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		ownerId: {
+			type: 'string' as const,
+			nullable: false as const, optional: false as const,
+			format: 'id',
+		},
+		userIds: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+			items: {
+				type: 'string' as const,
+				nullable: false as const, optional: false as const,
+				format: 'id',
+			},
+		},
+	},
+};

packages/backend/src/models/repositories/user-list.ts

@@ -22,3 +22,34 @@ export class UserListRepository extends Repository<UserList> {
 		};
 	}
 }
+
+export const packedUserListSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		name: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		userIds: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+			items: {
+				type: 'string' as const,
+				nullable: false as const, optional: false as const,
+				format: 'id',
+			},
+		},
+	},
+};

packages/backend/src/models/repositories/user.ts

@@ -4,19 +4,11 @@ import { User, ILocalUser, IRemoteUser } from '@/models/entities/user';
 import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '../index';
 import config from '@/config/index';
 import { Packed } from '@/misc/schema';
-import { awaitAll, Promiseable } from '@/prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
 import { populateEmojis } from '@/misc/populate-emojis';
 import { getAntennas } from '@/misc/antenna-cache';
 import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const';
 
-type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>;
-type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> =
-	Detailed extends true ? 
-		ExpectsMe extends true ? Packed<'MeDetailed'> :
-		ExpectsMe extends false ? Packed<'UserDetailedNotMe'> :
-		Packed<'UserDetailed'> :
-	Packed<'UserLite'>;
-
 @EntityRepository(User)
 export class UserRepository extends Repository<User> {
 	public async getRelation(me: User['id'], target: User['id']) {
@@ -152,7 +144,7 @@ export class UserRepository extends Repository<User> {
 		return count > 0;
 	}
 
-	public getOnlineStatus(user: User): 'unknown' | 'online' | 'active' | 'offline' {
+	public getOnlineStatus(user: User): string {
 		if (user.hideOnlineStatus) return 'unknown';
 		if (user.lastActiveDate == null) return 'unknown';
 		const elapsed = Date.now() - user.lastActiveDate.getTime();
@@ -167,18 +159,18 @@ export class UserRepository extends Repository<User> {
 		if (user.avatarUrl) {
 			return user.avatarUrl;
 		} else {
-			return `${config.url}/identicon/${user.id}`;
+			return `${config.url}/random-avatar/${user.id}`;
 		}
 	}
 
-	public async pack<ExpectsMe extends boolean | null = null, D extends boolean = false>(
+	public async pack(
 		src: User['id'] | User,
 		me?: { id: User['id'] } | null | undefined,
 		options?: {
-			detail?: D,
+			detail?: boolean,
 			includeSecrets?: boolean,
 		}
-	): Promise<IsMeAndIsUserDetailed<ExpectsMe, D>> {
+	): Promise<Packed<'User'>> {
 		const opts = Object.assign({
 			detail: false,
 			includeSecrets: false,
@@ -186,9 +178,8 @@ export class UserRepository extends Repository<User> {
 
 		const user = typeof src === 'object' ? src : await this.findOneOrFail(src);
 		const meId = me ? me.id : null;
-		const isMe = meId === user.id;
 
-		const relation = meId && !isMe && opts.detail ? await this.getRelation(meId, user.id) : null;
+		const relation = meId && (meId !== user.id) && opts.detail ? await this.getRelation(meId, user.id) : null;
 		const pins = opts.detail ? await UserNotePinings.createQueryBuilder('pin')
 			.where('pin.userId = :userId', { userId: user.id })
 			.innerJoinAndSelect('pin.note', 'note')
@@ -197,12 +188,12 @@ export class UserRepository extends Repository<User> {
 		const profile = opts.detail ? await UserProfiles.findOneOrFail(user.id) : null;
 
 		const followingCount = profile == null ? null :
-			(profile.ffVisibility === 'public') || isMe ? user.followingCount :
+			(profile.ffVisibility === 'public') || (meId === user.id) ? user.followingCount :
 			(profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
 			null;
 
 		const followersCount = profile == null ? null :
-			(profile.ffVisibility === 'public') || isMe ? user.followersCount :
+			(profile.ffVisibility === 'public') || (meId === user.id) ? user.followersCount :
 			(profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
 			null;
 
@@ -236,11 +227,12 @@ export class UserRepository extends Repository<User> {
 				uri: user.uri,
 				createdAt: user.createdAt.toISOString(),
 				updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
-				lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null,
+				lastFetchedAt: user.lastFetchedAt?.toISOString(),
 				bannerUrl: user.bannerUrl,
 				bannerBlurhash: user.bannerBlurhash,
 				bannerColor: null, // 後方互換性のため
 				isLocked: user.isLocked,
+				isModerator: user.isModerator || falsy,
 				isSilenced: user.isSilenced || falsy,
 				isSuspended: user.isSuspended || falsy,
 				description: profile!.description,
@@ -268,7 +260,7 @@ export class UserRepository extends Repository<User> {
 					: false,
 			} : {}),
 
-			...(opts.detail && isMe ? {
+			...(opts.detail && meId === user.id ? {
 				avatarId: user.avatarId,
 				bannerId: user.bannerId,
 				injectFeaturedNote: profile!.injectFeaturedNote,
@@ -323,19 +315,19 @@ export class UserRepository extends Repository<User> {
 				isBlocked: relation.isBlocked,
 				isMuted: relation.isMuted,
 			} : {}),
-		} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
+		};
 
 		return await awaitAll(packed);
 	}
 
-	public packMany<D extends boolean = false>(
+	public packMany(
 		users: (User['id'] | User)[],
 		me?: { id: User['id'] } | null | undefined,
 		options?: {
-			detail?: D,
+			detail?: boolean,
 			includeSecrets?: boolean,
 		}
-	): Promise<IsUserDetailed<D>[]> {
+	) {
 		return Promise.all(users.map(u => this.pack(u, me, options)));
 	}
 
@@ -360,3 +352,313 @@ export class UserRepository extends Repository<User> {
 	public validateBirthday = $.str.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/);
 	//#endregion
 }
+
+export const packedUserSchema = {
+	type: 'object' as const,
+	nullable: false as const, optional: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			nullable: false as const, optional: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		name: {
+			type: 'string' as const,
+			nullable: true as const, optional: false as const,
+			example: '藍',
+		},
+		username: {
+			type: 'string' as const,
+			nullable: false as const, optional: false as const,
+			example: 'ai',
+		},
+		host: {
+			type: 'string' as const,
+			nullable: true as const, optional: false as const,
+			example: 'misskey.example.com',
+		},
+		avatarUrl: {
+			type: 'string' as const,
+			format: 'url',
+			nullable: true as const, optional: false as const,
+		},
+		avatarBlurhash: {
+			type: 'any' as const,
+			nullable: true as const, optional: false as const,
+		},
+		avatarColor: {
+			type: 'any' as const,
+			nullable: true as const, optional: false as const,
+			default: null,
+		},
+		isAdmin: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+			default: false,
+		},
+		isModerator: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+			default: false,
+		},
+		isBot: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		isCat: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		emojis: {
+			type: 'array' as const,
+			nullable: false as const, optional: false as const,
+			items: {
+				type: 'object' as const,
+				nullable: false as const, optional: false as const,
+				properties: {
+					name: {
+						type: 'string' as const,
+						nullable: false as const, optional: false as const,
+					},
+					url: {
+						type: 'string' as const,
+						nullable: false as const, optional: false as const,
+						format: 'url',
+					},
+				},
+			},
+		},
+		url: {
+			type: 'string' as const,
+			format: 'url',
+			nullable: true as const, optional: true as const,
+		},
+		createdAt: {
+			type: 'string' as const,
+			nullable: false as const, optional: true as const,
+			format: 'date-time',
+		},
+		updatedAt: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+			format: 'date-time',
+		},
+		bannerUrl: {
+			type: 'string' as const,
+			format: 'url',
+			nullable: true as const, optional: true as const,
+		},
+		bannerBlurhash: {
+			type: 'any' as const,
+			nullable: true as const, optional: true as const,
+		},
+		bannerColor: {
+			type: 'any' as const,
+			nullable: true as const, optional: true as const,
+			default: null,
+		},
+		isLocked: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		isSuspended: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+			example: false,
+		},
+		description: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+			example: 'Hi masters, I am Ai!',
+		},
+		location: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+		},
+		birthday: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+			example: '2018-03-12',
+		},
+		fields: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+			items: {
+				type: 'object' as const,
+				nullable: false as const, optional: false as const,
+				properties: {
+					name: {
+						type: 'string' as const,
+						nullable: false as const, optional: false as const,
+					},
+					value: {
+						type: 'string' as const,
+						nullable: false as const, optional: false as const,
+					},
+				},
+				maxLength: 4,
+			},
+		},
+		followersCount: {
+			type: 'number' as const,
+			nullable: false as const, optional: true as const,
+		},
+		followingCount: {
+			type: 'number' as const,
+			nullable: false as const, optional: true as const,
+		},
+		notesCount: {
+			type: 'number' as const,
+			nullable: false as const, optional: true as const,
+		},
+		pinnedNoteIds: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+			items: {
+				type: 'string' as const,
+				nullable: false as const, optional: false as const,
+				format: 'id',
+			},
+		},
+		pinnedNotes: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+			items: {
+				type: 'object' as const,
+				nullable: false as const, optional: false as const,
+				ref: 'Note' as const,
+			},
+		},
+		pinnedPageId: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+		},
+		pinnedPage: {
+			type: 'object' as const,
+			nullable: true as const, optional: true as const,
+			ref: 'Page' as const,
+		},
+		twoFactorEnabled: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+			default: false,
+		},
+		usePasswordLessLogin: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+			default: false,
+		},
+		securityKeys: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+			default: false,
+		},
+		avatarId: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+			format: 'id',
+		},
+		bannerId: {
+			type: 'string' as const,
+			nullable: true as const, optional: true as const,
+			format: 'id',
+		},
+		autoWatch: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		injectFeaturedNote: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		alwaysMarkNsfw: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		carefulBot: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		autoAcceptFollowed: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadSpecifiedNotes: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadMentions: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadAnnouncement: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadAntenna: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadChannel: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadMessagingMessage: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasUnreadNotification: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		hasPendingReceivedFollowRequest: {
+			type: 'boolean' as const,
+			nullable: false as const, optional: true as const,
+		},
+		integrations: {
+			type: 'object' as const,
+			nullable: false as const, optional: true as const,
+		},
+		mutedWords: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+		},
+		mutedInstances: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+		},
+		mutingNotificationTypes: {
+			type: 'array' as const,
+			nullable: false as const, optional: true as const,
+		},
+		isFollowing: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		hasPendingFollowRequestFromYou: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		hasPendingFollowRequestToYou: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		isFollowed: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		isBlocking: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		isBlocked: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+		isMuted: {
+			type: 'boolean' as const,
+			optional: true as const, nullable: false as const,
+		},
+	},
+};

packages/backend/src/models/schema/antenna.ts

@@ -1,89 +0,0 @@
-export const packedAntennaSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		keywords: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'array',
-				optional: false, nullable: false,
-				items: {
-					type: 'string',
-					optional: false, nullable: false,
-				},
-			},
-		},
-		excludeKeywords: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'array',
-				optional: false, nullable: false,
-				items: {
-					type: 'string',
-					optional: false, nullable: false,
-				},
-			},
-		},
-		src: {
-			type: 'string',
-			optional: false, nullable: false,
-			enum: ['home', 'all', 'users', 'list', 'group'],
-		},
-		userListId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-		},
-		userGroupId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-		},
-		users: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-			},
-		},
-		caseSensitive: {
-			type: 'boolean',
-			optional: false, nullable: false,
-			default: false,
-		},
-		notify: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		withReplies: {
-			type: 'boolean',
-			optional: false, nullable: false,
-			default: false,
-		},
-		withFile: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		hasUnreadNote: {
-			type: 'boolean',
-			optional: false, nullable: false,
-			default: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/app.ts

@@ -1,33 +0,0 @@
-export const packedAppSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		callbackUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		permission: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-			},
-		},
-		secret: {
-			type: 'string',
-			optional: true, nullable: false,
-		},
-		isAuthorized: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/blocking.ts

@@ -1,26 +0,0 @@
-export const packedBlockingSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		blockeeId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		blockee: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserDetailed',
-		},
-	},
-} as const;

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

@@ -1,51 +0,0 @@
-export const packedChannelSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		lastNotedAt: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		description: {
-			type: 'string',
-			nullable: true, optional: false,
-		},
-		bannerUrl: {
-			type: 'string',
-			format: 'url',
-			nullable: true, optional: false,
-		},
-		notesCount: {
-			type: 'number',
-			nullable: false, optional: false,
-		},
-		usersCount: {
-			type: 'number',
-			nullable: false, optional: false,
-		},
-		isFollowing: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
-		userId: {
-			type: 'string',
-			nullable: true, optional: false,
-			format: 'id',
-		},
-	},
-} as const;

packages/backend/src/models/schema/clip.ts

@@ -1,38 +0,0 @@
-export const packedClipSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: false, nullable: false,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		description: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		isPublic: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/drive-file.ts

@@ -1,107 +0,0 @@
-export const packedDriveFileSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-			example: 'lenna.jpg',
-		},
-		type: {
-			type: 'string',
-			optional: false, nullable: false,
-			example: 'image/jpeg',
-		},
-		md5: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'md5',
-			example: '15eca7fba0480996e2245f5185bf39f2',
-		},
-		size: {
-			type: 'number',
-			optional: false, nullable: false,
-			example: 51469,
-		},
-		isSensitive: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		blurhash: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		properties: {
-			type: 'object',
-			optional: false, nullable: false,
-			properties: {
-				width: {
-					type: 'number',
-					optional: true, nullable: false,
-					example: 1280,
-				},
-				height: {
-					type: 'number',
-					optional: true, nullable: false,
-					example: 720,
-				},
-				orientation: {
-					type: 'number',
-					optional: true, nullable: false,
-					example: 8,
-				},
-				avgColor: {
-					type: 'string',
-					optional: true, nullable: false,
-					example: 'rgb(40,65,87)',
-				},
-			},
-		},
-		url: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'url',
-		},
-		thumbnailUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'url',
-		},
-		comment: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		folderId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		folder: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'DriveFolder',
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		user: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'UserLite',
-		},
-	},
-} as const;

packages/backend/src/models/schema/drive-folder.ts

@@ -1,39 +0,0 @@
-export const packedDriveFolderSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		foldersCount: {
-			type: 'number',
-			optional: true, nullable: false,
-		},
-		filesCount: {
-			type: 'number',
-			optional: true, nullable: false,
-		},
-		parentId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		parent: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'DriveFolder',
-		},
-	},
-} as const;

packages/backend/src/models/schema/emoji.ts

@@ -1,36 +0,0 @@
-export const packedEmojiSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		aliases: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		category: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		host: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		url: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/federation-instance.ts

@@ -1,105 +0,0 @@
-import config from "@/config";
-
-export const packedFederationInstanceSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		caughtAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		host: {
-			type: 'string',
-			optional: false, nullable: false,
-			example: 'misskey.example.com',
-		},
-		usersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		notesCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		followingCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		followersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		driveUsage: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		driveFiles: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		latestRequestSentAt: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'date-time',
-		},
-		lastCommunicatedAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		isNotResponding: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		isSuspended: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		softwareName: {
-			type: 'string',
-			optional: false, nullable: true,
-			example: 'misskey',
-		},
-		softwareVersion: {
-			type: 'string',
-			optional: false, nullable: true,
-			example: config.version,
-		},
-		openRegistrations: {
-			type: 'boolean',
-			optional: false, nullable: true,
-			example: true,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		description: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		maintainerName: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		maintainerEmail: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		iconUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'url',
-		},
-		infoUpdatedAt: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'date-time',
-		},
-	},
-} as const;

packages/backend/src/models/schema/following.ts

@@ -1,36 +0,0 @@
-export const packedFollowingSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		followeeId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		followee: {
-			type: 'object',
-			optional: true, nullable: false,
-			ref: 'UserDetailed',
-		},
-		followerId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		follower: {
-			type: 'object',
-			optional: true, nullable: false,
-			ref: 'UserDetailed',
-		},
-	},
-} as const;

packages/backend/src/models/schema/gallery-post.ts

@@ -1,69 +0,0 @@
-export const packedGalleryPostSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		updatedAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		title: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		description: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: false, nullable: false,
-		},
-		fileIds: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
-		files: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'object',
-				optional: false, nullable: false,
-				ref: 'DriveFile',
-			},
-		},
-		tags: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-			},
-		},
-		isSensitive: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/hashtag.ts

@@ -1,34 +0,0 @@
-export const packedHashtagSchema = {
-	type: 'object',
-	properties: {
-		tag: {
-			type: 'string',
-			optional: false, nullable: false,
-			example: 'misskey',
-		},
-		mentionedUsersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		mentionedLocalUsersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		mentionedRemoteUsersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		attachedUsersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		attachedLocalUsersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		attachedRemoteUsersCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/messaging-message.ts

@@ -1,73 +0,0 @@
-export const packedMessagingMessageSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: true, nullable: false,
-		},
-		text: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		fileId: {
-			type: 'string',
-			optional: true, nullable: true,
-			format: 'id',
-		},
-		file: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'DriveFile',
-		},
-		recipientId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-		},
-		recipient: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'UserLite',
-		},
-		groupId: {
-			type: 'string',
-			optional: false, nullable: true,
-			format: 'id',
-		},
-		group: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'UserGroup',
-		},
-		isRead: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
-		reads: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
-	},
-} as const;

packages/backend/src/models/schema/muting.ts

@@ -1,26 +0,0 @@
-export const packedMutingSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		muteeId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		mutee: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserDetailed',
-		},
-	},
-} as const;

packages/backend/src/models/schema/note-favorite.ts

@@ -1,26 +0,0 @@
-export const packedNoteFavoriteSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		note: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'Note',
-		},
-		noteId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-	},
-} as const;

packages/backend/src/models/schema/note-reaction.ts

@@ -1,25 +0,0 @@
-export const packedNoteReactionSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		user: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserLite',
-		},
-		type: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/note.ts

@@ -1,183 +0,0 @@
-export const packedNoteSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		text: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		cw: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: false, nullable: false,
-		},
-		replyId: {
-			type: 'string',
-			optional: true, nullable: true,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		renoteId: {
-			type: 'string',
-			optional: true, nullable: true,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		reply: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'Note',
-		},
-		renote: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'Note',
-		},
-		isHidden: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
-		visibility: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		mentions: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
-		visibleUserIds: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
-		fileIds: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
-		files: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'object',
-				optional: false, nullable: false,
-				ref: 'DriveFile',
-			},
-		},
-		tags: {
-			type: 'array',
-			optional: true, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-			},
-		},
-		poll: {
-			type: 'object',
-			optional: true, nullable: true,
-		},
-		channelId: {
-			type: 'string',
-			optional: true, nullable: true,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		channel: {
-			type: 'object',
-			optional: true, nullable: true,
-			items: {
-				type: 'object',
-				optional: false, nullable: false,
-				properties: {
-					id: {
-						type: 'string',
-						optional: false, nullable: false,
-					},
-					name: {
-						type: 'string',
-						optional: false, nullable: true,
-					},
-				},
-			},
-		},
-		localOnly: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
-		emojis: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'object',
-				optional: false, nullable: false,
-				properties: {
-					name: {
-						type: 'string',
-						optional: false, nullable: false,
-					},
-					url: {
-						type: 'string',
-						optional: false, nullable: true,
-					},
-				},
-			},
-		},
-		reactions: {
-			type: 'object',
-			optional: false, nullable: false,
-		},
-		renoteCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		repliesCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		uri: {
-			type: 'string',
-			optional: true, nullable: false,
-		},
-		url: {
-			type: 'string',
-			optional: true, nullable: false,
-		},
-
-		myReaction: {
-			type: 'object',
-			optional: true, nullable: true,
-		},
-	},
-} as const;

packages/backend/src/models/schema/notification.ts

@@ -1,66 +0,0 @@
-import { notificationTypes } from "@/types";
-
-export const packedNotificationSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		isRead: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		type: {
-			type: 'string',
-			optional: false, nullable: false,
-			enum: [...notificationTypes],
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: true, nullable: true,
-		},
-		userId: {
-			type: 'string',
-			optional: true, nullable: true,
-			format: 'id',
-		},
-		note: {
-			type: 'object',
-			ref: 'Note',
-			optional: true, nullable: true,
-		},
-		reaction: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		choice: {
-			type: 'number',
-			optional: true, nullable: true,
-		},
-		invitation: {
-			type: 'object',
-			optional: true, nullable: true,
-		},
-		body: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		header: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		icon: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-	},
-} as const;

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

@@ -1,51 +0,0 @@
-export const packedPageSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		updatedAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		title: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		summary: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		content: {
-			type: 'array',
-			optional: false, nullable: false,
-		},
-		variables: {
-			type: 'array',
-			optional: false, nullable: false,
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/queue.ts

@@ -1,25 +0,0 @@
-export const packedQueueCountSchema = {
-	type: 'object',
-	properties: {
-		waiting: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		active: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		completed: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		failed: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		delayed: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/schema/user-group.ts

@@ -1,34 +0,0 @@
-export const packedUserGroupSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		ownerId: {
-			type: 'string',
-			nullable: false, optional: false,
-			format: 'id',
-		},
-		userIds: {
-			type: 'array',
-			nullable: false, optional: true,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-				format: 'id',
-			},
-		},
-	},
-} as const;

packages/backend/src/models/schema/user-list.ts

@@ -1,29 +0,0 @@
-export const packedUserListSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		userIds: {
-			type: 'array',
-			nullable: false, optional: true,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-				format: 'id',
-			},
-		},
-	},
-} as const;

packages/backend/src/models/schema/user.ts

@@ -1,467 +0,0 @@
-export const packedUserLiteSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			nullable: false, optional: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-		name: {
-			type: 'string',
-			nullable: true, optional: false,
-			example: '藍',
-		},
-		username: {
-			type: 'string',
-			nullable: false, optional: false,
-			example: 'ai',
-		},
-		host: {
-			type: 'string',
-			nullable: true, optional: false,
-			example: 'misskey.example.com',
-		},
-		avatarUrl: {
-			type: 'string',
-			format: 'url',
-			nullable: true, optional: false,
-		},
-		avatarBlurhash: {
-			type: 'any',
-			nullable: true, optional: false,
-		},
-		avatarColor: {
-			type: 'any',
-			nullable: true, optional: false,
-			default: null,
-		},
-		isAdmin: {
-			type: 'boolean',
-			nullable: false, optional: true,
-			default: false,
-		},
-		isModerator: {
-			type: 'boolean',
-			nullable: false, optional: true,
-			default: false,
-		},
-		isBot: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		isCat: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		emojis: {
-			type: 'array',
-			nullable: false, optional: false,
-			items: {
-				type: 'object',
-				nullable: false, optional: false,
-				properties: {
-					name: {
-						type: 'string',
-						nullable: false, optional: false,
-					},
-					url: {
-						type: 'string',
-						nullable: false, optional: false,
-						format: 'url',
-					},
-				},
-			},
-		},
-		onlineStatus: {
-			type: 'string',
-			format: 'url',
-			nullable: true, optional: false,
-			enum: ['unknown', 'online', 'active', 'offline'],
-		},
-	},
-} as const;
-
-export const packedUserDetailedNotMeOnlySchema = {
-	type: 'object',
-	properties: {
-		url: {
-			type: 'string',
-			format: 'url',
-			nullable: true, optional: false,
-		},
-		uri: {
-			type: 'string',
-			format: 'uri',
-			nullable: true, optional: false,
-		},
-		createdAt: {
-			type: 'string',
-			nullable: false, optional: false,
-			format: 'date-time',
-		},
-		updatedAt: {
-			type: 'string',
-			nullable: true, optional: false,
-			format: 'date-time',
-		},
-		lastFetchedAt: {
-			type: 'string',
-			nullable: true, optional: false,
-			format: 'date-time',
-		},
-		bannerUrl: {
-			type: 'string',
-			format: 'url',
-			nullable: true, optional: false,
-		},
-		bannerBlurhash: {
-			type: 'any',
-			nullable: true, optional: false,
-		},
-		bannerColor: {
-			type: 'any',
-			nullable: true, optional: false,
-			default: null,
-		},
-		isLocked: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		isSilenced: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		isSuspended: {
-			type: 'boolean',
-			nullable: false, optional: false,
-			example: false,
-		},
-		description: {
-			type: 'string',
-			nullable: true, optional: false,
-			example: 'Hi masters, I am Ai!',
-		},
-		location: {
-			type: 'string',
-			nullable: true, optional: false,
-		},
-		birthday: {
-			type: 'string',
-			nullable: true, optional: false,
-			example: '2018-03-12',
-		},
-		lang: {
-			type: 'string',
-			nullable: true, optional: false,
-			example: 'ja-JP',
-		},
-		fields: {
-			type: 'array',
-			nullable: false, optional: false,
-			items: {
-					type: 'object',
-					nullable: false, optional: false,
-					properties: {
-						name: {
-							type: 'string',
-							nullable: false, optional: false,
-						},
-						value: {
-							type: 'string',
-							nullable: false, optional: false,
-						},
-					},
-					maxLength: 4,
-			},
-		},
-		followersCount: {
-			type: 'number',
-			nullable: false, optional: false,
-		},
-		followingCount: {
-			type: 'number',
-			nullable: false, optional: false,
-		},
-		notesCount: {
-			type: 'number',
-			nullable: false, optional: false,
-		},
-		pinnedNoteIds: {
-			type: 'array',
-			nullable: false, optional: false,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-				format: 'id',
-			},
-		},
-		pinnedNotes: {
-			type: 'array',
-			nullable: false, optional: false,
-			items: {
-				type: 'object',
-				nullable: false, optional: false,
-				ref: 'Note',
-			},
-		},
-		pinnedPageId: {
-			type: 'string',
-			nullable: true, optional: false,
-		},
-		pinnedPage: {
-			type: 'object',
-			nullable: true, optional: false,
-			ref: 'Page',
-		},
-		publicReactions: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		twoFactorEnabled: {
-			type: 'boolean',
-			nullable: false, optional: false,
-			default: false,
-		},
-		usePasswordLessLogin: {
-			type: 'boolean',
-			nullable: false, optional: false,
-			default: false,
-		},
-		securityKeys: {
-			type: 'boolean',
-			nullable: false, optional: false,
-			default: false,
-		},
-		//#region relations
-		isFollowing: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		isFollowed: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		hasPendingFollowRequestFromYou: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		hasPendingFollowRequestToYou: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		isBlocking: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		isBlocked: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		isMuted: {
-			type: 'boolean',
-			nullable: false, optional: true,
-		},
-		//#endregion
-	},
-} as const;
-
-export const packedMeDetailedOnlySchema = {
-	type: 'object',
-	properties: {
-		avatarId: {
-			type: 'string',
-			nullable: true, optional: false,
-			format: 'id',
-		},
-		bannerId: {
-			type: 'string',
-			nullable: true, optional: false,
-			format: 'id',
-		},
-		injectFeaturedNote: {
-			type: 'boolean',
-			nullable: true, optional: false,
-		},
-		receiveAnnouncementEmail: {
-			type: 'boolean',
-			nullable: true, optional: false,
-		},
-		alwaysMarkNsfw: {
-			type: 'boolean',
-			nullable: true, optional: false,
-		},
-		carefulBot: {
-			type: 'boolean',
-			nullable: true, optional: false,
-		},
-		autoAcceptFollowed: {
-			type: 'boolean',
-			nullable: true, optional: false,
-		},
-		noCrawle: {
-			type: 'boolean',
-			nullable: true, optional: false,
-		},
-		isExplorable: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		isDeleted: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hideOnlineStatus: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadSpecifiedNotes: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadMentions: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadAnnouncement: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadAntenna: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadChannel: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadMessagingMessage: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasUnreadNotification: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		hasPendingReceivedFollowRequest: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
-		integrations: {
-			type: 'object',
-			nullable: true, optional: false,
-		},
-		mutedWords: {
-			type: 'array',
-			nullable: false, optional: false,
-			items: {
-				type: 'array',
-				nullable: false, optional: false,
-				items: {
-					type: 'string',
-					nullable: false, optional: false,
-				},
-			},
-		},
-		mutedInstances: {
-			type: 'array',
-			nullable: true, optional: false,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-			},
-		},
-		mutingNotificationTypes: {
-			type: 'array',
-			nullable: true, optional: false,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-			},
-		},
-		emailNotificationTypes: {
-			type: 'array',
-			nullable: true, optional: false,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-			},
-		},
-		//#region secrets
-		email: {
-			type: 'string',
-			nullable: true, optional: true,
-		},
-		emailVerified: {
-			type: 'boolean',
-			nullable: true, optional: true,
-		},
-		securityKeysList: {
-			type: 'array',
-			nullable: false, optional: true,
-			items: {
-				type: 'object',
-				nullable: false, optional: false,
-			},
-		},
-		//#endregion
-	},
-} as const;
-
-export const packedUserDetailedNotMeSchema = {
-	type: 'object',
-	allOf: [
-		{
-			type: 'object',
-			ref: 'UserLite',
-		},
-		{
-			type: 'object',
-			ref: 'UserDetailedNotMeOnly',
-		},
-	],
-} as const;
-
-export const packedMeDetailedSchema = {
-	type: 'object',
-	allOf: [
-		{
-			type: 'object',
-			ref: 'UserLite',
-		},
-		{
-			type: 'object',
-			ref: 'UserDetailedNotMeOnly',
-		},
-		{
-			type: 'object',
-			ref: 'MeDetailedOnly',
-		},
-	],
-} as const;
-
-export const packedUserDetailedSchema = {
-	oneOf: [
-		{
-			type: 'object',
-			ref: 'UserDetailedNotMe',
-		},
-		{
-			type: 'object',
-			ref: 'MeDetailed',
-		},
-	],
-} as const;
-
-export const packedUserSchema = {
-	oneOf: [
-		{
-			type: 'object',
-			ref: 'UserLite',
-		},
-		{
-			type: 'object',
-			ref: 'UserDetailed',
-		},
-	],
-} as const;

packages/backend/src/prelude/await-all.ts

@@ -1,11 +1,13 @@
-export type Promiseable<T> = {
+type Await<T> = T extends Promise<infer U> ? U : T;
-	[K in keyof T]: Promise<T[K]> | T[K];
+
+type AwaitAll<T> = {
+	[P in keyof T]: Await<T[P]>;
 };
 
-export async function awaitAll<T>(obj: Promiseable<T>): Promise<T> {
+export async function awaitAll<T>(obj: T): Promise<AwaitAll<T>> {
-	const target = {} as T;
+	const target = {} as any;
-	const keys = Object.keys(obj) as unknown as (keyof T)[];
+	const keys = Object.keys(obj);
-	const values = Object.values(obj) as any[];
+	const values = Object.values(obj);
 
 	const resolvedValues = await Promise.all(values.map(value =>
 		(!value || !value.constructor || value.constructor.name !== 'Object')

packages/backend/src/queue/index.ts

@@ -213,16 +213,6 @@ export function createImportUserListsJob(user: ThinUser, fileId: DriveFile['id']
 	});
 }
 
-export function createImportCustomEmojisJob(user: ThinUser, fileId: DriveFile['id']) {
-	return dbQueue.add('importCustomEmojis', {
-		user: user,
-		fileId: fileId,
-	}, {
-		removeOnComplete: true,
-		removeOnFail: true,
-	});
-}
-
 export function createDeleteAccountJob(user: ThinUser, opts: { soft?: boolean; } = {}) {
 	return dbQueue.add('deleteAccount', {
 		user: user,