Merge branch 'develop'

.gitignore

@@ -13,9 +13,6 @@ report.*.json
 cypress/screenshots
 cypress/videos
 
-# Coverage
-coverage
-
 # config
 /.config/*
 !/.config/example.yml

CHANGELOG.md

@@ -9,18 +9,6 @@
 You should also include the user name that made the change.
 -->
 
-## 12.119.0 (2022/09/10)
-
-### Improvements
-- Client: Add following badge to user preview popup @nvisser
-- Client: mobile twitter url can be used as widget @caipira113
-- Client: Improve clock widget @syuilo
-
-### Bugfixes
-- マイグレーションに失敗する問題を修正
-- Server: 他人の通知を既読にできる可能性があるのを修正 @syuilo
-- Client: アクセストークン管理画面、アカウント管理画面表示できないのを修正 @futchitwo
-
 ## 12.118.1 (2022/08/08)
 
 ### Bugfixes

ROADMAP.md

@@ -14,9 +14,6 @@ This is the phase we are at now. We need to make a high-maintenance environment
   - Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
   - Add more tests
     - May need to implement a mechanism that allows for DI
-			- https://github.com/misskey-dev/misskey/pull/9085
-	- Measure coverage
-		- https://github.com/misskey-dev/misskey/pull/9081
 - Improve documentation
 
 ## (2) Improve functionality

locales/cs-CZ.yml

@@ -206,7 +206,6 @@ instanceFollowers: "Následovníci na instanci"
 instanceUsers: "Uživatelé této instance"
 changePassword: "Změnit heslo"
 security: "Zabezpečení"
-retypedNotMatch: "Zadané údaje se neshodují."
 currentPassword: "Současné heslo"
 newPassword: "Nové heslo"
 newPasswordRetype: "Nové heslo (znovu)"
@@ -269,7 +268,6 @@ addFile: "Přidat soubor"
 emptyFolder: "Tato složka je prázdná"
 unableToDelete: "Nelze smazat"
 inputNewFileName: "Zadejte nový název"
-inputNewFolderName: "Zadejte název nové složky"
 copyUrl: "Kopírovat URL"
 rename: "Přejmenovat"
 avatar: "Avatar"
@@ -312,11 +310,9 @@ pinnedUsers: "Připnutí uživatelé"
 pinnedNotes: "Připnutá poznámka"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Aktivovat hCaptchu"
-hcaptchaSiteKey: "Klíč stránky"
 hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Zapnout ReCAPTCHu"
-recaptchaSiteKey: "Klíč stránky"
 recaptchaSecretKey: "Tajný Klíč (Secret Key)"
 antennas: "Antény"
 manageAntennas: "Spravovat Antény"
@@ -325,10 +321,6 @@ antennaSource: "Zdroj Antény"
 enableServiceworker: "Povolit ServiceWorker"
 caseSensitive: "Rozlišuje malá a velká písmena"
 connectedTo: "Následující účty jsou připojeny"
-notesAndReplies: "Poznámky a odpovědi"
-withFiles: "Včetně souborů"
-popularUsers: "Populární uživatelé"
-recentlyUpdatedUsers: "Nedávno aktívni uživatelé"
 popularTags: "Populární tagy"
 userList: "Seznamy"
 about: "Informace"
@@ -373,14 +365,10 @@ next: "Další"
 retype: "Zadejte znovu"
 noteOf: "{user} poznámky"
 inviteToGroup: "Pozvat do skupiny"
-quoteAttached: "Citace"
-quoteQuestion: "Přiložit jako citaci?"
-noMessagesYet: "Zatím tu nejsou žádné zprávy"
 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"
-invitationCode: "Kód pozvánky"
 checking: "Ověřuji"
 available: "K dispozici"
 unavailable: "Není k dispozici"
@@ -394,7 +382,6 @@ passwordMatched: "Hesla se schodují"
 passwordNotMatched: "Hesla se neschodují"
 signinWith: "Přihlásit se s {x}"
 signinFailed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
-tapSecurityKey: "Ťukněte na bezpečnostní klíč"
 or: "Nebo"
 language: "Jazyk"
 uiLanguage: "Jazyk uživatelského rozhraní"
@@ -424,20 +411,9 @@ accountSettings: "Nastavení účtu"
 promotion: "Propagace"
 promote: "Propagovat"
 numberOfDays: "Počet dní"
-objectStorageBaseUrl: "Base URL"
-objectStorageBucket: "Bucket"
-objectStoragePrefix: "Předpona"
-objectStorageEndpoint: "Endpoint"
-objectStorageRegion: "Región"
-objectStorageUseSSL: "Použít SSL"
 deleteAll: "Smazat vše"
 showFixedPostForm: "Zobrazit formulář pro nové příspěvky nad časovou osou"
-listen: "Poslouchat"
-showInPage: "Zobrazit na stránce"
-popout: "Pop-out"
-volume: "Hlasitost"
 masterVolume: "Celková hlasitost"
-details: "Detaily"
 chooseEmoji: "Vybrat emotikon"
 unableToProcess: "Operace nebyla dokončena."
 recentUsed: "Naposledy použité"
@@ -458,20 +434,13 @@ deleteAllFiles: "Smazat všechny soubory"
 deleteAllFilesConfirm: "Jste si jistí že chcete smazat všechny soubory?"
 userSuspended: "Tomuto uživateli byl pozastaven účet."
 menu: "Menu"
-divider: "Dělící čára"
 addItem: "Přidat položku"
-relays: "Relay"
-addRelay: "Přidat Relay"
 inboxUrl: "Inbox URL"
 deletedNote: "Odstraněné příspěvky"
 invisibleNote: "Skryté příspěvky"
 description: "Popis"
 author: "Autor"
 manage: "Administrace"
-width: "Šířka"
-height: "Výška"
-large: "Velké"
-medium: "Střední"
 small: "Malé"
 generateAccessToken: "Vygenerovat přístupový token"
 permission: "Oprávnění"
@@ -489,16 +458,11 @@ smtpPort: "Port"
 smtpUser: "Uživatelské jméno"
 smtpPass: "Heslo"
 smtpSecureInfo: "Toto vypněte pokud používáte STARTTLS"
-testEmail: "Otestovat doručení emailů"
 makeActive: "Aktivovat"
 display: "Zobrazit"
 copy: "Kopírovat"
-metrics: "Metriky"
-overview: "Shrnutí"
 logs: "Logy"
-delayed: "Prodleva"
 database: "Databáze"
-channel: "Kanály"
 create: "Vytvořit"
 notificationSetting: "Nastavení oznámení"
 useGlobalSetting: "Použít globální nastavení"
@@ -506,415 +470,79 @@ other: "Ostatní"
 fileIdOrUrl: "ID nebo URL souboru"
 behavior: "Chování"
 sample: "Ukázka"
-send: "Odeslat"
-openInNewTab: "Otevřít v nové kartě"
-random: "Náhodně"
-system: "Systém"
-desktop: "Plocha"
-clip: "Oříznout"
-createNew: "Vytvořit nový"
-optional: "Volitelné"
-yes: "Ano"
-no: "Ne"
-notSet: "Není nastaveno"
-emailVerified: "Váš e-mail byl ověřen"
-contact: "Kontakt"
-useSystemFont: "Použít výchozí font systému"
-clips: "Oříznout"
-experimentalFeatures: "Experimentální funkce"
-developer: "Vývojář"
-duplicate: "Duplikovat"
-left: "Vlevo"
-center: "Uprostřed"
-wide: "Široké"
-narrow: "Úzké"
 clearCache: "Vyprázdnit mezipaměť"
-nUsers: "{n} užívatelů"
-nNotes: "{n} poznámek"
-myTheme: "Moje vzhledy"
-backgroundColor: "Pozadí"
-accentColor: "Akcent"
-textColor: "Barva textu"
-saveAs: "Uložit jako…"
-advanced: "Pokročilé"
-value: "Hodnota"
-createdAt: "Vytvořeno"
-updatedAt: "Upraveno"
-saveConfirm: "Uložit změny?"
-deleteConfirm: "Opravdu smazat?"
-invalidValue: "Neplatná hodnota."
-registry: "Registr"
 info: "Informace"
-unknown: "Neznámý"
-onlineStatus: "Online status"
-hideOnlineStatus: "Skrýt Váš online status"
-hideOnlineStatusDescription: "Skrytí vašeho online stavu může snížit funkcionalitu některých funkcí, například vyhledávání."
-online: "Online"
-active: "Aktivní"
-offline: "Offline"
-notRecommended: "Nedoporučuje se"
-botProtection: "Bot ochrana"
-instanceBlocking: "Blokované instance"
-selectAccount: "Vybrat účet"
-switchAccount: "Přepnout účet"
-enabled: "Zapnuto"
-disabled: "Vypnuto"
-quickAction: "Rychlé akce"
 user: "Uživatelé"
 administration: "Administrace"
-accounts: "Účty"
-switch: "Přepnout"
-configure: "Nastavit"
-gallery: "Galerie"
-recentPosts: "Poslední příspěvky"
-ads: "Reklamy"
-memo: "Memo"
-priority: "Priorita"
-high: "Vysoká"
-middle: "Střední"
-low: "Nízká"
-emailNotConfiguredWarning: "E-mailová adresa není nastavena."
-ratio: "Poměr"
-global: "Globální"
-sent: "Odeslat"
-hashtags: "Hashtagy"
-troubleshooting: "Poradce při potížích"
-whatIsNew: "Zobrazit změny"
-translate: "Přeložit"
-hide: "Skrýt"
-smartphone: "Telefon"
-tablet: "Tablet"
-auto: "Auto"
-size: "Velikost"
-numberOfColumn: "Počet sloupců"
 searchByGoogle: "Vyhledávání"
-indefinitely: "Navždy"
-tenMinutes: "10 minut"
-oneHour: "1 hodina"
-oneDay: "1 den"
-oneWeek: "1 týden"
-reflectMayTakeTime: "Může trvat nějakou dobu, než se projeví změny."
-cropImage: "Oříznout obrázek"
 file: "Soubor(ů)"
-recentNHours: "Posledních {n} hodin"
-recentNDays: "Posledních {n} dnů"
-recommended: "Doporučeno"
-deleteAccount: "Odstranit účet"
-document: "Dokumentace"
-logoutConfirm: "Opravdu se chcete odhlásit?"
-pleaseSelect: "Vybrat možnost"
-reverse: "Otočit"
-colored: "Barevné"
-type: "Typ"
-speed: "Rychlost"
-slow: "Pomalá"
-fast: "Rychlá"
-account: "Účty"
-_ad:
-  back: "Zpět"
-_gallery:
-  my: "Moje galerie"
 _email:
   _follow:
     title: "Máte nového následovníka"
-_plugin:
-  install: "Instalovat plugin"
-  manage: "Správce pluginů"
-_preferencesBackups:
-  list: "Vytvořit backup"
-  loadFile: "Načíst ze souboru"
-  save: "Uložit změny"
-_registry:
-  scope: "Rozsah"
-  key: "Klíč"
-  keys: "Klíče"
-  domain: "Doména"
-  createKey: "Vytvořit klíč"
-_aboutMisskey:
-  allContributors: "Všichni přispěvatelé"
-  source: "Zdrojový kód"
 _mfm:
   mention: "Zmínění"
-  hashtag: "Hashtag"
-  link: "Odkaz"
-  bold: "Tučně"
   quote: "Citovat"
   emoji: "Vlastní emoji"
   search: "Vyhledávání"
-  flip: "Otočit"
-  tada: "Animace (tadá)"
-  blur: "Rozmazání"
-  font: "Font"
-  rainbow: "Duha"
-_channel:
-  featured: "Trendy"
-_menuDisplay:
-  top: "Nahoru"
-  hide: "Skrýt"
 _theme:
-  install: "Nainstalovat vzhled"
-  manage: "Správa vzhledů"
-  code: "Kód vzhledu"
   description: "Popis"
-  installedThemes: "Nainstalované vzhledy"
-  constant: "Konstanta"
-  defaultValue: "Výchozí hodnota"
-  color: "Barva"
-  key: "Klíč"
-  func: "Funkce "
   keys:
-    shadow: "Stín"
-    header: "Nadpis"
-    link: "Odkaz"
-    hashtag: "Hashtag"
     mention: "Zmínění"
     renote: "Přeposlat"
-    divider: "Dělící čára"
 _sfx:
   note: "Poznámky"
   notification: "Oznámení"
   chat: "Zprávy"
-_ago:
-  future: "Budoucí"
-  justNow: "Teď"
-_time:
-  second: "Sekund"
-  minute: "Minut"
-  hour: "Hodin"
-_2fa:
-  registerDevice: "Přidat zařízení"
-  registerKey: "Přidat bezpečnostní klíč"
-_weekday:
-  sunday: "Neděle"
-  monday: "Pondělí"
-  tuesday: "Úterý"
-  wednesday: "Středa"
-  thursday: "Čtvrtek"
-  friday: "Pátek"
-  saturday: "Sobota"
 _widgets:
   notifications: "Oznámení"
   timeline: "Časová osa"
-  calendar: "Kalendář"
-  trends: "Trendy"
-  clock: "Hodiny"
-  rss: "RSS čtečka"
   activity: "Aktivita"
-  photos: "Fotky"
-  digitalClock: "Digitální hodiny"
   federation: "Federace"
-  slideshow: "Prezentace"
-  button: "Tlačítko"
-  onlineUsers: "Online uživatelé"
   jobQueue: "Fronta úloh"
-  aiscript: "AiScript conzole"
-  aichan: "Ai"
 _cw:
-  hide: "Skrýt"
   show: "Zobrazit více"
-_poll:
-  noMore: "Více už přidat nemůžete"
-  infinite: "Nikdy"
-  deadlineDate: "Datum ukončení"
-  deadlineTime: "Hodin"
-  duration: "Trvání"
 _visibility:
   home: "Domů"
   followers: "Sledující"
-_postForm:
-  _placeholders:
-    f: "Čekám, až něco napíšete..."
 _profile:
   name: "Jméno"
   username: "Uživatelské jméno"
-  description: "O mně"
-  youCanIncludeHashtags: "V popisku o Vás můžete použít i hastagy."
-  metadata: "Doplňující informace"
-  metadataContent: "Obsah"
 _exportOrImport:
-  allNotes: "Všechny poznámky"
   followingList: "Sledovaní"
   muteList: "Ztlumit"
   blockingList: "Zablokovat"
   userLists: "Seznamy"
 _charts:
   federation: "Federace"
-  apRequest: "Požadavek"
-  usersTotal: "Celkem uživatelů"
-  activeUsers: "Aktivní uživatelé"
-  notesTotal: "Celkový počet poznámek"
 _timelines:
   home: "Domů"
-  global: "Globální"
 _pages:
-  newPage: "Vytvořit novou stránku"
-  editPage: "Upravit stránku"
-  created: "Stránka byla úspěšně vytvořena"
-  updated: "Stránka byla úspěšně aktualizována"
-  deleted: "Stránka byla úspěšně smazána"
-  pageSetting: "Nastavení stránky"
-  invalidNameText: "Ujistěte se že jméno stránky je vyplněno"
-  contents: "Obsah"
-  fontSerif: "Serif"
-  fontSansSerif: "Sans Serif"
-  chooseBlock: "Přidat blok"
-  selectType: "Vyberte typ"
-  contentBlocks: "Obsah"
-  inputBlocks: "Vstup"
-  specialBlocks: "Speciální"
   blocks:
-    text: "Text"
-    textarea: "Textové pole"
-    section: "Sekce"
     image: "Obrázky"
-    button: "Tlačítko"
-    if: "Pokud"
-    _if:
-      variable: "Proměnná"
-    _post:
-      text: "Obsah"
-      canvasId: "Canvas ID"
-    _textInput:
-      name: "Jméno proměnné"
-      text: "Titulek"
-      default: "Výchozí hodnota"
-    _textareaInput:
-      name: "Jméno proměnné"
-      text: "Titulek"
-      default: "Výchozí hodnota"
-    _numberInput:
-      name: "Jméno proměnné"
-      text: "Titulek"
-      default: "Výchozí hodnota"
-    canvas: "Canvas"
-    _canvas:
-      id: "Canvas ID"
-      width: "Šířka"
-      height: "Výška"
-    _switch:
-      name: "Jméno proměnné"
-      text: "Titulek"
-      default: "Výchozí hodnota"
-    _counter:
-      name: "Jméno proměnné"
-      text: "Titulek"
-      inc: "Krok"
-    _button:
-      text: "Titulek"
-      colored: "Barevné"
-      _action:
-        _dialog:
-          content: "Obsah"
-    _radioButton:
-      name: "Jméno proměnné"
-      default: "Výchozí hodnota"
   script:
     categories:
       list: "Seznamy"
     blocks:
-      text: "Text"
-      _strLen:
-        arg1: "Text"
-      _strPick:
-        arg1: "Text"
-      _strReplace:
-        arg1: "Text"
-      _strReverse:
-        arg1: "Text"
       _join:
         arg1: "Seznamy"
-      _subtract:
-        arg1: "A"
-        arg2: "B"
-      _multiply:
-        arg1: "A"
-        arg2: "B"
-      _divide:
-        arg1: "A"
-        arg2: "B"
-      _mod:
-        arg1: "A"
-        arg2: "B"
-      round: "Zaokrouhlení zlomku"
-      _round:
-        arg1: "Číselná hodnota"
-      eq: "A a B jsou stejné"
-      _eq:
-        arg1: "A"
-        arg2: "B"
-      notEq: "A a B jsou odlišné"
-      _notEq:
-        arg1: "A"
-        arg2: "B"
-      _and:
-        arg1: "A"
-        arg2: "B"
-      _or:
-        arg1: "A"
-        arg2: "B"
-      _lt:
-        arg1: "A"
-        arg2: "B"
-      _gt:
-        arg1: "A"
-        arg2: "B"
-      _ltEq:
-        arg1: "A"
-        arg2: "B"
-      _gtEq:
-        arg1: "A"
-        arg2: "B"
-      if: "Větev"
-      _if:
-        arg1: "Pokud"
-        arg2: "Potom"
-        arg3: "Nebo"
-      random: "Náhodně"
-      _random:
-        arg1: "Pravděpodobnost"
-      rannum: "Náhodné číslo"
-      _rannum:
-        arg1: "Minimální hodnota"
-        arg2: "Maximální hodnota"
       _randomPick:
         arg1: "Seznamy"
-      _dailyRandom:
-        arg1: "Pravděpodobnost"
-      _dailyRannum:
-        arg1: "Minimální hodnota"
-        arg2: "Maximální hodnota"
       _dailyRandomPick:
         arg1: "Seznamy"
-      _seedRandom:
-        arg2: "Pravděpodobnost"
-      _seedRannum:
-        arg2: "Minimální hodnota"
-        arg3: "Maximální hodnota"
       _seedRandomPick:
         arg2: "Seznamy"
       _pick:
         arg1: "Seznamy"
       _listLen:
         arg1: "Seznamy"
-      number: "Číselná hodnota"
-      _stringToNumber:
-        arg1: "Text"
-      _numberToString:
-        arg1: "Číselná hodnota"
-      _splitStrByLine:
-        arg1: "Text"
     types:
-      string: "Text"
-      number: "Číselná hodnota"
       array: "Seznamy"
 _notification:
   youWereFollowed: "Máte nového následovníka"
   youWereInvitedToGroup: "Pozvat do skupiny"
   _types:
-    all: "Vše"
     follow: "Sledovaní"
     mention: "Zmínění"
-    reply: "Odpovědi"
     renote: "Přeposlat"
     quote: "Citovat"
     reaction: "Reakce"

locales/ja-JP.yml

@@ -107,7 +107,6 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
-reactWithRenote: "ついでにRenoteする"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
@@ -896,9 +895,6 @@ shuffle: "シャッフル"
 account: "アカウント"
 move: "移動"
 deckOld: "旧デッキ"
-pakuruConfirm: "パクりますか？"
-pakuru: "パクる"
-duplicateEmoji: "同じ名前の絵文字が存在します。インポートしますか？"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"

locales/ja-NY.yml

@@ -2,7 +2,7 @@
 _lang_: "日本語(にゃ)"
 
 headlineMisskey: "ノートでつにゃがるネットワークにゃ！"
-introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスにゃ。\n「ノート」を作成して、いま起こっていることを共有したり、あにゃたについて皆に発信しようにゃ📡\n「リアクション」機能で、皆のノートに素早く反応を追加することもできるにゃ👍\n新しい世界を探検しようにゃ！🚀"
+introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスにゃにゃ。\n「ノート」を作成して、いま起こっていることを共有したり、あにゃたについて皆に発信しようにゃ📡\n「リアクション」機能で、皆のノートに素早く反応を追加することもできるにゃ👍\n新しい世界を探検しようにゃ！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
@@ -45,7 +45,7 @@ copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
 delete: "削除"
 deleteAndEdit: "削除して編集"
-deleteAndEditConfirm: "このノートを削除してもう一度編集するかにゃ？このノートへのリアクション、Renote、返信も全て削除されるにゃ。"
+deleteAndEditConfirm: "このノートを削除してもう一度編集するにゃ？このノートへのリアクション、Renote、返信も全て削除されるにゃ。"
 addToList: "リストに追加"
 sendMessage: "メッセージを送信"
 copyUsername: "ユーザー名をコピー"
@@ -64,8 +64,8 @@ import: "インポート"
 export: "エクスポート"
 files: "ファイル"
 download: "ダウンロード"
-driveFileDeleteConfirm: "ファイル「{name}」を削除するかにゃ？このファイルを添付したノートも消えるにゃ。"
+driveFileDeleteConfirm: "ファイル「{name}」を削除するにゃ？このファイルを添付したノートも消えるにゃ。"
-unfollowConfirm: "{name}のフォローを解除するかにゃ？"
+unfollowConfirm: "{name}のフォローを解除するにゃ？"
 exportRequested: "エクスポートをリクエストしたにゃ。これには時間がかかる場合があるにゃ。エクスポートが終わると、「ドライブ」に追加されるにゃ。"
 importRequested: "インポートをリクエストしたにゃ。これには時間がかかる場合があるにゃ。"
 lists: "リスト"
@@ -120,10 +120,10 @@ block: "ブロック"
 unblock: "ブロック解除"
 suspend: "凍結"
 unsuspend: "解凍"
-blockConfirm: "ブロックするかにゃ？"
+blockConfirm: "ブロックするにゃ？"
-unblockConfirm: "ブロック解除するかにゃ？"
+unblockConfirm: "ブロック解除するにゃ？"
-suspendConfirm: "凍結するかにゃ？"
+suspendConfirm: "凍結するにゃ？"
-unsuspendConfirm: "解凍するかにゃ？"
+unsuspendConfirm: "解凍するにゃ？"
 selectList: "リストを選択"
 selectAntenna: "アンテニャを選択"
 selectWidget: "ウィジェットを選択"
@@ -152,9 +152,9 @@ setWallpaper: "壁紙を設定"
 removeWallpaper: "壁紙を削除"
 searchWith: "検索: {q}"
 youHaveNoLists: "リストがにゃいにゃ"
-followConfirm: "{name}をフォローするかにゃ？"
+followConfirm: "{name}をフォローするにゃ？"
 proxyAccount: "プロキシアカウント"
-proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントにゃ。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていにゃいとアクティビティがインスタンスに配達されにゃいため、代わりにプロキシアカウントがフォローするようにするにゃ。"
+proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントにゃ。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていにゃいとアクティビティがインスタンスに配達されにゃいため、代わりにプロキシアカウントがフォローするにゃようにするにゃ。"
 host: "ホスト"
 selectUser: "ユーザーを選択"
 recipient: "宛先"
@@ -184,10 +184,10 @@ disk: "ディスク"
 instanceInfo: "インスタンス情報"
 statistics: "統計"
 clearQueue: "キューをクリア"
-clearQueueConfirmTitle: "キューをクリアするかにゃ？"
+clearQueueConfirmTitle: "キューをクリアするにゃ？"
 clearQueueConfirmText: "未配達の投稿は配送されにゃくにゃるにゃ。通常この操作を行う必要はにゃいにゃ。"
 clearCachedFiles: "キャッシュをクリア"
-clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除するかにゃ？"
+clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除するにゃ？"
 blockedInstances: "ブロックしたインスタンス"
 blockedInstancesDescription: "ブロックしたいインスタンスのホストを改行で区切って設定するにゃ。ブロックされたインスタンスは、このインスタンスとやり取りできにゃくにゃるにゃ。"
 muteAndBlock: "ミュートとブロック"
@@ -195,7 +195,7 @@ mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
 noUsers: "ユーザーはいにゃいにゃ"
 editProfile: "プロフィールを編集"
-noteDeleteConfirm: "このノートを削除するかにゃ？"
+noteDeleteConfirm: "このノートを削除するにゃ？"
 pinLimitExceeded: "これ以上ピン留めできにゃいにゃ"
 intro: "Misskeyのインストールが完了したにゃ！管理者アカウントを作成するにゃ！"
 done: "完了"
@@ -231,9 +231,9 @@ announcements: "お知らせ"
 imageUrl: "画像URL"
 remove: "削除"
 removed: "削除したにゃ"
-removeAreYouSure: "「{x}」を削除するかにゃ？"
+removeAreYouSure: "「{x}」を削除するにゃ？"
-deleteAreYouSure: "「{x}」を削除するかにゃ？"
+deleteAreYouSure: "「{x}」を削除するにゃ？"
-resetAreYouSure: "リセットするかにゃ？"
+resetAreYouSure: "リセットするにゃ？"
 saved: "保存したにゃ"
 messaging: "チャット"
 upload: "アップロード"
@@ -288,7 +288,7 @@ unableToDelete: "削除できにゃいにゃ"
 inputNewFileName: "新しいファイル名を入力してくださいにゃ"
 inputNewDescription: "新しいキャプションを入力してくださいにゃ"
 inputNewFolderName: "新しいフォルダ名を入力してくださいにゃ"
-circularReferenceFolder: "移動先のフォルダーは、移動するフォルダーのサブフォルダーにゃ。"
+circularReferenceFolder: "移動先のフォルダーは、移動するにゃフォルダーのサブフォルダーにゃ。"
 hasChildFilesOrFolders: "このフォルダは空じゃにゃいから、削除できにゃいにゃ。"
 copyUrl: "URLをコピー"
 rename: "名前を変更"
@@ -299,7 +299,7 @@ whenServerDisconnected: "サーバーとの接続が失われたとき"
 disconnectedFromServer: "サーバーから切断されたにゃ"
 reload: "リロード"
 doNothing: "にゃにもしにゃい"
-reloadConfirm: "リロードするかにゃ？"
+reloadConfirm: "リロードするにゃ？"
 watch: "ウォッチ"
 unwatch: "ウォッチ解除"
 accept: "許可"
@@ -339,7 +339,7 @@ pinnedUsers: "ピン留めユーザー"
 pinnedUsersDescription: "「みつける」ページにゃどにピン留めしたいユーザーを改行で区切って記述するにゃ。"
 pinnedPages: "ピン留めページ"
 pinnedPagesDescription: "インスタンスのトップページにピン留めしたいページのパスを改行で区切って記述するにゃ。"
-pinnedClipId: "ピン留めするクリップのID"
+pinnedClipId: "ピン留めするにゃクリップのID"
 pinnedNotes: "ピン留めされたノート"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptchaを有効にするにゃ"
@@ -349,7 +349,7 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHAを有効にするにゃ"
 recaptchaSiteKey: "サイトキー"
 recaptchaSecretKey: "シークレットキー"
-avoidMultiCaptchaConfirm: "複数のCaptchaを使用すると干渉を起こす可能性があるにゃ。他のCaptchaを無効にするかにゃ？キャンセルして複数のCaptchaを有効化したままにすることも可能にゃ。"
+avoidMultiCaptchaConfirm: "複数のCaptchaを使用すると干渉を起こす可能性があるにゃ。他のCaptchaを無効にするにゃ？キャンセルして複数のCaptchaを有効化したままにすることも可能にゃ。"
 antennas: "アンテニャ"
 manageAntennas: "アンテニャの管理"
 name: "名前"
@@ -367,9 +367,9 @@ connectedTo: "次のアカウントに接続されているにゃ"
 notesAndReplies: "投稿と返信"
 withFiles: "ファイル付き"
 silence: "サイレンス"
-silenceConfirm: "サイレンスするかにゃ？"
+silenceConfirm: "サイレンスするにゃ？"
 unsilence: "サイレンス解除"
-unsilenceConfirm: "サイレンス解除するかにゃ？"
+unsilenceConfirm: "サイレンス解除するにゃ？"
 popularUsers: "人気のユーザー"
 recentlyUpdatedUsers: "最近投稿したユーザー"
 recentlyRegisteredUsers: "最近登録したユーザー"
@@ -425,7 +425,7 @@ noteOf: "{user}のノート"
 inviteToGroup: "グループに招待"
 maxNoteTextLength: "ノートの文字数制限"
 quoteAttached: "引用付き"
-quoteQuestion: "引用として添付するかにゃ？"
+quoteQuestion: "引用として添付するにゃ？"
 noMessagesYet: "まだチャットはにゃいにゃ"
 newMessageExists: "新しいメッセージがあります"
 onlyOneFileCanBeAttached: "メッセージに添付できるファイルはひとつにゃ"
@@ -531,7 +531,7 @@ script: "スクリプト"
 disablePagesScript: "Pagesのスクリプトを無効にするにゃ"
 updateRemoteUser: "リモートユーザー情報の更新"
 deleteAllFiles: "すべてのファイルを削除"
-deleteAllFilesConfirm: "すべてのファイルを削除するかにゃ？"
+deleteAllFilesConfirm: "すべてのファイルを削除するにゃ？"
 removeAllFollowing: "フォローを全解除"
 removeAllFollowingDescription: "{host}からのフォローをすべて解除するにゃ。そのインスタンスがもう存在しにゃくにゃった場合にゃどに実行してくださいにゃ。"
 userSuspended: "このユーザーは凍結されているにゃ。"
@@ -561,7 +561,7 @@ description: "説明"
 describeFile: "キャプションを付ける"
 enterFileDescription: "キャプションを入力"
 author: "作者"
-leaveConfirm: "未保存の変更があるにゃ。破棄するかにゃ？"
+leaveConfirm: "未保存の変更があるにゃ。破棄するにゃ？"
 manage: "管理"
 plugins: "プラグイン"
 deck: "デッキ"
@@ -691,7 +691,7 @@ left: "左"
 center: "中央"
 wide: "広い"
 narrow: "狭い"
-reloadToApplySetting: "設定はページリロード後に反映されるにゃ。今すぐリロードするかにゃ？"
+reloadToApplySetting: "設定はページリロード後に反映されるにゃ。今すぐリロードするにゃ？"
 needReloadToApply: "反映には再起動が必要にゃ。"
 showTitlebar: "タイトルバーを表示するにゃ"
 clearCache: "キャッシュをクリア"
@@ -709,8 +709,8 @@ advanced: "高度"
 value: "値"
 createdAt: "作成日時"
 updatedAt: "更新日時"
-saveConfirm: "保存するかにゃ？"
+saveConfirm: "保存するにゃ？"
-deleteConfirm: "削除するかにゃ？"
+deleteConfirm: "削除するにゃ？"
 invalidValue: "有効にゃ値ではにゃいにゃ。"
 registry: "レジストリ"
 closeAccount: "アカウントを閉鎖するにゃ"
@@ -734,7 +734,7 @@ showingPastTimeline: "過去のタイムラインを表示しているにゃ"
 clear: "クリア"
 markAllAsRead: "全て既読にするにゃ"
 goBack: "戻る"
-unlikeConfirm: "いいね解除するかにゃ？"
+unlikeConfirm: "いいね解除するにゃ？"
 fullView: "フルビュー"
 quitFullView: "フルビュー解除"
 addDescription: "説明を追加"
@@ -795,7 +795,7 @@ whatIsNew: "更新情報を見る"
 translate: "翻訳"
 translatedFrom: "{x}から翻訳"
 accountDeletionInProgress: "アカウントの削除が進行中にゃ"
-usernameInfo: "サーバー上であにゃたのアカウントを一意に識別するための名前にゃ。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できるにゃ。ユーザー名は後から変更することは出来ません。"
+usernameInfo: "サーバー上であにゃたのアカウントを一意に識別するにゃための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できるにゃ。ユーザー名は後から変更することは出来ません。"
 aiChanMode: "藍モード"
 keepCw: "CWを維持するにゃ"
 pubSub: "Pub/Subのアカウント"
@@ -820,7 +820,7 @@ ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開
 continueThread: "さらにスレッドを見る"
 deleteAccountConfirm: "アカウントが削除されます。よろしいにゃか？"
 incorrectPassword: "パスワードが間違っているにゃ。"
-voteConfirm: "「{choice}」に投票するかにゃ？"
+voteConfirm: "「{choice}」に投票するにゃ？"
 hide: "隠す"
 leaveGroup: "グループから抜ける"
 leaveGroupConfirm: "「{name}」から抜けるにゃ？"
@@ -834,12 +834,8 @@ emojiSizeFixed: "文字サイズを固定する"
 emojiStretch: "自動で伸縮しない"
 emojiGenerate: "生成"
 emojiColor: "カラーコード"
-colorPicker: "カラーピッカー"
 emojiApproval: "絵文字を登録"
 deckOld: "旧デッキ"
-pakuruConfirm: "パクりますか？"
-pakuru: "パクる"
-duplicateEmoji: "同じ名前の絵文字が存在します。インポートしますか？"
 
 
 _emailUnavailable:
@@ -862,7 +858,7 @@ _signup:
 _accountDelete:
   accountDelete: "アカウントの削除"
   mayTakeTime: "アカウントの削除は負荷のかかる処理であるため、作成したコンテンツの数やアップロードしたファイルの数が多いと完了までに時間がかかることがあるにゃ。"
-  sendEmail: "アカウントの削除が完了する際は、登録してあったメールアドレス宛に通知を送信するにゃ。"
+  sendEmail: "アカウントの削除が完了するにゃ際は、登録してあったメールアドレス宛に通知を送信するにゃ。"
   requestAccountDelete: "アカウント削除をリクエスト"
   started: "削除処理が開始されたにゃ。"
   inProgress: "削除が進行中"
@@ -950,7 +946,7 @@ _mfm:
   flip: "反転"
   flipDescription: "内容を上下または左右に反転させます。"
   jelly: "アニメーション(びよんびよん)"
-  jellyDescription: "びよんびよんするアニメーションを与えます。"
+  jellyDescription: "びよんびよんするにゃアニメーションを与えます。"
   tada: "アニメーション(じゃーん)"
   tadaDescription: "ジャーン！という感じのアニメーションを与えます。"
   jump: "アニメーション(ジャンプ)"
@@ -962,7 +958,7 @@ _mfm:
   twitch: "アニメーション(ブレ)"
   twitchDescription: "激しくブレるアニメーションを与えます。"
   spin: "アニメーション(回転)"
-  spinDescription: "回転するアニメーションを与えます。"
+  spinDescription: "回転するにゃアニメーションを与えます。"
   x2: "大きく"
   x2Description: "内容を大きく表示するにゃ。"
   x3: "とても大きく"
@@ -989,8 +985,8 @@ _reversi:
   rules: "ルール"
   botSettings: "Botのオプション"
   thisGameIsStartedSoon: "対局は数秒後に開始されます"
-  waitingForOther: "相手の準備が完了するのを待っているにゃ"
+  waitingForOther: "相手の準備が完了するにゃのを待っているにゃ"
-  waitingForMe: "あにゃたの準備が完了するのを待っているにゃ"
+  waitingForMe: "あにゃたの準備が完了するにゃのを待っているにゃ"
   waitingBoth: "準備してくださいにゃ"
   ready: "準備完了"
   cancelReady: "準備を再開"
@@ -1042,10 +1038,10 @@ _menuDisplay:
   hide: "隠す"
 
 _wordMute:
-  muteWords: "ミュートするワード"
+  muteWords: "ミュートするにゃワード"
   muteWordsDescription: "スペースで区切るとAND指定ににゃり、改行で区切るとOR指定ににゃるにゃ。"
   muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現ににゃるにゃ。"
-  softDescription: "指定した条件のノートをタイムラインから隠すにゃ。"
+  softDescription: "指定した条件のノートをタイムラインから隠するにゃ。"
   hardDescription: "指定した条件のノートをタイムラインに追加しにゃいようにするにゃ。追加されにゃかったノートは、条件を変更しても除外されたままににゃるにゃ。"
   soft: "ソフト"
   hard: "ハード"
@@ -1055,7 +1051,7 @@ _instanceMute:
   instanceMuteDescription: "ミュートしたインスタンスのユーザーへの返信を含めて、設定したインスタンスの全てのノートとRenoteをミュートするにゃ。"
   instanceMuteDescription2: "改行で区切って設定します"
   title: "設定したインスタンスのノートを隠するにゃ。"
-  heading: "ミュートするインスタンス"
+  heading: "ミュートするにゃインスタンス"
 
 _theme:
   explore: "テーマを探す"
@@ -1080,7 +1076,7 @@ _theme:
   func: "関数"
   funcKind: "関数の種類"
   argument: "引数"
-  basedProp: "元にするプロパティの名前"
+  basedProp: "元にするにゃプロパティの名前"
   alpha: "不透明度"
   darken: "暗さ"
   lighten: "明るさ"
@@ -1165,30 +1161,30 @@ _time:
 _tutorial:
   title: "Misskeyの使い方"
   step1_1: "ようこそ。"
-  step1_2: "この画面は「タイムライン」と呼ばれ、あにゃたや、あにゃたが「フォロー」する人の「ノート」が時系列で表示されますにゃ。"
+  step1_2: "この画面は「タイムライン」と呼ばれ、あにゃたや、あにゃたが「フォロー」するにゃ人の「ノート」が時系列で表示されます。"
   step1_3: "あにゃたはまだ何もノートを投稿しておらず、誰もフォローしていにゃいので、タイムラインには何も表示されていにゃいはずにゃ。"
-  step2_1: "ノートを作成したり誰かをフォローしたりする前に、まずあにゃたのプロフィールを完成させるにゃ！"
+  step2_1: "ノートを作成したり誰かをフォローしたりするにゃ前に、まずあにゃたのプロフィールを完成させましょう。"
   step2_2: "あにゃたがどんにゃ人かわかると、多くの人にノートを見てもらえたり、フォローしてもらいやすくにゃるにゃ。"
-  step3_1: "プロフィール設定はうまくできましたかにゃ？"
+  step3_1: "プロフィール設定はうまくできましたか？"
-  step3_2: "では試しに、何かノートを投稿してみてください。画面上にある鉛筆マークのボタンを押すとフォームが開くにゃ。"
+  step3_2: "では試しに、何かノートを投稿してみてください。画面上にある鉛筆マークのボタンを押すとフォームが開きます。"
   step3_3: "内容を書いたら、フォーム右上のボタンを押すと投稿できるにゃ。"
-  step3_4: "内容が思いつかにゃい？「Misskey始めました」というのはいかがかにゃ？"
+  step3_4: "内容が思いつかにゃい？「Misskey始めました」というのはいかがでしょう。"
-  step4_1: "投稿できたかにゃ？"
+  step4_1: "投稿できましたか？"
   step4_2: "あにゃたのノートがタイムラインに表示されていれば成功にゃ。"
   step5_1: "次は、他の人をフォローしてタイムラインを賑やかにしたいところにゃ。"
   step5_2: "{featured}で人気のノートが見れるので、その中から気ににゃった人を選んでフォローしたり、{explore}で人気のユーザーを探すこともできるにゃ。"
-  step5_3: "ユーザーをフォローするには、ユーザーのアイコンをクリックしてユーザーページを表示し、「フォロー」ボタンを押すにゃ。"
+  step5_3: "ユーザーをフォローするにゃには、ユーザーのアイコンをクリックしてユーザーページを表示し、「フォロー」ボタンを押するにゃ。"
   step5_4: "ユーザーによっては、フォローが承認されるまで時間がかかる場合があるにゃ。"
   step6_1: "タイムラインに他のユーザーのノートが表示されていれば成功にゃ。"
-  step6_2: "他の人のノートには、「リアクション」を付けることができ、簡単にあにゃたの反応を伝えられるにゃ！"
+  step6_2: "他の人のノートには、「リアクション」を付けることができ、簡単にあにゃたの反応を伝えられます。"
   step6_3: "リアクションを付けるには、ノートの「+」マークをクリックして、好きにゃリアクションを選択するにゃ。"
-  step7_1: "これで、Misskeyの基本的にゃ使い方の説明は終わったにゃ。お疲れ様でしたにゃ。"
+  step7_1: "これで、Misskeyの基本的にゃ使い方の説明は終わりました。お疲れ様でした。"
-  step7_2: "もっとMisskeyについて知りたいときは、{help}を見てみてくださいにゃ。"
+  step7_2: "もっとMisskeyについて知りたいときは、{help}を見てみてください。"
-  step7_3: "では、Misskeyをお楽しみくださいにゃ🚀"
+  step7_3: "では、Misskeyをお楽しみください🚀"
   step8_1: "さいごに"
-  step8_2: "このインスタンスではガラス風デザインを標準で採用しているにゃ。"
+  step8_2: "このインスタンスではガラス風デザインを標準で採用しています。"
-  step8_3: "端末によってはパフォーマンスが低下する場合があるにゃ。"
+  step8_3: "端末によってはパフォーマンスが低下する場合があります。"
-  step8_4: "その場合は設定よりブラーを使用しないように設定＋テーマをNoGlassにしてくださいにゃ。"
+  step8_4: "その場合は設定よりブラーを使用しないように設定＋テーマをNoGlassにしてください。"
 
 _2fa:
   alreadyRegistered: "既に設定は完了しているにゃ。"
@@ -1198,7 +1194,7 @@ _2fa:
   step2: "次に、表示されているQRコードをアプリでスキャンするにゃ。"
   step3: "アプリに表示されているトークンを入力して完了にゃ。"
   step4: "これからログインするときも、同じようにトークンを入力するにゃ。"
-  securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーもしくは端末の指紋認証やPINを使用してログインするように設定できるにゃ。"
+  securityKeyInfo: "FIDO2をサポートするにゃハードウェアセキュリティキーもしくは端末の指紋認証やPINを使用してログインするにゃように設定できるにゃ。"
 
 _permissions:
   "read:account": "アカウントの情報を見る"
@@ -1235,8 +1231,8 @@ _permissions:
   "write:gallery-likes": "ギャラリーのいいねを操作するにゃ"
 
 _auth:
-  shareAccess: "「{name}」がアカウントにアクセスすることを許可するかにゃ？"
+  shareAccess: "「{name}」がアカウントにアクセスすることを許可するにゃ？"
-  shareAccessAsk: "アカウントへのアクセスを許可するかにゃ？"
+  shareAccessAsk: "アカウントへのアクセスを許可するにゃ？"
   permissionAsk: "このアプリは次の権限を要求しているにゃ"
   pleaseGoBack: "アプリケーションに戻ってやっていってください"
   callback: "アプリケーションに戻っているにゃ"
@@ -1397,7 +1393,7 @@ _rooms:
   remove: "しまう"
   clear: "片付け"
   clearConfirm: "全ての家具をしまいるにゃか？"
-  leaveConfirm: "未保存の変更があります、移動するかにゃ？"
+  leaveConfirm: "未保存の変更があります、移動するにゃ？"
   chooseImage: "画像を選択"
   roomType: "部屋のタイプ"
   carpetColor: "床の色"
@@ -1562,8 +1558,8 @@ _pages:
         pushEvent: "イベントを送信させる"
         _pushEvent:
           event: "イベント名"
-          message: "押したときに表示するメッセージ"
+          message: "押したときに表示するにゃメッセージ"
-          variable: "送信する変数"
+          variable: "送信するにゃ変数"
           no-variable: "にゃし"
         callAiScript: "AiScript呼び出し"
         _callAiScript:

locales/ko-KR.yml

@@ -562,7 +562,6 @@ author: "작성자"
 leaveConfirm: "저장하지 않은 변경사항이 있습니다. 취소하시겠습니까?"
 manage: "관리"
 plugins: "플러그인"
-preferencesBackups: "환경설정 백업"
 deck: "덱"
 undeck: "덱 해제"
 useBlurEffectForModal: "모달에 흐림 효과 사용"
@@ -613,7 +612,7 @@ create: "생성"
 notificationSetting: "알림 설정"
 notificationSettingDesc: "표시할 알림의 종류를 선택해 주세요."
 useGlobalSetting: "글로벌 설정을 사용하기"
-useGlobalSettingDesc: "활성화하면 계정의 알림 설정이 적용됩니다. 비활성화하면 개별적으로 설정할 수 있게 됩니다."
+useGlobalSettingDesc: "활성화하면 계정의 알림 설정이 적용되니다. 비활성화하면 개별적으로 설정할 수 있게 됩니다."
 other: "기타"
 regenerateLoginToken: "로그인 토큰을 재생성"
 regenerateLoginTokenDescription: "로그인할 때 사용되는 내부 토큰을 재생성합니다. 일반적으로 이 작업을 실행할 필요는 없습니다. 이 기능을 사용하면 이 계정으로 로그인한 모든 기기에서 로그아웃됩니다."
@@ -942,24 +941,6 @@ _plugin:
   install: "플러그인 설치"
   installWarn: "신뢰할 수 없는 플러그인은 설치하지 않는 것이 좋습니다."
   manage: "플러그인 관리"
-_preferencesBackups:
-  list: "생성한 백업"
-  saveNew: "새 백업 만들기"
-  loadFile: "파일 가져오기"
-  apply: "이 기기에 적용"
-  save: "현재 설정으로 덮어쓰기"
-  inputName: "백업 이름을 입력하세요"
-  cannotSave: "저장하지 못했습니다"
-  nameAlreadyExists: "\"{name}\" 백업이 이미 존재합니다. 다른 이름을 설정하여 주십시오."
-  applyConfirm: "\"{name}\" 백업을 현재 기기에 적용하시겠습니까? 현재 설정은 덮어 씌워집니다."
-  saveConfirm: "{name} 을 덮어쓰시겠습니까?"
-  deleteConfirm: "{name} 을(를) 삭제하시겠습니까?"
-  renameConfirm: "\"{old}\" 백업을 \"{new}\"(으)로 바꾸시겠습니까?"
-  noBackups: "저장된 백업이 없습니다. \"새 백업 만들기\"를 눌러 현재 클라이언트 설정을 서버에 백업할 수 있습니다."
-  createdAt: "생성 날짜: {date} {time}"
-  updatedAt: "갱신 날짜: {date} {time}"
-  cannotLoad: "가져오기에 실패했습니다"
-  invalidFile: "파일 형식이 올바르지 않습니다."
 _registry:
   scope: "범위"
   key: "키"
@@ -1277,7 +1258,6 @@ _widgets:
   activity: "활동"
   photos: "사진"
   digitalClock: "디지털 시계"
-  unixClock: "UNIX 시계"
   federation: "연합"
   instanceCloud: "인스턴스 구름"
   postForm: "글 입력란"

locales/pl-PL.yml

@@ -1,5 +1,5 @@
 ---
-_lang_: "Polski"
+_lang_: "język polski"
 headlineMisskey: "Sieć połączona wpisami"
 introMisskey: "Misskey jest serwisem mikroblogowym typu open source.\nMisskey to opensource'owy serwis mikroblogowy, w którym możesz tworzyć \"notatki\", aby dzielić się tym, co się dzieje i opowiadać wszystkim o sobie.\nMożesz również użyć funkcji \"Reakcje\", aby szybko dodać własne reakcje do notatek innych użytkowników👍.\nOdkrywaj nowy świat🚀!"
 monthAndDay: "{month}-{day}"
@@ -88,7 +88,7 @@ enterListName: "Nazwa listy"
 privacy: "Prywatność"
 makeFollowManuallyApprove: "Prośby o możliwość obserwacji wymagają zatwierdzenia"
 defaultNoteVisibility: "Domyślna widoczność"
-follow: "Obserwuj"
+follow: "Obserwowani"
 followRequest: "Poproś o możliwość obserwacji"
 followRequests: "Prośby o możliwość obserwacji"
 unfollow: "Przestań obserwować"
@@ -127,7 +127,7 @@ unsuspendConfirm: "Czy na pewno chcesz cofnąć zawieszenie tego konta?"
 selectList: "Wybierz listę"
 selectAntenna: "Wybierz Antennę"
 selectWidget: "Wybierz widżet"
-editWidgets: "Edytuj widżety"
+editWidgets: "Edytuj widżet"
 editWidgetsExit: "Gotowe"
 customEmojis: "Niestandardowe emoji"
 emoji: "Emoji"
@@ -142,7 +142,6 @@ flagAsBot: "To konto jest botem"
 flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Misskey, traktując konto jako bota."
 flagAsCat: "To konto jest kotem"
 flagAsCatDescription: "Przełącz tę opcję, aby konto było oznaczone jako kot."
-flagShowTimelineReplies: "Pokazuj odpowiedzi na osi czasu"
 autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
 addAccount: "Dodaj konto"
 loginFailed: "Nie udało się zalogować"
@@ -202,7 +201,6 @@ done: "Gotowe"
 processing: "Przetwarzanie"
 preview: "Podgląd"
 default: "Domyślne"
-defaultValueIs: "Domyślne: {value}"
 noCustomEmojis: "Brak emoji"
 noJobs: "Brak zadań"
 federating: "Federowanie"
@@ -237,7 +235,6 @@ resetAreYouSure: "Czy na pewno chcesz zresetować?"
 saved: "Zapisano"
 messaging: "Wiadomości"
 upload: "Wyślij"
-keepOriginalUploading: "Zachowaj oryginalny obraz"
 fromDrive: "Z dysku"
 fromUrl: "Z adresu URL"
 uploadFromUrl: "Wyślij z adresu URL"
@@ -380,7 +377,6 @@ administrator: "Admin"
 token: "Token"
 twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe"
 moderator: "Moderator"
-moderation: "Moderacja"
 nUsersMentioned: "{n} wspomnianych użytkowników"
 securityKey: "Klucz bezpieczeństwa"
 securityKeyName: "Nazwa klucza"
@@ -448,13 +444,11 @@ uiLanguage: "Język wyświetlania UI"
 groupInvited: "Zaproszony(-a) do grupy"
 aboutX: "O {x}"
 useOsNativeEmojis: "Używaj natywnych Emoji systemu"
-disableDrawer: "Nie używaj menu w stylu szuflady"
 youHaveNoGroups: "Nie masz żadnych grup"
 joinOrCreateGroup: "Uzyskaj zaproszenie do dołączenia do grupy lub utwórz własną grupę."
 noHistory: "Brak historii"
 signinHistory: "Historia logowania"
 disableAnimatedMfm: "Wyłącz MFM z animacją"
-doing: "Przetwarzanie..."
 category: "Kategoria"
 tags: "Tagi"
 docSource: "Źródło tego dokumentu"
@@ -529,9 +523,6 @@ deleteAllFilesConfirm: "Czy na pewno chcesz usunąć wszystkie pliki?"
 removeAllFollowingDescription: "Przestań obserwować wszystkie konta z {host}. Wykonaj to, jeżeli instancja już nie istnieje."
 userSuspended: "To konto zostało zawieszone."
 userSilenced: "Ten użytkownik został wyciszony."
-yourAccountSuspendedTitle: "To konto jest zawieszone"
-yourAccountSuspendedDescription: "To konto zostało zawieszone z powodu złamania regulaminu serwera lub innych podobnych. Skontaktuj się z administratorem, jeśli chciałbyś poznać bardziej szczegółowy powód. Proszę nie zakładać nowego konta."
-menu: "Menu"
 divider: "Rozdzielacz"
 addItem: "Dodaj element"
 relays: "Przekaźniki"
@@ -550,7 +541,7 @@ disablePlayer: "Zamknij odtwarzacz wideo"
 expandTweet: "Rozwiń tweet"
 themeEditor: "Edytor motywu"
 description: "Opis"
-describeFile: "Dodaj podpis"
+describeFile: "dodaj podpis"
 enterFileDescription: "Wprowadź napis"
 author: "Autor"
 leaveConfirm: "Są niezapisane zmiany. Czy chcesz je odrzucić?"
@@ -587,7 +578,6 @@ emptyToDisableSmtpAuth: "Pozostaw adres e-mail i hasło puste, aby wyłączyć w
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
-instanceMute: "Wyciszone instancje"
 userSaysSomething: "{name} powiedział(-a) coś"
 makeActive: "Aktywuj"
 display: "Wyświetlanie"
@@ -617,7 +607,6 @@ fillAbuseReportDescription: "Wypełnij szczegóły zgłoszenia. Jeżeli dotyczy
 abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
 reporteeOrigin: "Pochodzenie zgłoszonego"
 reporterOrigin: "Pochodzenie zgłaszającego"
-forwardReport: "Przekaż zgłoszenie do innej instancji"
 send: "Wyślij"
 abuseMarkAsResolved: "Oznacz zgłoszenie jako rozwiązane"
 openInNewTab: "Otwórz w nowej karcie"
@@ -630,12 +619,8 @@ random: "Losowe"
 system: "System"
 switchUi: "Przełącz interfejs użytkownika"
 desktop: "Pulpit"
-clip: "Klip"
 createNew: "Utwórz nowy"
 optional: "Nieobowiązkowe"
-createNewClip: "Utwórz nowy klip"
-unclip: "Odczep"
-confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
 i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
@@ -669,7 +654,6 @@ pageLikesCount: "Liczba otrzymanych polubień stron"
 pageLikedCount: "Liczba polubionych stron"
 contact: "Kontakt"
 useSystemFont: "Używaj domyślnej czcionki systemu"
-clips: "Klipy"
 experimentalFeatures: "Eksperymentalne funkcje"
 developer: "Programista"
 makeExplorable: "Pokazuj konto na stronie „Eksploruj”"
@@ -741,7 +725,6 @@ notRecommended: "Nie zalecane"
 botProtection: "Zabezpieczenie przed botami"
 instanceBlocking: "Zablokowane instancje"
 selectAccount: "Wybierz konto"
-switchAccount: "Przełącz konto"
 enabled: "Właczono"
 disabled: "Wyłączono"
 quickAction: "Szybkie działania"
@@ -773,103 +756,22 @@ global: "Globalna"
 squareAvatars: "Wyświetlaj kwadratowe awatary"
 sent: "Wyślij"
 received: "Otrzymane"
-searchResult: "Wyniki wyszukiwania"
 hashtags: "Hashtag"
-troubleshooting: "Rozwiązywanie problemów"
-useBlurEffect: "Użyj efektów rozmycia w UI"
-learnMore: "Dowiedz się więcej"
-misskeyUpdated: "Misskey zostało zaktualizowane!"
-whatIsNew: "Pokaż zmiany"
-translate: "Przetłumacz"
-translatedFrom: "Przetłumaczone z {x}"
-accountDeletionInProgress: "Trwa usuwanie konta"
-usernameInfo: "Nazwa, która identyfikuje Twoje konto spośród innych na tym serwerze.  Możesz użyć alfabetu (a~z, A~Z), cyfr (0~9) lub podkreślników (_). Nazwy użytkownika nie mogą być później zmieniane."
-aiChanMode: "Tryb Ai"
-keepCw: "Zostaw ostrzeżenia o zawartości"
 pubSub: "Konta Pub/Sub"
-resolved: "Rozwiązane"
-unresolved: "Nierozwiązane"
-breakFollow: "Usuń obserwującego"
-itsOn: "Włączone"
-itsOff: "Wyłączone"
-unread: "Nieodczytane"
-filter: "Filtr"
-controlPanel: "Panel sterowania"
-manageAccounts: "Zarządzaj kontami"
-makeReactionsPublic: "Ustawić historię reakcji jako publiczną"
-makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotychczasowych reakcji będzie publicznie widoczna."
-classic: "Klasyczny"
-muteThread: "Wycisz wątek"
-unmuteThread: "Wyłącz wyciszenie wątku"
-ffVisibility: "Widoczność obserwowanych/obserwujących"
-ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz i kto Cię obserwuje."
-continueThread: "Pokaż kontynuację wątku"
-deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
-incorrectPassword: "Nieprawidłowe hasło."
-voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
-leaveGroup: "Opuść grupę"
-leaveGroupConfirm: "Czy na pewno chcesz opuścić \"{name}\"?"
-useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
-welcomeBackWithName: "Witaj z powrotem, {name}"
-clickToFinishEmailVerification: "Kliknij [{ok}], aby zakończyć weryfikację e-mail."
-overridedDeviceKind: "Typ urządzenia"
-smartphone: "Smartfon"
-tablet: "Tablet"
-auto: "Automatycznie"
-size: "Rozmiar"
-numberOfColumn: "Liczba kolumn"
 searchByGoogle: "Szukaj"
 indefinitely: "Nigdy"
 file: "Pliki"
-logoutConfirm: "Czy na pewno chcesz się wylogować?"
-lastActiveDate: "Ostatnio użyte w"
-statusbar: "Pasek stanu"
-pleaseSelect: "Wybierz opcję"
 reverse: "Odwróć"
 colored: "Kolorowe"
 label: "Etykieta"
-type: "Typ"
-speed: "Prędkość"
-localOnly: "Lokalne tylko"
-failedToUpload: "Przesyłanie nie powiodło się"
-cannotUploadBecauseInappropriate: "Nie można przesłać tego pliku, ponieważ jego części zostały wykryte jako potencjalnie nieodpowiednie."
-cannotUploadBecauseNoFreeSpace: "Przesyłanie nie powiodło się z powodu braku miejsca na dysku."
-beta: "Beta"
-enableAutoSensitive: "Automatyczne oznaczanie NSFW"
-enableAutoSensitiveDescription: "Umożliwia automatyczne wykrywanie i oznaczanie zawartości NSFW za pomocą uczenia maszynowego. Nawet jeśli ta opcja jest wyłączona, może być włączona w całej instancji."
-navbar: "Pasek nawigacyjny"
 account: "Konta"
-move: "Przenieś"
-_sensitiveMediaDetection:
-  description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera."
-  setSensitiveFlagAutomatically: "Oznacz jako NSFW"
-_emailUnavailable:
-  used: "Ten adres e-mail jest już używany"
-  format: "Format tego adresu e-mail jest nieprawidłowy"
-  disposable: "Nie można używać jednorazowych adresów e-mail"
-  mx: "Ten serwer e-mail jest nieprawidłowy"
-  smtp: "Ten serwer e-mail nie odpowiada"
 _ffVisibility:
-  public: "Publiczne"
+  public: "Publikuj"
-  followers: "Widoczne tylko dla obserwujących"
-  private: "Prywatne"
-_signup:
-  almostThere: "Prawie na miejscu"
-  emailAddressInfo: "Podaj swój adres e-mail. Nie zostanie on upubliczniony."
-  emailSent: "E-mail z potwierdzeniem został wysłany na Twój adres e-mail ({email}). Kliknij dołączony link, aby dokończyć tworzenie konta."
-_accountDelete:
-  accountDelete: "Usuń konto"
-  mayTakeTime: "Ponieważ usuwanie konta jest procesem wymagającym dużej ilości zasobów, jego ukończenie może zająć trochę czasu, w zależności od ilości utworzonej zawartości i liczby przesłanych plików."
-  sendEmail: "Po zakończeniu usuwania konta na adres e-mail zarejestrowany na tym koncie zostanie wysłana wiadomość e-mail."
-  requestAccountDelete: "Poproś o usunięcie konta"
-  started: "Usuwanie się rozpoczęło."
-  inProgress: "Usuwanie jest obecnie w toku"
 _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
 _forgotPassword:
-  enterEmail: "Wpisz adres e-mail użyty do rejestracji. Zostanie do niego wysłany link, za pomocą którego możesz zresetować hasło."
   ifNoEmail: "Jeżeli nie podano adresu e-mail podczas rejestracji, skontaktuj się z administratorem zamiast tego."
   contactAdmin: "Jeżeli Twoja instancja nie obsługuje adresów e-mail, skontaktuj się zamiast tego z administratorem, aby zresetować hasło."
 _gallery:
@@ -886,23 +788,6 @@ _plugin:
   install: "Zainstaluj wtyczki"
   installWarn: "Nie instaluj niezaufanych wtyczek."
   manage: "Zarządzanie wtyczkami"
-_preferencesBackups:
-  list: "Utworzone kopie zapasowe"
-  saveNew: "Zapisz nową kopię zapasową"
-  loadFile: "Załaduj z pliku"
-  apply: "Zastosuj do tego urządzenia"
-  save: "Zapisz zmiany"
-  inputName: "Proszę podać nazwę dla tej kopii zapasowej"
-  cannotSave: "Zapisanie nie powiodło się"
-  nameAlreadyExists: "Kopia zapasowa o nazwie \"{name}\" już istnieje. Proszę podać inną nazwę."
-  applyConfirm: "Czy na pewno chcesz zastosować kopię zapasową \"{name}\" na tym urządzeniu? Istniejące ustawienia tego urządzenia zostaną nadpisane."
-  saveConfirm: "Zapisać kopię zapasową jako {name}?"
-  deleteConfirm: "Usunąć kopię zapasową {name}?"
-  renameConfirm: "Zmienić nazwę kopii zapasowej z \"{old}\" na \"{new}\"?"
-  createdAt: "Utworzony w: {date} {time}"
-  updatedAt: "Zaktualizowano w: {date} {time}"
-  cannotLoad: "Ładowanie nie powiodło się"
-  invalidFile: "Nieprawidłowy format pliku"
 _registry:
   scope: "Zakres"
   key: "Klucz"
@@ -937,13 +822,10 @@ _mfm:
   bold: "Pogrubienie"
   boldDescription: "Wyróżnia litery pogrubiając je."
   small: "Małe"
-  smallDescription: "Wyświetla treść jako małą i cienką."
   center: "Wyśrodkowanie"
   centerDescription: "Wyśrodkowuje zawartość."
-  inlineCode: "Kod (w wierszu)"
   blockCode: "Kod (blok)"
   blockCodeDescription: "Wyświetla kod z podświetlaną składnią składający się z wielu linii."
-  blockMath: "Matematyka (Blok)"
   quote: "Cytuj"
   quoteDescription: "Wyświetla treść jako cytat."
   emoji: "Niestandardowe emoji"
@@ -952,20 +834,6 @@ _mfm:
   searchDescription: "Wyświetla pole wyszukiwania z wcześniej wpisanym tekstem."
   flip: "Odwróć"
   flipDescription: "Przerzuca treść poziomo lub pionowo."
-  jelly: "Animacja (Galaretka)"
-  jellyDescription: "Nadaje treści galaretowatą animację."
-  tada: "Animation (Tada)"
-  tadaDescription: "Nadaje treści animację podobną do \"Tada!\"."
-  jump: "Animacja (Skok)"
-  jumpDescription: "Nadaje treści animację skakania."
-  bounce: "Animacja (Odbijanie)"
-  bounceDescription: "Nadaje treści animację odbijania się."
-  shake: "Animacja (Wstrząsanie)"
-  shakeDescription: "Nadaje treści animację wstrząsania."
-  twitch: "Animacja (Drganie)"
-  twitchDescription: "Nadaje treści mocno drgającą animację."
-  spin: "Animacja (Obrót)"
-  spinDescription: "Nadaje treści animację obracania."
   x2: "Duże"
   x2Description: "Czyni treść większą."
   x3: "Bardzo duże"
@@ -973,17 +841,9 @@ _mfm:
   x4: "Ogromne"
   x4Description: "Czyni treść jeszcze większą niż jeszcze większa."
   blur: "Rozmycie"
-  blurDescription: "Rozmywa treść. Zostanie wyraźnie wyświetlona po najechaniu."
   font: "Czcionka"
   fontDescription: "Wybiera czcionkę do wyświetlania treści."
-  rainbow: "Tęcza"
-  rainbowDescription: "Sprawia, że zawartość pojawia się w kolorach tęczy."
-  sparkle: "Blask"
-  sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obróć"
-  rotateDescription: "Obraca zawartość o określony kąt."
-  plain: "Zwyczajny"
-  plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
@@ -1003,7 +863,6 @@ _channel:
   usersCount: "{n} uczestnicy"
   notesCount: "{n} wpisy"
 _menuDisplay:
-  top: "Góra"
   hide: "Ukryj"
 _wordMute:
   muteWords: "Słowo do wyciszenia"
@@ -1011,9 +870,6 @@ _wordMute:
   soft: "Łagodny"
   hard: "Twardy"
   mutedNotes: "Wyciszone wpisy"
-_instanceMute:
-  title: "Ukrywa wpisy z wymienionych instancji."
-  heading: "Lista instancji do wyciszenia"
 _theme:
   explore: "Przeglądaj motywy"
   install: "Zainstaluj motyw"
@@ -1094,7 +950,6 @@ _sfx:
   notification: "Powiadomienia"
   chat: "Wiadomości"
   chatBg: "Rozmowy (tło)"
-  antenna: "Anteny"
   channel: "Powiadomienia kanału"
 _ago:
   future: "W przyszłości"
@@ -1114,30 +969,12 @@ _time:
 _tutorial:
   title: "Jak korzystać z Misskey"
   step1_1: "Witaj!"
-  step1_2: "Ta strona nazywa się „oś czasu”. Pokazuje chronologicznie uporządkowane wpisy osób, które „śledzisz”."
   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ć."
-  step2_2: "Podanie pewnych informacji o tym, kim jesteś, ułatwi innym określenie, czy chcą widzieć Twoje wpisy lub Cię obserwować."
   step3_1: "Zakończyłeś(-aś) konfigurację profilu?"
-  step3_2: "Następnie spróbujmy opublikować wpis. Możesz to zrobić, naciskając przycisk z ikoną ołówka na ekranie."
   step3_3: "Wypełnij pole i kliknij przycisk w prawym górnym rogu by wysłać post."
-  step3_4: "Nie masz nic do powiedzenia? Spróbuj \"ustawiam swój misskey\"!"
-  step4_1: "Zakończyłeś publikowanie pierwszego wpisu?"
-  step4_2: "Hurra! Teraz Twój pierwszy wpis powinien być wyświetlany na Twojej osi czasu."
-  step5_1: "Teraz spróbujmy ożywić Twoją oś czasu, przez zaobserwowanie innych ludzi."
-  step5_2: "{featured} pokaże Ci popularne wpisy na tej instancji. {explore} pozwoli Ci znaleźć popularnych użytkowników. Spróbuj znaleźć tam osoby, które chcesz obserwować!"
-  step5_3: "Aby obserwować innych użytkowników, kliknij ich ikonę i naciśnij przycisk \"Obserwuj\" na ich profilu."
-  step5_4: "Jeśli inny użytkownik ma ikonę kłódki obok swojej nazwy, może minąć trochę czasu, zanim ten użytkownik ręcznie zatwierdzi Twoją prośbę o obserwowanie."
-  step6_1: "Powinieneś teraz widzieć wpisy innych użytkowników na swojej osi czasu."
-  step6_2: "Możesz także umieścić „reakcje” na wpisach innych osób, aby szybko na nie odpowiedzieć."
-  step6_3: "Aby dodać \"reakcję\", naciśnij znak \"+\" na wpisie innego użytkownika i wybierz emotikonę, którą chcesz zareagować."
-  step7_1: "Gratulacje! Ukończyłeś podstawowy samouczek Misskey."
-  step7_2: "Jeśli chcesz dowiedzieć się więcej o Misskey, wypróbuj sekcję {help}."
-  step7_3: "A teraz powodzenia i baw się dobrze z Misskey! 🚀"
 _2fa:
-  alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
   registerDevice: "Zarejestruj nowe urządzenie"
-  registerKey: "Zarejestruj klucz bezpieczeństwa"
   step1: "Najpierw, zainstaluj aplikację uwierzytelniającą (taką jak {a} lub {b}) na swoim urządzeniu."
   step2: "Następnie, zeskanuje kod QR z ekranu."
   step3: "Wprowadź token podany w aplikacji, aby ukończyć konfigurację."
@@ -1153,7 +990,6 @@ _permissions:
   "write:favorites": "Edycja Twojej listy ulubionych."
   "read:following": "Wyświetlanie informacji o obserwowanych"
   "write:following": "Obserwowanie lub cofanie obserwacji innych kont"
-  "read:messaging": "Zobacz swoje czaty"
   "read:mutes": "Wyświetlanie listy osób, które wyciszyłeś(-aś)"
   "write:mutes": "Edycja listy osób, które wyciszyłeś(-aś)"
   "read:notifications": "Wyświetlanie powiadomień"
@@ -1167,10 +1003,6 @@ _permissions:
   "write:page-likes": "Edycja polubień na stronach"
   "read:user-groups": "Wyświetlanie grup użytkownika"
   "write:user-groups": "Edycja lub usuwanie grup użytkownika"
-  "read:channels": "Zobacz swoje kanały"
-  "write:channels": "Edytuj swoje kanały"
-  "read:gallery": "Zobacz swoją galerię"
-  "write:gallery": "Edytuj swoją galerię"
 _auth:
   shareAccess: "Czy chcesz autoryzować „{name}” do dostępu do tego konta?"
   permissionAsk: "Ta aplikacja wymaga następujących uprawnień:"
@@ -1189,21 +1021,12 @@ _widgets:
   calendar: "Kalendarz"
   trends: "Na czasie"
   clock: "Zegar"
-  rss: "Czytnik RSS"
   activity: "Aktywność"
   photos: "Zdjęcia"
-  digitalClock: "Zegar cyfrowy"
-  unixClock: "Zegar UNIX"
   federation: "Federacja"
-  instanceCloud: "Chmura instancji"
+  postForm: "Utwórz wpis"
-  postForm: "Formularz tworzenia wpisu"
-  slideshow: "Pokaz slajdów"
   button: "Przycisk"
-  onlineUsers: "Użytkownicy online"
   jobQueue: "Kolejka zadań"
-  serverMetric: "Metryka serwera"
-  aiscript: "Konsola AiScript"
-  aichan: "Ai"
 _cw:
   hide: "Ukryj"
   show: "Załaduj więcej"
@@ -1570,11 +1393,9 @@ _notification:
   youReceivedFollowRequest: "Otrzymałeś(-aś) prośbę o możliwość obserwacji"
   yourFollowRequestAccepted: "Twoja prośba o możliwość obserwacji została przyjęta"
   youWereInvitedToGroup: "Zaproszony(-a) do grupy"
-  pollEnded: "Wyniki ankiety stały się dostępne"
-  emptyPushNotificationMessage: "Powiadomienia push zostały zaktualizowane"
   _types:
     all: "Wszystkie"
-    follow: "Nowi obserwujący"
+    follow: "Obserwowani"
     mention: "Wspomnij"
     reply: "Odpowiedzi"
     renote: "Udostępnij"
@@ -1586,14 +1407,12 @@ _notification:
     groupInvited: "Zaproszono do grup"
     app: "Powiadomienia z aplikacji"
   _actions:
-    followBack: "zaobserwował cię z powrotem"
     reply: "Odpowiedz"
     renote: "Udostępnij"
 _deck:
   alwaysShowMainColumn: "Zawsze pokazuj główną kolumnę"
   columnAlign: "Wyrównaj kolumny"
   addColumn: "Dodaj kolumnę"
-  configureColumn: "Ustawienia kolumny"
   swapLeft: "Przesuń w lewo"
   swapRight: "Przesuń w prawo"
   swapUp: "Zamień z powyższym"
@@ -1601,9 +1420,6 @@ _deck:
   stackLeft: "Przypnij do lewej"
   popRight: "Odepnij w prawo"
   profile: "Profil"
-  newProfile: "Nowy profil"
-  deleteProfile: "Usuń profil"
-  widgetsIntroduction: "Wybierz \"Edytuj widżety\" w menu kolumny i dodaj widżet."
   _columns:
     main: "Główna"
     widgets: "Widżety"

locales/ru-RU.yml

@@ -562,7 +562,6 @@ author: "Автор"
 leaveConfirm: "Вы не сохранили изменения. Хотите выйти и потерять их?"
 manage: "Управление"
 plugins: "Расширения"
-preferencesBackups: "Резервная копия"
 deck: "Пульт"
 undeck: "Покинуть пульт"
 useBlurEffectForModal: "Размывка под формой поверх всего"

locales/th-TH.yml

@@ -562,7 +562,6 @@ author: "ผู้เขียน"
 leaveConfirm: "คุณมีการเปลี่ยนแปลงที่ไม่ได้บันทึกนะ นายต้องการทิ้งการเปลี่ยนแปลงเหล่านั้นหรอ?"
 manage: "การจัดการ"
 plugins: "ปลั๊กอิน"
-preferencesBackups: "ตั้งค่าการสำรองข้อมูล"
 deck: "เด็ค"
 undeck: "ออกจากเด็ค"
 useBlurEffectForModal: "ใช้เอฟเฟกต์เบลอสำหรับโมดอล"
@@ -599,7 +598,7 @@ wordMute: "ปิดเสียงคำ"
 regexpError: "ข้อผิดพลาดของนิพจน์ทั่วไป"
 regexpErrorDescription: "เกิดข้อผิดพลาดในนิพจน์ทั่วไปในบรรทัดที่ {line} ของการปิดเสียงคำ {tab} ของคุณ:"
 instanceMute: "ปิดเสียง อินสแตนซ์"
-userSaysSomething: "{name} พูดอะไรบางอย่าง"
+userSaysSomething: "{ชื่อ} พูดอะไรบางอย่าง"
 makeActive: "เปิดใช้งาน"
 display: "แสดงผล"
 copy: "คัดลอก"
@@ -914,89 +913,13 @@ _ffVisibility:
 _signup:
   almostThere: "เกือบจะมี"
   emailAddressInfo: "โปรดกรอกอีเมลของคุณ มันจะไม่เปิดเผยต่อสาธารณะ"
-  emailSent: "เราได้ส่งอีเมลยืนยันไปยังที่อยู่อีเมลของคุณแล้วนะ ({email}) โปรดคลิกลิงก์ที่รวมไว้เพื่อสร้างบัญชีให้เสร็จสิ้น"
-_accountDelete:
-  accountDelete: "ลบบัญชีผู้ใช้"
-  mayTakeTime: "เนื่องจากการลบบัญชีนี้จะเป็นกระบวนการที่ต้องใช้ทรัพยากรมาก จึงอาจจะต้องใช้เวลาสักครู่ถึงจะเสร็จสมบูรณ์ ทั้งนี้ขึ้นอยู่กับจำนวนเนื้อหาที่คุณสร้างและจำนวนไฟล์ที่คุณอัปโหลดนะ"
-  sendEmail: "เมื่อการลบบัญชีนี้เสร็จสิ้น เราอาจจะส่งอีเมลไปยังที่อยู่อีเมลของคุณที่เคยลงทะเบียนไว้กับบัญชีนี้นะ"
-  requestAccountDelete: "ร้องขอให้ลบบัญชี"
-  started: "การลบได้เริ่มต้นขึ้น"
-  inProgress: "ปัจจุบันกำลังดำเนินการลบอยู่"
 _ad:
   back: "ย้อนกลับ"
-  reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
-_forgotPassword:
-  enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
-  ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
-  contactAdmin: "อินสแตนซ์นี้ไม่รองรับการใช้งานที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์เพื่อรีเซ็ตรหัสผ่านของคุณแทน"
-_gallery:
-  my: "แกลลอรี่ของฉัน"
-  liked: "โพสต์ที่ถูกใจ"
-  like: "ชื่นชอบ"
-  unlike: "ลบไลค์"
 _email:
   _follow:
     title: "ได้ติดตามคุณ"
-  _receiveFollowRequest:
-    title: "คุณได้รับคำขอติดตาม"
-_plugin:
-  install: "ติดตั้งปลั๊กอิน"
-  installWarn: "กรุณาอย่าติดตั้งปลั๊กอินที่ไม่น่าเชื่อถือนะคะ"
-  manage: "จัดการปลั๊กอิน"
-_preferencesBackups:
-  list: "สร้างการสำรองข้อมูล"
-  saveNew: "บันทึกใหม่"
-  loadFile: "โหลดจากไฟล์"
-  apply: "นำไปใช้กับอุปกรณ์นี้"
-  save: "บันทึก"
-  inputName: "กรุณาป้อนชื่อสำหรับข้อมูลสำรองนี้"
-  cannotSave: "การบันทึกล้มเหลว"
-  nameAlreadyExists: "มีข้อมูลสำรองชื่อ \"{name}\" นี้อยู่แล้ว กรุณาป้อนชื่ออื่นนะ"
-  applyConfirm: "คุณต้องการใช้ข้อมูลสำรอง \"{name}\" กับอุปกรณ์นี้อย่างงั้นจริงหรอ การตั้งค่าที่มีอยู่ของอุปกรณ์นี้จะถูกเขียนทับนะ"
-  saveConfirm: "บันทึกข้อมูลสำรองเป็น {name} มั้ย?"
-  deleteConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
-  renameConfirm: "เปลี่ยนชื่อข้อมูลสำรองนี้จาก \"{old}\" เป็น \"{new}\" หรือป่าว"
-  noBackups: "ไม่มีข้อมูลสำรองนะ คุณสามารถสำรองข้อมูลการตั้งค่าไคลเอนต์ของคุณบนเซิร์ฟเวอร์นี้โดยใช้ \"สร้างการสำรองข้อมูลใหม่\"ได้นะ"
-  createdAt: "สร้างเมื่อ: {date} {time}"
-  updatedAt: "อัปเดตเมื่อ: {date} {time}"
-  cannotLoad: "การโหลดล้มเหลว"
-  invalidFile: "รูปแบบไฟล์ไม่ถูกต้องนะ"
-_registry:
-  scope: "สโคป"
-  key: "คีย์"
-  keys: "คีย์"
-  domain: "โดเมน"
-  createKey: "สร้างคีย์"
-_aboutMisskey:
-  about: "Misskey เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย Syuilo ตั้งแต่ปี 2014"
-  contributors: "ผู้สนับสนุนหลัก"
-  allContributors: "ผู้มีส่วนร่วมทั้งหมด"
-  source: "ซอร์สโค้ด"
-  translation: "รับแปลภาษา Misskey"
-  donate: "บริจาคให้กับ Misskey"
-  morePatrons: "เราขอขอบคุณสำหรับความช่วยเหลือจากผู้ช่วยอื่นๆ ที่ไม่ได้ระบุไว้ที่นี่นะ ขอขอบคุณ! 🥰"
-  patrons: "สมาชิกพันธมิตร"
-_nsfw:
-  respect: "ซ่อนสื่อ NSFW"
-  ignore: "อย่าซ่อนสื่อ NSFW"
-  force: "ซ่อนสื่อทั้งหมด"
 _mfm:
-  cheatSheet: "โค้ด MFM Cheat Sheet"
-  intro: "MFM เป็นภาษามาร์กอัปพิเศษเฉพาะของ Misskey ที่สามารถใช้ได้ในหลายที่ คุณยังสามารถดูรายการไวยากรณ์ MFM ที่มีอยู่ทั้งหมดได้ที่นี่นะ"
-  dummy: "Misskey ขยายโลกของ Fediverse"
   mention: "กล่าวถึง"
-  mentionDescription: "คุณสามารถระบุผู้ใช้โดยใช้ At-Symbol และชื่อผู้ใช้ได้นะ"
-  hashtag: "แฮชแท็ก"
-  hashtagDescription: "คุณสามารถระบุชื่อแฮชแท็กได้โดยใช้เครื่องหมายตัวเลขและข้อความได้นะ"
-  url: "URL"
-  urlDescription: "สามารถแสดง URL ได้นะ"
-  link: "ลิงก์"
-  linkDescription: "เจาะจงเฉพาะ ส่วนของข้อความที่สามารถแสดงเป็น URL ได้"
-  bold: "ตัวหนา"
-  boldDescription: "ไฮไลท์ตัวอักษรโดยทำให้หนาขึ้น"
-  small: "ขนาดเล็ก"
-  smallDescription: "แสดงผลเนื้อหาขนาดเล็กและบาง"
-  center: "เซ็นเตอร์"
   centerDescription: "แสดงผลเนื้อหาเป็นศูนย์กลาง"
   inlineCode: "โค้ด (อินไลน์)"
   inlineCodeDescription: "แสดงผลการเน้นไวยากรณ์แบบอินไลน์สำหรับโค้ด (โปรแกรม)"
@@ -1013,117 +936,9 @@ _mfm:
   search: "ค้นหา"
   searchDescription: "แสดงผลกล่องค้นหาพร้อมกับข้อความที่ป้อนไว้ล่วงหน้า"
   flip: "พลิก"
-  flipDescription: "พลิกเนื้อหาในแนวนอนหรือแนวตั้ง"
-  jelly: "แอนิเมชั่น (เยลลี่)"
-  jellyDescription: "ให้เนื้อหาเป็นแอนิเมชั่นเหมือนเยลลี่"
-  tada: "แอนิเมชั่น (ธาดา)"
-  tadaDescription: "ให้เนื้อหาเป็นแอนิเมชั่นเหมือน \"ทาด้า!\""
-  jump: "อนิเมชั่น (กระโดด)"
-  jumpDescription: "ให้เนื้อหามีภาพเคลื่อนไหวแบบกระโดด"
-  bounce: "อนิเมชั่น (เด้ง)"
-  bounceDescription: "ให้เนื้อหามีอนิเมชั่นเด้ง"
-  shake: "อนิเมชั่น (เขย่า)"
-  shakeDescription: "ให้เนื้อหามีภาพเคลื่อนไหวสั่น"
-  twitch: "แอนิเมชั่น (Twitch)"
-  twitchDescription: "ให้เนื้อหามีแอนิเมชั่นกระตุกอย่างแรง"
-  spin: "แอนิเมชั่น (สปิน)"
-  spinDescription: "ให้เนื้อหาเป็นภาพเคลื่อนไหวแบบหมุน"
-  x2: "ขนาดใหญ่"
-  x2Description: "แสดงเนื้อหาที่ใหญ่ขึ้น"
-  x3: "ใหญ่มาก"
-  x3Description: "แสดงเนื้อหาอีเว้นท์ที่ใหญ่ขึ้น"
-  x4: "ใหญ่อย่างไม่น่าเชื่อ"
-  x4Description: "แสดงผลเนื้อหาที่ใหญ่กว่าใหญ่กว่าขนาดใหญ่"
-  blur: "เบลอ"
-  blurDescription: "เบลอเนื้อหา จะแสดงผลอย่างชัดเจนต่อเมื่อวางเมาส์เหนือ"
-  font: "ตัวอักษร"
-  fontDescription: "ตั้งค่าตัวอักษรเพื่อแสดงเนื้อหาใน"
-  rainbow: "สายรุ้ง"
-  rainbowDescription: "ทำให้เนื้อหานั้นปรากฏเป็นสีรุ้ง"
-  sparkle: "กลิตเตอร์"
-  sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
-  rotate: "หมุนหน้าจอ"
-  rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
-  plain: "เรียบง่าย"
-  plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
-_instanceTicker:
-  none: "ไม่ต้องแสดง"
-  remote: "แสดงสำหรับผู้ใช้ระยะไกล"
-  always: "แสดงเสมอ"
-_serverDisconnectedBehavior:
-  reload: "โหลดใหม่โดยอัตโนมัติ"
-  dialog: "แสดงกล่องโต้ตอบคำเตือน"
-  quiet: "แสดงคำเตือนที่ไม่เป็นการรบกวน"
-_channel:
-  create: "สร้างแชนแนลใหม่"
-  edit: "แก้ไขแชนแนล"
-  setBanner: "เซตแบนเนอร์"
-  removeBanner: "ลบแบนเนอร์"
-  featured: "เทรนด์"
-  owned: "เจ้าของ"
-  following: "ติดตามแล้ว"
-  usersCount: "{n} ผู้เข้าร่วม"
-  notesCount: "{n} โน้ต"
-_menuDisplay:
-  sideFull: "ด้านข้าง"
-  sideIcon: "ด้านข้าง (ไอคอน)"
-  top: "ท็อป"
-  hide: "ซ่อน"
-_wordMute:
-  muteWords: "ปิดเสียงคำ"
-  muteWordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
-  muteWordsDescription2: "ล้อมรอบคีย์เวิร์ดด้วยเครื่องหมายทับเพื่อใช้นิพจน์ทั่วไป"
-  softDescription: "ซ่อนโน้ตให้ตรงตามเงื่อนไขที่ตั้งไว้จากไทม์ไลน์"
-  hardDescription: "ป้องกันไม่ให้โน้ตย่อที่ตรงตามเงื่อนไขที่ตั้งไว้ไม่ให้ถูกเพิ่มลงในไทม์ไลน์ นอกจากนี้ โน้ตเหล่านี้จะไม่ถูกเพิ่มลงในไทม์ไลน์แม้ว่าจะมีการเปลี่ยนแปลงเงื่อนไขยังไงก็ตาม"
-  soft: "ซอฟ"
-  hard: "ยาก"
-  mutedNotes: "ปิดเสียงโน้ต"
-_instanceMute:
-  instanceMuteDescription: "การดำเนินการนี้จะปิดเสียง\"โน้ต/รีโน้ต\"จากอินสแตนซ์ที่อยู่ในรายการ รวมถึงบันทึกของผู้ใช้ที่ตอบกลับผู้ใช้จากอินสแตนซ์ที่ปิดเสียง"
-  instanceMuteDescription2: "คั่นด้วยการขึ้นบรรทัดใหม่"
-  title: "ซ่อนโน้ตจากอินสแตนซ์ที่มีอยู่ในรายการ"
-  heading: "รายชื่ออินสแตนซ์ที่ถูกปิดเสียง"
 _theme:
-  explore: "สำรวจธีม"
-  install: "ติดตั้งธีม"
-  manage: "จัดการธีม"
-  code: "โค้ดธีม"
   description: "รายละเอียด"
-  installed: "{name} ได้รับการติดตั้ง"
-  installedThemes: "ธีมที่ติดตั้ง"
-  builtinThemes: "ธีมในตัว"
-  alreadyInstalled: "ธีมนี้ได้รับการติดตั้งแล้ว"
-  invalid: "รูปแบบของธีมนี้ไม่ถูกต้องนะ"
-  make: "ทำธีม"
-  base: "ฐาน"
-  addConstant: "เพิ่มค่าคงที่"
-  constant: "ตัวแปร"
-  defaultValue: "ค่าเริ่มต้น"
-  color: "สี"
-  refProp: "อ้างอิงคุณสมบัติ"
-  refConst: "อ้างอิงค่าคงที่"
-  key: "คีย์"
-  func: "ฟังก์ชัน"
-  funcKind: "ประเภทฟังก์ชัน"
-  argument: "อากิวเม้นต์"
-  basedProp: "ทรัพย์สินอ้างอิง"
-  alpha: "ความทึบแสง"
-  darken: "มืดลง"
-  lighten: "สว่าง"
-  inputConstantName: "ป้อนชื่อสำหรับค่าคงที่นี้"
-  importInfo: "ถ้าหากต้องการป้อนโค้ดที่นี่ คุณยังสามารถนำเข้าไปยังโปรแกรมแก้ไขธีมได้"
-  deleteConstantConfirm: "คุณต้องการลบค่าคงที่ {const} หรือป่าว?"
   keys:
-    accent: "เน้น"
-    bg: "ภาพพื้นหลัง"
-    fg: "ข้อความ"
-    focus: "โฟกัส"
-    indicator: "ตัวบ่งชี้"
-    panel: "แผงควบคุม"
-    shadow: "เงา"
-    header: "ส่วนหัว"
-    navBg: "พื้นหลังแถบด้านข้าง"
-    navFg: "ข้อความแถบด้านข้าง"
     mention: "กล่าวถึง"
     renote: "รีโน้ต"
     divider: "ตัวแบ่ง"

locales/zh-CN.yml

@@ -141,7 +141,7 @@ cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远
 flagAsBot: "这是一个机器人账号"
 flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
-flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
+flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
 flagShowTimelineRepliesDescription: "启用时，时间线除了显示用户的帖子外，还会显示其他用户对帖子的回复。"
 autoAcceptFollowed: "自动允许关注者的关注"
@@ -252,7 +252,7 @@ messageRead: "已读"
 noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
 nUsersRead: "{n}人已读"
-agreeTo: "勾选则表示已阅读并同意{0}"
+agreeTo: "{0}勾选则表示已阅读并同意"
 tos: "服务条款"
 start: "开始"
 home: "首页"
@@ -668,7 +668,7 @@ yes: "是"
 no: "否"
 driveFilesCount: "网盘的文件数"
 driveUsage: "网盘的空间用量"
-noCrawle: "要求搜索引擎不索引该用户"
+noCrawle: "要求搜索引擎不索引该站点"
 noCrawleDescription: "要求搜索引擎不要收录（索引）您的用户页面，帖子，页面等。"
 lockedAccountInfo: "即使通过了关注请求，只要您不将帖子可见范围设置成“关注者”，任何人都可以看到您的帖子。"
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
@@ -747,7 +747,7 @@ userInfo: "用户信息"
 unknown: "未知"
 onlineStatus: "在线状态"
 hideOnlineStatus: "隐藏在线状态"
-hideOnlineStatusDescription: "隐藏在线状态后，可能会降低搜索等功能的便利性。"
+hideOnlineStatusDescription: "隐藏在线状态后，可能会降低例如搜索等功能的便利性。"
 online: "在线"
 active: "活动"
 offline: "离线"

locales/zh-TW.yml

@@ -883,8 +883,8 @@ sensitiveMediaDetection: "敏感性媒體的檢測"
 localOnly: "僅限本地"
 remoteOnly: "僅限遠端"
 failedToUpload: "上傳失敗"
-cannotUploadBecauseInappropriate: "由於判定可能包含不適當的內容，因此無法上傳。"
+cannotUploadBecauseInappropriate: "由於判定可能包含不適當的內容，因此無法上船。"
-cannotUploadBecauseNoFreeSpace: "由於雲端硬碟沒有可用空間，因此無法上傳。"
+cannotUploadBecauseNoFreeSpace: "由於雲端硬碟沒有可用空間，因此無法上船>"
 beta: "Beta"
 enableAutoSensitive: "自動NSFW判定"
 enableAutoSensitiveDescription: "如果可用，請利用機器學習在媒體上自動設置 NSFW 旗標。 即使關閉此功能，依實例而定也可能會自動設置。"
@@ -917,7 +917,7 @@ _signup:
   emailSent: "已將確認郵件發送至您輸入的電子郵件地址 ({email})。請開啟電子郵件中的連結以完成帳戶創建。"
 _accountDelete:
   accountDelete: "刪除帳戶"
-  mayTakeTime: "刪除帳戶的處理負荷較大，如果帳戶產生的內容數量上傳的檔案數量較多的話，就需要花费一段時間才能完成。"
+  mayTakeTime: "刪除帳戶的處理負荷較大，如果帳戶產生的內容數量上船的檔案數量較多的話，就需要花费一段時間才能完成。"
   sendEmail: "帳戶删除完成後，將向註冊地電子郵件地址發送通知。"
   requestAccountDelete: "刪除帳戶請求"
   started: "已開始刪除作業。"

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "12.119.0-simkey-v10111",
+	"version": "12.118.1-simkey-v3",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/sim1222/misskey.git"
+		"url": "https://github.com/misskey-dev/misskey.git"
 	},
 	"private": true,
 	"scripts": {
@@ -41,10 +41,10 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "5.36.2",
+		"@typescript-eslint/parser": "5.31.0",
 		"cross-env": "7.0.3",
-		"cypress": "10.7.0",
+		"cypress": "10.3.1",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.8.3"
+		"typescript": "4.7.4"
 	}
 }

packages/backend/package.json

@@ -14,27 +14,27 @@
 		"lodash": "^4.17.21"
 	},
 	"optionalDependencies": {
-		"@tensorflow/tfjs-node": "3.20.0"
+		"@tensorflow/tfjs-node": "3.19.0"
 	},
 	"dependencies": {
-		"@bull-board/koa": "4.2.2",
+		"@bull-board/koa": "4.1.1",
 		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.11.0",
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
-		"@peertube/http-signature": "1.7.0",
+		"@peertube/http-signature": "1.6.0",
 		"@sinonjs/fake-timers": "9.1.2",
 		"@syuilo/aiscript": "0.11.1",
 		"ajv": "8.11.0",
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1213.0",
+		"aws-sdk": "2.1185.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"bull": "4.9.0",
+		"bull": "4.8.5",
-		"cacheable-lookup": "6.1.0",
+		"cacheable-lookup": "6.0.4",
 		"cbor": "8.1.0",
 		"chalk": "5.0.1",
 		"chalk-template": "0.4.0",
@@ -42,13 +42,13 @@
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
-		"date-fns": "2.29.2",
+		"date-fns": "2.29.1",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
 		"feed": "4.2.2",
-		"file-type": "17.1.6",
+		"file-type": "17.1.4",
 		"fluent-ffmpeg": "2.1.2",
-		"got": "12.3.1",
+		"got": "12.3.0",
 		"hpagent": "0.1.2",
 		"ioredis": "4.28.5",
 		"ip-cidr": "3.0.10",
@@ -58,7 +58,7 @@
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
 		"jsonld": "6.0.0",
-		"jsrsasign": "10.5.27",
+		"jsrsasign": "10.5.26",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -76,12 +76,12 @@
 		"multer": "1.4.4",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.2.10",
-		"nodemailer": "6.7.8",
+		"nodemailer": "6.7.7",
-		"nsfwjs": "2.4.2",
+		"nsfwjs": "2.4.1",
 		"os-utils": "0.0.14",
-		"parse5": "7.1.1",
+		"parse5": "7.0.0",
-		"pg": "8.8.0",
+		"pg": "8.7.3",
-		"private-ip": "2.3.4",
+		"private-ip": "2.3.3",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
@@ -105,32 +105,32 @@
 		"stringz": "2.1.0",
 		"summaly": "2.7.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.12.6",
+		"systeminformation": "5.12.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.3.1",
 		"ts-node": "10.9.1",
 		"tsc-alias": "1.7.0",
-		"tsconfig-paths": "4.1.0",
+		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.9",
+		"typeorm": "0.3.7",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.11",
-		"uuid": "9.0.0",
+		"uuid": "8.3.2",
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
 		"ws": "8.8.1",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.108",
+		"@redocly/openapi-core": "1.0.0-beta.105",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.9",
 		"@types/cbor": "6.0.0",
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@types/js-yaml": "4.0.5",
-		"@types/jsdom": "20.0.0",
+		"@types/jsdom": "16.2.14",
 		"@types/jsonld": "1.5.6",
 		"@types/jsrsasign": "10.5.2",
 		"@types/koa": "2.13.5",
@@ -145,20 +145,20 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "18.7.16",
+		"@types/node": "18.6.3",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.5",
+		"@types/nodemailer": "6.4.4",
 		"@types/oauth": "0.9.1",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.5.0",
+		"@types/qrcode": "1.4.2",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.3",
 		"@types/redis": "4.0.11",
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.6.2",
-		"@types/semver": "7.3.12",
+		"@types/semver": "7.3.10",
-		"@types/sharp": "0.30.5",
+		"@types/sharp": "0.30.4",
 		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/speakeasy": "2.0.7",
 		"@types/tinycolor2": "1.4.3",
@@ -167,12 +167,12 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/eslint-plugin": "5.31.0",
-		"@typescript-eslint/parser": "5.36.2",
+		"@typescript-eslint/parser": "5.31.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.23.0",
+		"eslint": "8.20.0",
 		"eslint-plugin-import": "2.26.0",
 		"execa": "6.1.0",
-		"typescript": "4.8.3"
+		"typescript": "4.7.4"
 	}
 }

packages/backend/src/server/api/common/read-notification.ts

@@ -1,19 +1,18 @@
-import { In } from 'typeorm';
 import { publishMainStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
 import { User } from '@/models/entities/user.js';
 import { Notification } from '@/models/entities/notification.js';
 import { Notifications, Users } from '@/models/index.js';
+import { In } from 'typeorm';
 
 export async function readNotification(
 	userId: User['id'],
-	notificationIds: Notification['id'][],
+	notificationIds: Notification['id'][]
 ) {
 	if (notificationIds.length === 0) return;
 
 	// Update documents
 	const result = await Notifications.update({
-		notifieeId: userId,
 		id: In(notificationIds),
 		isRead: false,
 	}, {
@@ -28,7 +27,7 @@ export async function readNotification(
 
 export async function readNotificationByQuery(
 	userId: User['id'],
-	query: Record<string, any>,
+	query: Record<string, any>
 ) {
 	const notificationIds = await Notifications.findBy({
 		...query,

packages/backend/src/server/api/endpoints/i/notifications.ts

@@ -13,7 +13,7 @@ export const meta = {
 
 	limit: {
 		duration: 60000,
-		max: 100,
+		max: 15,
 	},
 
 	kind: 'read:notifications',

packages/backend/src/server/web/boot.js

@@ -95,10 +95,6 @@
 			}
 		}
 	}
-	const colorSchema = localStorage.getItem('colorSchema');
-	if (colorSchema) {
-		document.documentElement.style.setProperty('color-schema', colorSchema);
-	}
 	//#endregion
 
 	const fontSize = localStorage.getItem('fontSize');

packages/backend/yarn.lock

@@ -21,20 +21,20 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@bull-board/api@4.2.2":
+"@bull-board/api@4.1.1":
-  version "4.2.2"
+  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-4.2.2.tgz#42838f4fda71a3bdca560ea7c6eb80b3d846f446"
+  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-4.1.1.tgz#138364357ff8a6e6c9c94a64d325d8334275181f"
-  integrity sha512-YFkkeWvMit0P04k+xu4ZZ22i24m+Tq/w82LBtpt3z9Xu1rGrZoui8CI/YRsaJJE0o9TsqL5tY653oFVcdg35pQ==
+  integrity sha512-xpezACPl80Emry/uY+T2GoKllTQlKYaWTUWZnBq0J1ak9Zzo00JHP5v+hI7CgPjbCJVGarrTKywUEpL7S8aRXw==
   dependencies:
     redis-info "^3.0.8"
 
-"@bull-board/koa@4.2.2":
+"@bull-board/koa@4.1.1":
-  version "4.2.2"
+  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-4.2.2.tgz#97b74fde56d2df51c3cd2277cedc6f91a921dc63"
+  resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-4.1.1.tgz#32887977a3999794df3ae58acf30d252323e330c"
-  integrity sha512-ekrD3utbSM1PEdNcstvhli+aFjtdoFJpulkxoLfBPQweRc9yCzfqbgcg6g1DgjaNgQ5iEWLKGr3FSwBON5v6wQ==
+  integrity sha512-GWfMYHPl+ePU77pPigFLd1wMr4UWYlfcJd6XsdS9QBpgeLkqEPrsi3SmtwT0fk+DOohLD+sdAo5VeFYvxcOz+w==
   dependencies:
-    "@bull-board/api" "4.2.2"
+    "@bull-board/api" "4.1.1"
-    "@bull-board/ui" "4.2.2"
+    "@bull-board/ui" "4.1.1"
     ejs "^3.1.7"
     koa "^2.13.1"
     koa-mount "^4.0.0"
@@ -42,12 +42,12 @@
     koa-static "^5.0.0"
     koa-views "^7.0.1"
 
-"@bull-board/ui@4.2.2":
+"@bull-board/ui@4.1.1":
-  version "4.2.2"
+  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-4.2.2.tgz#2d5d7cbabfdea292988458d58e267bbc4b33aff0"
+  resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-4.1.1.tgz#71d415f8b93ef1a215819cbdc5c7fd577e873fbe"
-  integrity sha512-QLWWTtVj6kQ01ox4OqCs/IdKm+jWFtLvhBU7RwYt8UxmxA6dZ8ffS6hWmjWk5sJ4cKk9GzPoASYMgFv0AMuh0w==
+  integrity sha512-qyfrC0XkQNXTuC8g9BEjHLAbzOVW4Qw5rDo65oGqDBd4lpLmTa2MCFh1lm6GDZ9ak/ltH3aayvacNoH0L6ldZw==
   dependencies:
-    "@bull-board/api" "4.2.2"
+    "@bull-board/api" "4.1.1"
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -91,14 +91,14 @@
     pump "^3.0.0"
     secure-json-parse "^2.1.0"
 
-"@eslint/eslintrc@^1.3.1":
+"@eslint/eslintrc@^1.3.0":
-  version "1.3.1"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
+  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.4.0"
+    espree "^9.3.2"
     globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -111,25 +111,15 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.10.4":
+"@humanwhocodes/config-array@^0.9.2":
-  version "0.10.4"
+  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
-  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
+  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
@@ -278,31 +268,31 @@
     pngjs-nozlib "1.0.0"
     through "2.3.4"
 
-"@peertube/http-signature@1.7.0":
+"@peertube/http-signature@1.6.0":
-  version "1.7.0"
+  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@peertube/http-signature/-/http-signature-1.7.0.tgz#12a84f3fc62e786aa3a2eb09426417bad65736dc"
+  resolved "https://registry.yarnpkg.com/@peertube/http-signature/-/http-signature-1.6.0.tgz#22bef028384e6437e8dbd94052ba7b8bd7f7f1ae"
-  integrity sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==
+  integrity sha512-Bx780c7FPYtkV4LgCoaJcXYcKQqaMef2iQR2V2r5klkYkIQWFxbTOpyhKxvVXYIBIFpj5Cb8DGVDAmhkm7aavg==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
     sshpk "^1.14.1"
 
-"@redocly/ajv@^8.6.5":
+"@redocly/ajv@^8.6.4":
-  version "8.6.5"
+  version "8.6.4"
-  resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.6.5.tgz#b6e737248b791905b3f600fb329779a807f0f774"
+  resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.6.4.tgz#94053e7a9d4146d1a4feacd3813892873f229a85"
-  integrity sha512-3P2TY/u4c6OBqkP+1cTH1iGAEv0O34PV3vV2Wnos/nNHu62OTrtC4zcaxttG0pHtPtn42StrhGq7SsiFgP4Bfw==
+  integrity sha512-y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-"@redocly/openapi-core@1.0.0-beta.108":
+"@redocly/openapi-core@1.0.0-beta.105":
-  version "1.0.0-beta.108"
+  version "1.0.0-beta.105"
-  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.108.tgz#fbf1b4e31c148f8816d2d63aa37b7831e305ec0f"
+  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.105.tgz#bf8ad66c086cadfe22dbaa3027494ab74f5297bd"
-  integrity sha512-4Lq7KB+XiBvVzpaY/M0a8qog/Zr8kGrvJbRW2z7Sk2Zpc/m+8LTuZbRh15eMoneVc13M9qbHFIRh3PG18g3Tng==
+  integrity sha512-8uYDMcqBOPhFgjRlg5uetW/E2uTVVRpk+YsJhaH78ZNuzBkQP5Waw5s8P8ym6myvHs5me8l5AdniY/ePLMT5xg==
   dependencies:
-    "@redocly/ajv" "^8.6.5"
+    "@redocly/ajv" "^8.6.4"
     "@types/node" "^14.11.8"
     colorette "^1.2.0"
     js-levenshtein "^1.1.6"
@@ -367,35 +357,35 @@
   dependencies:
     defer-to-connect "^2.0.1"
 
-"@tensorflow/tfjs-backend-cpu@3.20.0":
+"@tensorflow/tfjs-backend-cpu@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.20.0.tgz#338ec5cfc7c713355839fd85ddf90b5b59b6099a"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.19.0.tgz#c7524ccdfded81df0c5cb53185b14e5222ac51e5"
-  integrity sha512-gf075YaBLwSAAiUwa0D4GvYyUBhbJ1BVSivUNQmUfGKvIr2lIhF0qstBr033YTc3lhkbFSHEEPAHh/EfpqyjXQ==
+  integrity sha512-02f+WkiL9gc9G7P8PwfsvuXREcAUdM/3uAL6fTle3xKEj7KOxX+E/mc3jxPY5UzjAsgHVBZrPJ2xi6AG16WPkQ==
   dependencies:
     "@types/seedrandom" "^2.4.28"
     seedrandom "^3.0.5"
 
-"@tensorflow/tfjs-backend-webgl@3.20.0":
+"@tensorflow/tfjs-backend-webgl@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.20.0.tgz#1ea6dff51a62cda64bd80ff9e7861a6010924f5a"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.19.0.tgz#64b8a14df35ee7d27859c7d141c527cefc6d9484"
-  integrity sha512-SucbyQ08re3HvRgVfarRtKFIjNM4JvIAzcXmw4vaE/HrCtPEePkGO1VrmfQoN470EdUmGiwgqAjoyBvM2VOlVg==
+  integrity sha512-2HTkAE21t3WQTt8P6iK80ni03AzC8UNZmbIB7/pBDYBbhDwZwe/C5fXrJWnP9m6u4hvCdMAJ3o+OP3NeaEL1pw==
   dependencies:
-    "@tensorflow/tfjs-backend-cpu" "3.20.0"
+    "@tensorflow/tfjs-backend-cpu" "3.19.0"
     "@types/offscreencanvas" "~2019.3.0"
     "@types/seedrandom" "^2.4.28"
     "@types/webgl-ext" "0.0.30"
     "@types/webgl2" "0.0.6"
     seedrandom "^3.0.5"
 
-"@tensorflow/tfjs-converter@3.20.0":
+"@tensorflow/tfjs-converter@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.20.0.tgz#5d3d2b388775997585204bc867ecdf1e52789a38"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-3.19.0.tgz#701db7255ef45578811a191478db5a09bcca6dda"
-  integrity sha512-8EIYqtQwvSYw9GFNW2OFU8Qnl/FQF/kKAsQJoORYaZ419WJo+FIZWbAWDtCpJSAgkgoHH1jYWgV9H313cVmqxg==
+  integrity sha512-B69HQq9/orsM8pGJPjNp1cV+hIcc90mxcRIsQSYGovTUNEcftmz2Sh+mqXDWysKUk0gRfx5CX6eJk6NaE55Xow==
 
-"@tensorflow/tfjs-core@3.20.0":
+"@tensorflow/tfjs-core@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.20.0.tgz#b6f89ae6490099e2c0c992faa59c96f563f9eba2"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-3.19.0.tgz#981c50bb38a6441a4375cfc8806784e7490f01bc"
-  integrity sha512-L16JyVA4a8jFJXFgB9/oYZxcGq/GfLypt5dMVTyedznARZZ9SiY/UMMbo3IKl9ZylG1dOVVTpjzV3EvBYfeJXw==
+  integrity sha512-znJ+TOJ3NdNL5yjw8M7dn2jO96sokiH1wfFuD7gglCkbZ4SXlFpFj2xelNdRHHmeYanMhJzqeyOW9whUnNcBqw==
   dependencies:
     "@types/long" "^4.0.1"
     "@types/offscreencanvas" "~2019.3.0"
@@ -406,27 +396,27 @@
     node-fetch "~2.6.1"
     seedrandom "^3.0.5"
 
-"@tensorflow/tfjs-data@3.20.0":
+"@tensorflow/tfjs-data@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-3.20.0.tgz#8e267ea9f01066e0276be3226cb21b7d38711144"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-3.19.0.tgz#31de23cbea6cc594d60bd2216ab39faa8b2219cb"
-  integrity sha512-DiD3M/K/RYyTpOsrTL0ZUsdLgoczbSEx1+cQgCtlO3wUFoMxGYMxRTFeqp4hnJalY9MDptEqZ2gXAO1BMd2IXA==
+  integrity sha512-rkZv+YZowZwnm4RaedkV44WDrjokRHld9Py/0Fb7IvMyUh37lY0WsAsV94kJ+QuLc6iVNcDLaV29K+dUz57bRA==
   dependencies:
     "@types/node-fetch" "^2.1.2"
     node-fetch "~2.6.1"
     string_decoder "^1.3.0"
 
-"@tensorflow/tfjs-layers@3.20.0":
+"@tensorflow/tfjs-layers@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-3.20.0.tgz#53aac3e719c9aa06cdff894e564704555e73a069"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-3.19.0.tgz#b624c25a2bdec09ea1c71db6547eb0952707fb35"
-  integrity sha512-CbeDFX7XgWVsjsqp9HisbhO+a+soLt9tMNNBD/F+Rmw+YDJ5+X64iRpsMj3OWK8yKp895waoeads56UhG+Pxlw==
+  integrity sha512-+sVWjWWyTuT3sImrtNLtMv8/4FS30GAYpTgyJKhCQ3+GSvHUXulxJfncD0QqOg9fTbhtuF1TRAkzDU8v64791g==
 
-"@tensorflow/tfjs-node@3.20.0":
+"@tensorflow/tfjs-node@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-3.20.0.tgz#df401f99a6e7690d64f35136910d541cd337ba0f"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-3.19.0.tgz#b7e58ff8bbea48881554d9178361726a83e56f92"
-  integrity sha512-lhMaqydtFNQ89kiET2nNMsV/rhOVa/Xh+hUHpxJP5e6KpVBzACmcJD8MjxM122G2EBntbf/vOQUAfnbX9AI9PA==
+  integrity sha512-6l8+56J66zf5k+WS8zTA1SbXno+iV7LgchwKPa62fsPRwjdzNIm1QondJbQYbFOILYx6bsgJs7nOoxStOlygAw==
   dependencies:
     "@mapbox/node-pre-gyp" "1.0.9"
-    "@tensorflow/tfjs" "3.20.0"
+    "@tensorflow/tfjs" "3.19.0"
     adm-zip "^0.5.2"
     google-protobuf "^3.9.2"
     https-proxy-agent "^2.2.1"
@@ -434,17 +424,17 @@
     rimraf "^2.6.2"
     tar "^4.4.6"
 
-"@tensorflow/tfjs@3.20.0":
+"@tensorflow/tfjs@3.19.0":
-  version "3.20.0"
+  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-3.20.0.tgz#4a525be52c72deb9964fe2e5a0abaae04b95d862"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-3.19.0.tgz#a08c35e6101bdbc0bf9a58f468270eee15f77bb0"
-  integrity sha512-Vx6MBFgZs+o413a/tM9nLdo4LM5U8Rh3d1fB8ioPL4j8dsqoqfCeee/215J3zzWPHIiSqv3pcD7bkK3fDA27GQ==
+  integrity sha512-fZF3HOON8jgKhFk06WIScIXf7j/gkl6cLbU1brFWutBhHlPSzxSWvdJR/TivCK7p+yMBunoyK50TjiwOrcoclA==
   dependencies:
-    "@tensorflow/tfjs-backend-cpu" "3.20.0"
+    "@tensorflow/tfjs-backend-cpu" "3.19.0"
-    "@tensorflow/tfjs-backend-webgl" "3.20.0"
+    "@tensorflow/tfjs-backend-webgl" "3.19.0"
-    "@tensorflow/tfjs-converter" "3.20.0"
+    "@tensorflow/tfjs-converter" "3.19.0"
-    "@tensorflow/tfjs-core" "3.20.0"
+    "@tensorflow/tfjs-core" "3.19.0"
-    "@tensorflow/tfjs-data" "3.20.0"
+    "@tensorflow/tfjs-data" "3.19.0"
-    "@tensorflow/tfjs-layers" "3.20.0"
+    "@tensorflow/tfjs-layers" "3.19.0"
     argparse "^1.0.10"
     chalk "^4.1.0"
     core-js "3"
@@ -625,14 +615,14 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
   integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
 
-"@types/jsdom@20.0.0":
+"@types/jsdom@16.2.14":
-  version "20.0.0"
+  version "16.2.14"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.0.tgz#4414fb629465167f8b7b3804b9e067bdd99f1791"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.14.tgz#26fe9da6a8870715b154bb84cd3b2e53433d8720"
-  integrity sha512-YfAchFs0yM1QPDrLm2VHe+WHGtqms3NXnXAMolrgrVP6fgBHHXy1ozAbo/dFtPNtZC/m66bPiCTWYmqp1F14gA==
+  integrity sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==
   dependencies:
     "@types/node" "*"
+    "@types/parse5" "*"
     "@types/tough-cookie" "*"
-    parse5 "^7.0.0"
 
 "@types/json-schema@^7.0.6":
   version "7.0.6"
@@ -811,20 +801,20 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz#331b7b9f8621c638284787c5559423822fdffc50"
   integrity sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==
 
-"@types/node@18.7.16":
+"@types/node@18.6.3":
-  version "18.7.16"
+  version "18.6.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.3.tgz#4e4a95b6fe44014563ceb514b2598b3e623d1c98"
-  integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==
+  integrity sha512-6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==
 
 "@types/node@^14.11.8":
   version "14.17.9"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz#b97c057e6138adb7b720df2bd0264b03c9f504fd"
   integrity sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==
 
-"@types/nodemailer@6.4.5":
+"@types/nodemailer@6.4.4":
-  version "6.4.5"
+  version "6.4.4"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.5.tgz#09011ac73259245475d1688e4ba101860567dc39"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.4.tgz#c265f7e7a51df587597b3a49a023acaf0c741f4b"
-  integrity sha512-zuP3nBRQHI6M2PkXnGGy1Ww4VB+MyYHGgnfV2T+JR9KLkeWqPJuyVUgLpKXuFnA/b7pZaIDFh2sV4759B7jK1g==
+  integrity sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==
   dependencies:
     "@types/node" "*"
 
@@ -840,6 +830,11 @@
   resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz#3336428ec7e9180cf4566dfea5da04eb586a6553"
   integrity sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==
 
+"@types/parse5@*":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
+  integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
+
 "@types/pug@2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/pug/-/pug-2.0.6.tgz#f830323c88172e66826d0bde413498b61054b5a6"
@@ -850,10 +845,10 @@
   resolved "https://registry.yarnpkg.com/@types/punycode/-/punycode-2.1.0.tgz#89e4f3d09b3f92e87a80505af19be7e0c31d4e83"
   integrity sha512-PG5aLpW6PJOeV2fHRslP4IOMWn+G+Uq8CfnyJ+PDS8ndCbU+soO+fB3NKCKo0p/Jh2Y4aPaiQZsrOXFdzpcA6g==
 
-"@types/qrcode@1.5.0":
+"@types/qrcode@1.4.2":
-  version "1.5.0"
+  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.0.tgz#6a98fe9a9a7b2a9a3167b6dde17eff999eabe40b"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.4.2.tgz#7d7142d6fa9921f195db342ed08b539181546c74"
-  integrity sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==
+  integrity sha512-7uNT9L4WQTNJejHTSTdaJhfBSCN73xtXaHFyBJ8TSwiLhe4PRuTue7Iph0s2nG9R/ifUaSnGhLUOZavlBEqDWQ==
   dependencies:
     "@types/node" "*"
 
@@ -917,10 +912,10 @@
   resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.30.tgz#d2efe425869b84163c2d56e779dddadb9372cbfa"
   integrity sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==
 
-"@types/semver@7.3.12":
+"@types/semver@7.3.10":
-  version "7.3.12"
+  version "7.3.10"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73"
-  integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
+  integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==
 
 "@types/serve-static@*":
   version "1.13.3"
@@ -930,10 +925,10 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/sharp@0.30.5":
+"@types/sharp@0.30.4":
-  version "0.30.5"
+  version "0.30.4"
-  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.30.5.tgz#d75d91f7acf5260525aeae229845046dcff6d17a"
+  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.30.4.tgz#7430b5fcf37f35dd860112c4cf6dcd6a1ba0011b"
-  integrity sha512-EhO29617AIBqxoVtpd1qdBanWpspk/kD2B6qTFRJ31Q23Rdf+DNU1xlHSwtqvwq1vgOqBwq1i38SX+HGCymIQg==
+  integrity sha512-6oJEzKt7wZeS7e+6x9QFEOWGs0T/6of00+0onZGN1zSmcSjcTDZKgIGZ6YWJnHowpaKUCFBPH52mYljWqU32Eg==
   dependencies:
     "@types/node" "*"
 
@@ -1000,14 +995,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.36.2":
+"@typescript-eslint/eslint-plugin@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz#cae1967b1e569e6171bbc6bec2afa4e0c8efccfe"
-  integrity sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==
+  integrity sha512-VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.31.0"
-    "@typescript-eslint/type-utils" "5.36.2"
+    "@typescript-eslint/type-utils" "5.31.0"
-    "@typescript-eslint/utils" "5.36.2"
+    "@typescript-eslint/utils" "5.31.0"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -1015,70 +1010,69 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@5.36.2":
+"@typescript-eslint/parser@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.31.0.tgz#7f42d7dcc68a0a6d80a0f3d9a65063aee7bb8d2c"
-  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
+  integrity sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.31.0"
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.31.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.36.2":
+"@typescript-eslint/scope-manager@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz#f47a794ba84d9b818ab7f8f44fff55a61016c606"
-  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
+  integrity sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/visitor-keys" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.31.0"
 
-"@typescript-eslint/type-utils@5.36.2":
+"@typescript-eslint/type-utils@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz#752373f4babf05e993adf2cd543a763632826391"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz#70a0b7201360b5adbddb0c36080495aa08f6f3d9"
-  integrity sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==
+  integrity sha512-7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/utils" "5.31.0"
-    "@typescript-eslint/utils" "5.36.2"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.36.2":
+"@typescript-eslint/types@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.31.0.tgz#7aa389122b64b18e473c1672fb3b8310e5f07a9a"
-  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
+  integrity sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==
 
-"@typescript-eslint/typescript-estree@5.36.2":
+"@typescript-eslint/typescript-estree@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz#eb92970c9d6e3946690d50c346fb9b1d745ee882"
-  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
+  integrity sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/visitor-keys" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.31.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.36.2":
+"@typescript-eslint/utils@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.2.tgz#b01a76f0ab244404c7aefc340c5015d5ce6da74c"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.31.0.tgz#e146fa00dca948bfe547d665b2138a2dc1b79acd"
-  integrity sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==
+  integrity sha512-kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.31.0"
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.31.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.36.2":
+"@typescript-eslint/visitor-keys@5.31.0":
-  version "5.36.2"
+  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz#b0eca264df01ce85dceb76aebff3784629258f54"
-  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
+  integrity sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.31.0"
     eslint-visitor-keys "^3.3.0"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -1154,11 +1148,6 @@ acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
-acorn@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
-
 adm-zip@^0.5.2:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.9.tgz#b33691028333821c0cf95c31374c5462f2905a83"
@@ -1464,10 +1453,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sdk@2.1213.0:
+aws-sdk@2.1185.0:
-  version "2.1213.0"
+  version "2.1185.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1213.0.tgz#efdbe52c72e6879348650ff9a69ab55ef948b6f3"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1185.0.tgz#157c6a900a9449cb36b37493337cae418e01210d"
-  integrity sha512-ZfrUfhlLjwvQ6QTbg8lR4+SRFHaivzZMmfpS+64YzafcKjwc7rklYqiyh4MPTSmdNZkErgaAykYpXPMuTiWBug==
+  integrity sha512-viFlYC6RAKOqBRM4gIB4rE80KMFNVvEkQpNmpd3PqCOemGPETDxCVHS0oqZ26qM278sZVHt+oAjPy5HmZasskg==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -1687,10 +1676,10 @@ bufferutil@^4.0.1:
   dependencies:
     node-gyp-build "~3.7.0"
 
-bull@4.9.0:
+bull@4.8.5:
-  version "4.9.0"
+  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/bull/-/bull-4.9.0.tgz#522a955fa045141ce2c063ab24c2c78e4ee3782e"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.8.5.tgz#eebafddc3249d6d5e8ced1c42b8bfa8efcc274aa"
-  integrity sha512-yiaSb41dywjIhJ3i1mczjQGDmM6pLIoM1Ea0Gcf5HKDxOoEzL5i9XEEKW7fbsj7u083UEOnQ4gSWfbWIUDO6JQ==
+  integrity sha512-2Z630e4f6VsLJnWMAtfEHwIqJYmND4W3dcG48RIbXeWpvb4UnYtpe/zxEdslJu0PKrltB4IkFj5YtBsdeQRn8w==
   dependencies:
     cron-parser "^4.2.1"
     debuglog "^1.0.0"
@@ -1747,21 +1736,16 @@ cache-content-type@^1.0.0:
     mime-types "^2.1.18"
     ylru "^1.2.0"
 
-cacheable-lookup@6.1.0:
+cacheable-lookup@6.0.4, cacheable-lookup@^6.0.4:
-  version "6.1.0"
+  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz#0330a543471c61faa4e9035db583aad753b36385"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz#65c0e51721bb7f9f2cb513aed6da4a1b93ad7dc8"
-  integrity sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww==
+  integrity sha512-mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A==
 
 cacheable-lookup@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz#049fdc59dffdd4fc285e8f4f82936591bd59fec3"
   integrity sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==
 
-cacheable-lookup@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz#65c0e51721bb7f9f2cb513aed6da4a1b93ad7dc8"
-  integrity sha512-mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A==
-
 cacheable-request@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
@@ -2299,10 +2283,10 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
-date-fns@2.29.2:
+date-fns@2.29.1:
-  version "2.29.2"
+  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.1.tgz#9667c2615525e552b5135a3116b95b1961456e60"
-  integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==
+  integrity sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw==
 
 date-fns@^2.28.0:
   version "2.28.0"
@@ -2738,11 +2722,6 @@ entities@^4.3.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.0.tgz#62915f08d67353bb4eb67e3d62641a4059aec656"
   integrity sha512-/iP1rZrSEJ0DTlPiX+jbzlA3eVkY/e8L8SozroF395fIqE3TYF/Nz7YOMAawta+vLmyJ/hkGNNPcSbMADCCXbg==
 
-entities@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -2960,15 +2939,13 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.23.0:
+eslint@8.20.0:
-  version "8.23.0"
+  version "8.20.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.20.0.tgz#048ac56aa18529967da8354a478be4ec0a2bc81b"
-  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
+  integrity sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==
   dependencies:
-    "@eslint/eslintrc" "^1.3.1"
+    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.10.4"
+    "@humanwhocodes/config-array" "^0.9.2"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
-    "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -2978,17 +2955,14 @@ eslint@8.23.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.4.0"
+    espree "^9.3.2"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
     globals "^13.15.0"
-    globby "^11.1.0"
-    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -3004,13 +2978,14 @@ eslint@8.23.0:
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
 
-espree@^9.4.0:
+espree@^9.3.2:
-  version "9.4.0"
+  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
+  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.7.1"
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
@@ -3199,10 +3174,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-type@17.1.6:
+file-type@17.1.4:
-  version "17.1.6"
+  version "17.1.4"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-17.1.6.tgz#18669e0577a4849ef6e73a41f8bdf1ab5ae21023"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-17.1.4.tgz#e86bd6cc1b727ff2b2bd62f100958e4bcf37a6a3"
-  integrity sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==
+  integrity sha512-3w/rJUUPBj6CYhVER3D5JCKwYJJiC36uj5dP+LnyubHI6H6FJo1TeWVCEA09YLVoZqV3/mLP26j9+Pz1GjAyjQ==
   dependencies:
     readable-web-to-node-stream "^3.0.2"
     strtok3 "^7.0.0-alpha.9"
@@ -3222,7 +3197,7 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-up@5.0.0, find-up@^5.0.0:
+find-up@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
@@ -3643,10 +3618,10 @@ got@11.8.5:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-got@12.3.1:
+got@12.3.0:
-  version "12.3.1"
+  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-12.3.1.tgz#79d6ebc0cb8358c424165698ddb828be56e74684"
+  resolved "https://registry.yarnpkg.com/got/-/got-12.3.0.tgz#744625bcb072e7b1fd41a706e0af2bd1f73a2c64"
-  integrity sha512-tS6+JMhBh4iXMSXF6KkIsRxmloPln31QHDlcb6Ec3bzxjjFJFr/8aXdpyuLmVc9I4i2HyBHYw1QU5K1ruUdpkw==
+  integrity sha512-7uK06aluHF0UibYFBX3lFUZ2FG/W0KS4O4EqAIrbWIdbPxIT33r6ZJy7Zy+pdh0CP/ZbF3zBa7Fd9dCn7vGPBg==
   dependencies:
     "@sindresorhus/is" "^5.2.0"
     "@szmarczak/http-timer" "^5.0.1"
@@ -3677,11 +3652,6 @@ graceful-fs@^4.2.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -4570,10 +4540,10 @@ jsprim@^1.2.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
-jsrsasign@10.5.27:
+jsrsasign@10.5.26:
-  version "10.5.27"
+  version "10.5.26"
-  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.27.tgz#481defb1206aa48cd740c3fce8ff546efb5bb45e"
+  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.26.tgz#bc36d4c4019c83f144066725ea0ca6ab306702fc"
-  integrity sha512-1F4LmDeJZHYwoVvB44jEo2uZL3XuwYNzXCDOu53Ui6vqofGQ/gCYDmaxfVZtN0TGd92UKXr/BONcfrPonUIcQQ==
+  integrity sha512-TjEu1yPdI+8whpe6CA/6XNb7U1sm9+PUItOUfSThOLvx7JCfYHIfuvZK2Egz2DWUKioafn98LPuk+geLGckxMg==
 
 jstransformer@1.0.0:
   version "1.0.0"
@@ -5518,10 +5488,10 @@ node-gyp@^9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
-nodemailer@6.7.8:
+nodemailer@6.7.7:
-  version "6.7.8"
+  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.8.tgz#9f1af9911314960c0b889079e1754e8d9e3f740a"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.7.tgz#e522fbd7507b81c51446d3f79c4603bf00083ddd"
-  integrity sha512-2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g==
+  integrity sha512-pOLC/s+2I1EXuSqO5Wa34i3kXZG3gugDssH+ZNCevHad65tc8vQlCQpOLaUjopvkRQKm2Cki2aME7fEOPRy3bA==
 
 nofilter@^2.0.3:
   version "2.0.3"
@@ -5597,10 +5567,10 @@ npmlog@^6.0.0:
     gauge "^4.0.0"
     set-blocking "^2.0.0"
 
-nsfwjs@2.4.2:
+nsfwjs@2.4.1:
-  version "2.4.2"
+  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/nsfwjs/-/nsfwjs-2.4.2.tgz#dd8656705f79f53d789245eaf317d6b6818a0032"
+  resolved "https://registry.yarnpkg.com/nsfwjs/-/nsfwjs-2.4.1.tgz#406dff6e379f4fc1c5fd4d16b7a64e4ae4b355c1"
-  integrity sha512-i4Pp2yt59qPQgeZFyg3wXFBX52uSeu/hkDoqdZfe+sILRxNBUu0VDogj7Lmqak0GlrXviS/wLiVeIx40IDUu7A==
+  integrity sha512-8XPUPVeIIfkSeWjHEytDMedZNISR0SCjv67JYbS75SIYcmz8Y7GZqNfLupltjcwsqV0e4bwdc4l4bEOno58QdA==
   dependencies:
     "@nsfw-filter/gif-frames" "1.0.2"
 
@@ -5870,12 +5840,12 @@ parse5-htmlparser2-tree-adapter@^6.0.0:
   dependencies:
     parse5 "^6.0.1"
 
-parse5@7.1.1:
+parse5@7.0.0, parse5@^7.0.0:
-  version "7.1.1"
+  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a"
-  integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==
+  integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==
   dependencies:
-    entities "^4.4.0"
+    entities "^4.3.0"
 
 parse5@^5.1.1:
   version "5.1.1"
@@ -5887,13 +5857,6 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a"
-  integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==
-  dependencies:
-    entities "^4.3.0"
-
 parseurl@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -5964,10 +5927,10 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^3.5.2:
+pg-pool@^3.5.1:
-  version "3.5.2"
+  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905"
-  integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==
+  integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==
 
 pg-protocol@^1.5.0:
   version "1.5.0"
@@ -5985,15 +5948,15 @@ pg-types@^2.1.0:
     postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@8.8.0:
+pg@8.7.3:
-  version "8.8.0"
+  version "8.7.3"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44"
-  integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==
+  integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==
   dependencies:
     buffer-writer "2.0.0"
     packet-reader "1.0.0"
     pg-connection-string "^2.5.0"
-    pg-pool "^3.5.2"
+    pg-pool "^3.5.1"
     pg-protocol "^1.5.0"
     pg-types "^2.1.0"
     pgpass "1.x"
@@ -6136,16 +6099,6 @@ private-ip@2.3.3:
     is-ip "^3.1.0"
     netmask "^2.0.2"
 
-private-ip@2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/private-ip/-/private-ip-2.3.4.tgz#e2944f2a7a0142ec6640efda323af4b96307524e"
-  integrity sha512-ts/YFVwfBeLq61f9+KsOhXW6RH0wvY0gU50R6QZYzgFhggyyLK6WDFeYdjfi/HMnBm2hecLvsR3PB3JcRxDk+A==
-  dependencies:
-    ip-regex "^4.3.0"
-    ipaddr.js "^2.0.1"
-    is-ip "^3.1.0"
-    netmask "^2.0.2"
-
 probe-image-size@7.2.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-7.2.3.tgz#d49c64be540ec8edea538f6f585f65a9b3ab4309"
@@ -7255,10 +7208,10 @@ syslog-pro@1.0.0:
   dependencies:
     moment "^2.22.2"
 
-systeminformation@5.12.6:
+systeminformation@5.12.1:
-  version "5.12.6"
+  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.6.tgz#b75d7aaf9f5da32439fc633d2be9eb741691d200"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.1.tgz#8e512e4f9f21caaaa5f802fcb6a337cb4dc8b2f5"
-  integrity sha512-FkCvT5BOuH1OE3+8lFM25oXIYJ0CM8kq4Wgvz2jyBTrsOIgha/6gdJXgbF4rv+g0j/5wJqQLDKan7kc/p7uIvw==
+  integrity sha512-qAV0xSeSJlg0ZHmQ1T2rLrL54SATalBx6v4T8Sd5s17pEm6saX3LKzlPhfPx+EfT91y9yhRYnKhnMoLTFkxbqw==
 
 tapable@^2.2.0:
   version "2.2.0"
@@ -7483,10 +7436,10 @@ tsc-alias@1.7.0:
     normalize-path "^3.0.0"
     plimit-lit "^1.2.6"
 
-tsconfig-paths@4.1.0:
+tsconfig-paths@4.0.0:
-  version "4.1.0"
+  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz#f8ef7d467f08ae3a695335bf1ece088c5538d2c1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz#1082f5d99fd127b72397eef4809e4dd06d229b64"
-  integrity sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==
+  integrity sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==
   dependencies:
     json5 "^2.2.1"
     minimist "^1.2.6"
@@ -7595,10 +7548,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@0.3.9:
+typeorm@0.3.7:
-  version "0.3.9"
+  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.9.tgz#ad0f525d81c081fd11006f97030f47a55978ac81"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.7.tgz#5776ed5058f0acb75d64723b39ff458d21de64c1"
-  integrity sha512-xNcE44D4hn74n7pjuMog9hRgep+BiO3IBpjEaQZ8fb56zsDz7xHT1GAeWwmGuuU+4nDEELp2mIqgSCR+zxR7Jw==
+  integrity sha512-MsPJeP6Zuwfe64c++l80+VRqpGEGxf0CkztIEnehQ+CMmQPSHjOnFbFxwBuZ2jiLqZTjLk2ZqQdVF0RmvxNF3Q==
   dependencies:
     "@sqltools/formatter" "^1.2.2"
     app-root-path "^3.0.0"
@@ -7618,10 +7571,10 @@ typeorm@0.3.9:
     xml2js "^0.4.23"
     yargs "^17.3.1"
 
-typescript@4.8.3:
+typescript@4.7.4:
-  version "4.8.3"
+  version "4.7.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
-  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
+  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
 ulid@2.3.0:
   version "2.3.0"
@@ -7752,26 +7705,26 @@ uuid@8.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
   integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
-uuid@9.0.0:
+uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
-  version "9.0.0"
+  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.3.0, uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
+v8-compile-cache@^2.0.3:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
+
 vary@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

packages/client/package.json

@@ -15,20 +15,20 @@
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@syuilo/aiscript": "0.11.1",
-		"@vitejs/plugin-vue": "3.1.0",
+		"@vitejs/plugin-vue": "3.0.1",
-		"@vue/compiler-sfc": "3.2.39",
+		"@vue/compiler-sfc": "3.2.37",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.1",
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.14.0",
 		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2",
-		"chart.js": "3.9.1",
+		"chart.js": "3.8.2",
 		"chartjs-adapter-date-fns": "2.0.0",
-		"chartjs-plugin-gradient": "0.5.1",
+		"chartjs-plugin-gradient": "0.5.0",
 		"chartjs-plugin-zoom": "1.2.1",
-		"compare-versions": "5.0.1",
+		"compare-versions": "4.1.3",
 		"cropperjs": "2.0.0-beta",
-		"date-fns": "2.29.2",
+		"date-fns": "2.29.1",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
 		"idb-keyval": "6.2.0",
@@ -37,54 +37,53 @@
 		"katex": "0.15.6",
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.0",
-		"misetehoshii": "https://github.com/melt-adzuki/misetehoshii",
 		"misskey-js": "0.0.14",
-		"photoswipe": "5.3.2",
+		"photoswipe": "5.3.0",
-		"prismjs": "1.29.0",
+		"prismjs": "1.28.0",
 		"punycode": "2.1.1",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.54.9",
+		"sass": "1.54.0",
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
-		"three": "0.144.0",
+		"three": "0.143.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.4.2",
 		"tsc-alias": "1.7.0",
-		"tsconfig-paths": "4.1.0",
+		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
-		"typescript": "4.8.3",
+		"typescript": "4.7.4",
-		"uuid": "9.0.0",
+		"uuid": "8.3.2",
 		"vanilla-tilt": "1.7.2",
-		"vite": "3.1.0",
+		"vite": "3.0.4",
-		"vue": "3.2.39",
+		"vue": "3.2.37",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
 	},
 	"devDependencies": {
 		"@types/escape-regexp": "0.0.1",
-		"@types/glob": "8.0.0",
+		"@types/glob": "7.2.0",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
 		"@types/katex": "0.14.0",
-		"@types/matter-js": "0.18.1",
+		"@types/matter-js": "0.17.7",
 		"@types/punycode": "2.1.0",
 		"@types/seedrandom": "3.0.2",
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
-		"@typescript-eslint/eslint-plugin": "5.36.2",
+		"@typescript-eslint/eslint-plugin": "5.31.0",
-		"@typescript-eslint/parser": "5.36.2",
+		"@typescript-eslint/parser": "5.31.0",
 		"cross-env": "7.0.3",
-		"cypress": "10.7.0",
+		"cypress": "10.3.1",
-		"eslint": "8.23.0",
+		"eslint": "8.20.0",
 		"eslint-plugin-import": "2.26.0",
-		"eslint-plugin-vue": "9.4.0",
+		"eslint-plugin-vue": "9.3.0",
-		"rollup": "2.79.0",
+		"rollup": "2.77.2",
 		"start-server-and-test": "1.14.0"
 	}
 }

packages/client/src/account.ts

@@ -146,7 +146,7 @@ export async function openAccountMenu(opts: {
 	onChoose?: (account: misskey.entities.UserDetailed) => void;
 }, ev: MouseEvent) {
 	function showSigninDialog() {
-		popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
+		popup(defineAsyncComponent(() => import('@/components/signin-dialog.vue')), {}, {
 			done: res => {
 				addAccount(res.id, res.i);
 				success();
@@ -155,7 +155,7 @@ export async function openAccountMenu(opts: {
 	}
 
 	function createAccount() {
-		popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
+		popup(defineAsyncComponent(() => import('@/components/signup-dialog.vue')), {}, {
 			done: res => {
 				addAccount(res.id, res.i);
 				switchAccountWithToken(res.i);

packages/client/src/components/MkButton.vue

@@ -1,226 +0,0 @@
-<template>
-<button
-	v-if="!link" class="bghgjjyj _button"
-	:class="{ inline, primary, gradate, danger, rounded, full }"
-	:type="type"
-	@click="emit('click', $event)"
-	@mousedown="onMousedown"
->
-	<div ref="ripples" class="ripples"></div>
-	<div class="content">
-		<slot></slot>
-	</div>
-</button>
-<MkA
-	v-else class="bghgjjyj _button"
-	:class="{ inline, primary, gradate, danger, rounded, full }"
-	:to="to"
-	@mousedown="onMousedown"
->
-	<div ref="ripples" class="ripples"></div>
-	<div class="content">
-		<slot></slot>
-	</div>
-</MkA>
-</template>
-
-<script lang="ts" setup>
-import { nextTick, onMounted } from 'vue';
-
-const props = defineProps<{
-	type?: 'button' | 'submit' | 'reset';
-	primary?: boolean;
-	gradate?: boolean;
-	rounded?: boolean;
-	inline?: boolean;
-	link?: boolean;
-	to?: string;
-	autofocus?: boolean;
-	wait?: boolean;
-	danger?: boolean;
-	full?: boolean;
-}>();
-
-const emit = defineEmits<{
-	(ev: 'click', payload: MouseEvent): void;
-}>();
-
-let el = $ref<HTMLElement | null>(null);
-let ripples = $ref<HTMLElement | null>(null);
-
-onMounted(() => {
-	if (props.autofocus) {
-		nextTick(() => {
-			el!.focus();
-		});
-	}
-});
-
-function distance(p, q): number {
-	return Math.hypot(p.x - q.x, p.y - q.y);
-}
-
-function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY): number {
-	const origin = { x: circleCenterX, y: circleCenterY };
-	const dist1 = distance({ x: 0, y: 0 }, origin);
-	const dist2 = distance({ x: boxW, y: 0 }, origin);
-	const dist3 = distance({ x: 0, y: boxH }, origin);
-	const dist4 = distance({ x: boxW, y: boxH }, origin);
-	return Math.max(dist1, dist2, dist3, dist4) * 2;
-}
-
-function onMousedown(evt: MouseEvent): void {
-	const target = evt.target! as HTMLElement;
-	const rect = target.getBoundingClientRect();
-
-	const ripple = document.createElement('div');
-	ripple.style.top = (evt.clientY - rect.top - 1).toString() + 'px';
-	ripple.style.left = (evt.clientX - rect.left - 1).toString() + 'px';
-
-	ripples!.appendChild(ripple);
-
-	const circleCenterX = evt.clientX - rect.left;
-	const circleCenterY = evt.clientY - rect.top;
-
-	const scale = calcCircleScale(target.clientWidth, target.clientHeight, circleCenterX, circleCenterY);
-
-	window.setTimeout(() => {
-		ripple.style.transform = 'scale(' + (scale / 2) + ')';
-	}, 1);
-	window.setTimeout(() => {
-		ripple.style.transition = 'all 1s ease';
-		ripple.style.opacity = '0';
-	}, 1000);
-	window.setTimeout(() => {
-		if (ripples) ripples.removeChild(ripple);
-	}, 2000);
-}
-</script>
-
-<style lang="scss" scoped>
-.bghgjjyj {
-	position: relative;
-	z-index: 1; // 他コンポーネントのbox-shadowに隠されないようにするため
-	display: block;
-	min-width: 100px;
-	width: max-content;
-	padding: 8px 16px;
-	text-align: center;
-	font-weight: normal;
-	font-size: 1em;
-	box-shadow: none;
-	text-decoration: none;
-	background: var(--buttonBg);
-	border-radius: 5px;
-	overflow: clip;
-	box-sizing: border-box;
-	transition: background 0.1s ease;
-
-	&:not(:disabled):hover {
-		background: var(--buttonHoverBg);
-	}
-
-	&:not(:disabled):active {
-		background: var(--buttonHoverBg);
-	}
-
-	&.full {
-		width: 100%;
-	}
-
-	&.rounded {
-		border-radius: 999px;
-	}
-
-	&.primary {
-		font-weight: bold;
-		color: var(--fgOnAccent) !important;
-		background: var(--accent);
-
-		&:not(:disabled):hover {
-			background: var(--X8);
-		}
-
-		&:not(:disabled):active {
-			background: var(--X8);
-		}
-	}
-
-	&.gradate {
-		font-weight: bold;
-		color: var(--fgOnAccent) !important;
-		background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
-
-		&:not(:disabled):hover {
-			background: linear-gradient(90deg, var(--X8), var(--X8));
-		}
-
-		&:not(:disabled):active {
-			background: linear-gradient(90deg, var(--X8), var(--X8));
-		}
-	}
-
-	&.danger {
-		color: #ff2a2a;
-
-		&.primary {
-			color: #fff;
-			background: #ff2a2a;
-
-			&:not(:disabled):hover {
-				background: #ff4242;
-			}
-
-			&:not(:disabled):active {
-				background: #d42e2e;
-			}
-		}
-	}
-
-	&:disabled {
-		opacity: 0.7;
-	}
-
-	&:focus-visible {
-		outline: solid 2px var(--focus);
-		outline-offset: 2px;
-	}
-
-	&.inline {
-		display: inline-block;
-		width: auto;
-		min-width: 100px;
-	}
-
-	> .ripples {
-		position: absolute;
-		z-index: 0;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		border-radius: 6px;
-		overflow: hidden;
-
-		::v-deep(div) {
-			position: absolute;
-			width: 2px;
-			height: 2px;
-			border-radius: 100%;
-			background: rgba(0, 0, 0, 0.1);
-			opacity: 1;
-			transform: scale(1);
-			transition: all 0.5s cubic-bezier(0,.5,0,1);
-		}
-	}
-
-	&.primary > .ripples ::v-deep(div) {
-		background: rgba(0, 0, 0, 0.15);
-	}
-
-	> .content {
-		position: relative;
-		z-index: 1;
-	}
-}
-</style>

packages/client/src/components/MkNoteSub.vue

@@ -10,7 +10,7 @@
 					<XCwButton v-model="showContent" :note="note"/>
 				</p>
 				<div v-show="note.cw == null || showContent" class="content">
-					<MkSubNoteContent class="text" :note="note"/>
+					<MkNoteSubNoteContent class="text" :note="note"/>
 				</div>
 			</div>
 		</div>
@@ -27,9 +27,9 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as misskey from 'misskey-js';
-import XNoteHeader from '@/components/MkNoteHeader.vue';
+import XNoteHeader from './note-header.vue';
-import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
+import MkNoteSubNoteContent from './sub-note-content.vue';
-import XCwButton from '@/components/MkCwButton.vue';
+import XCwButton from './cw-button.vue';
 import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import { i18n } from '@/i18n';

packages/client/src/components/MkTokenGenerateWindow.vue

@@ -1,90 +0,0 @@
-<template>
-<XModalWindow
-	ref="dialog"
-	:width="400"
-	:height="450"
-	:with-ok-button="true"
-	:ok-button-disabled="false"
-	:can-close="false"
-	@close="dialog.close()"
-	@closed="$emit('closed')"
-	@ok="ok()"
->
-	<template #header>{{ title || $ts.generateAccessToken }}</template>
-	<div v-if="information" class="_section">
-		<MkInfo warn>{{ information }}</MkInfo>
-	</div>
-	<div class="_section">
-		<MkInput v-model="name">
-			<template #label>{{ $ts.name }}</template>
-		</MkInput>
-	</div>
-	<div class="_section">
-		<div style="margin-bottom: 16px;"><b>{{ $ts.permission }}</b></div>
-		<MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton>
-		<MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton>
-		<MkSwitch v-for="kind in (initialPermissions || kinds)" :key="kind" v-model="permissions[kind]">{{ $t(`_permissions.${kind}`) }}</MkSwitch>
-	</div>
-</XModalWindow>
-</template>
-
-<script lang="ts" setup>
-import { } from 'vue';
-import { permissions as kinds } from 'misskey-js';
-import MkInput from './form/input.vue';
-import MkSwitch from './form/switch.vue';
-import MkButton from './MkButton.vue';
-import MkInfo from './MkInfo.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
-
-const props = withDefaults(defineProps<{
-	title?: string | null;
-	information?: string | null;
-	initialName?: string | null;
-	initialPermissions?: string[] | null;
-}>(), {
-	title: null,
-	information: null,
-	initialName: null,
-	initialPermissions: null,
-});
-
-const emit = defineEmits<{
-	(ev: 'closed'): void;
-	(ev: 'done', result: { name: string | null, permissions: string[] }): void;
-}>();
-
-const dialog = $ref<InstanceType<typeof XModalWindow>>();
-let name = $ref(props.initialName);
-let permissions = $ref({});
-
-if (props.initialPermissions) {
-	for (const kind of props.initialPermissions) {
-		permissions[kind] = true;
-	}
-} else {
-	for (const kind of kinds) {
-		permissions[kind] = false;
-	}
-}
-
-function ok(): void {
-	emit('done', {
-		name: name,
-		permissions: Object.keys(permissions).filter(p => permissions[p]),
-	});
-	dialog.close();
-}
-
-function disableAll(): void {
-	for (const p in permissions) {
-		permissions[p] = false;
-	}
-}
-
-function enableAll(): void {
-	for (const p in permissions) {
-		permissions[p] = true;
-	}
-}
-</script>

packages/client/src/components/MkUrlPreviewPopup.vue

@@ -1,45 +0,0 @@
-<template>
-<div class="fgmtyycl" :style="{ zIndex, top: top + 'px', left: left + 'px' }">
-	<transition :name="$store.state.animation ? 'zoom' : ''" @after-leave="emit('closed')">
-		<MkUrlPreview v-if="showing" class="_popup _shadow" :url="url"/>
-	</transition>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted } from 'vue';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import * as os from '@/os';
-
-const props = defineProps<{
-	showing: boolean;
-	url: string;
-	source: HTMLElement;
-}>();
-
-const emit = defineEmits<{
-	(ev: 'closed'): void;
-}>();
-
-const zIndex = os.claimZIndex('middle');
-let top = $ref(0);
-let left = $ref(0);
-
-onMounted(() => {
-	const rect = props.source.getBoundingClientRect();
-	const x = Math.max((rect.left + (props.source.offsetWidth / 2)) - (300 / 2), 6) + window.pageXOffset;
-	const y = rect.top + props.source.offsetHeight + window.pageYOffset;
-
-	top = y;
-	left = x;
-});
-</script>
-
-<style lang="scss" scoped>
-.fgmtyycl {
-	position: absolute;
-	width: 500px;
-	max-width: calc(90vw - 12px);
-	pointer-events: none;
-}
-</style>

packages/client/src/components/abuse-report-window.vue

@@ -25,9 +25,9 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import XWindow from '@/components/MkWindow.vue';
+import XWindow from '@/components/ui/window.vue';
 import MkTextarea from '@/components/form/textarea.vue';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 

packages/client/src/components/abuse-report.vue

@@ -36,9 +36,9 @@
 </template>
 
 <script lang="ts" setup>
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import MkSwitch from '@/components/form/switch.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkKeyValue from '@/components/key-value.vue';
 import { acct, userPage } from '@/filters/user';
 import * as os from '@/os';
 import { i18n } from '@/i18n';

packages/client/src/components/analog-clock.vue

@@ -26,7 +26,6 @@
 		</text>
 	</template>
 
-	<!--
 	<line
 		:x1="5 - (Math.sin(sAngle) * (sHandLengthRatio * handsTailLength))"
 		:y1="5 + (Math.cos(sAngle) * (sHandLengthRatio * handsTailLength))"
@@ -36,20 +35,6 @@
 		:stroke-width="thickness / 2"
 		stroke-linecap="round"
 	/>
-	-->
-
-	<line
-		class="s"
-		:class="{ animate: !disableSAnimate && sAnimation !== 'none', elastic: sAnimation === 'elastic', easeOut: sAnimation === 'easeOut' }"
-		:x1="5 - (0 * (sHandLengthRatio * handsTailLength))"
-		:y1="5 + (1 * (sHandLengthRatio * handsTailLength))"
-		:x2="5 + (0 * ((sHandLengthRatio * 5) - handsPadding))"
-		:y2="5 - (1 * ((sHandLengthRatio * 5) - handsPadding))"
-		:stroke="sHandColor"
-		:stroke-width="thickness / 2"
-		:style="`transform: rotateZ(${sAngle}rad)`"
-		stroke-linecap="round"
-	/>
 
 	<line
 		:x1="5 - (Math.sin(mAngle) * (mHandLengthRatio * handsTailLength))"
@@ -74,7 +59,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount, shallowRef, nextTick } from 'vue';
+import { ref, computed, onMounted, onBeforeUnmount, shallowRef } from 'vue';
 import tinycolor from 'tinycolor2';
 import { globalEvents } from '@/events.js';
 
@@ -99,7 +84,6 @@ const props = withDefaults(defineProps<{
 	twentyfour?: boolean;
 	graduations?: 'none' | 'dots' | 'numbers';
 	fadeGraduations?: boolean;
-	sAnimation?: 'none' | 'elastic' | 'easeOut';
 }>(), {
 	numbers: false,
 	thickness: 0.1,
@@ -107,7 +91,6 @@ const props = withDefaults(defineProps<{
 	twentyfour: false,
 	graduations: 'dots',
 	fadeGraduations: true,
-	sAnimation: 'elastic',
 });
 
 const graduationsMajor = computed(() => {
@@ -142,8 +125,6 @@ let s = $ref<number>(0);
 let hAngle = $ref<number>(0);
 let mAngle = $ref<number>(0);
 let sAngle = $ref<number>(0);
-let disableSAnimate = $ref(false);
-let sOneRound = false;
 
 function tick() {
 	const now = new Date();
@@ -153,21 +134,7 @@ function tick() {
 	h = now.getHours();
 	hAngle = Math.PI * (h % (props.twentyfour ? 24 : 12) + (m + s / 60) / 60) / (props.twentyfour ? 12 : 6);
 	mAngle = Math.PI * (m + s / 60) / 30;
-	if (sOneRound) { // 秒針が一周した際のアニメーションをよしなに処理する(これが無いと秒が59->0になったときに期待したアニメーションにならない)
-		sAngle = Math.PI * 60 / 30;
-		window.setTimeout(() => {
-			disableSAnimate = true;
-			window.setTimeout(() => {
-				sAngle = 0;
-				window.setTimeout(() => {
-					disableSAnimate = false;
-				}, 100);
-			}, 100);
-		}, 700);
-	} else {
 	sAngle = Math.PI * s / 30;
-	}
-	sOneRound = s === 59;
 }
 
 tick();
@@ -208,18 +175,5 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .mbcofsoe {
 	display: block;
-
-	> .s {
-		will-change: transform;
-		transform-origin: 50% 50%;
-
-		&.animate.elastic {
-			transition: transform .2s cubic-bezier(.4,2.08,.55,.44);
-		}
-
-		&.animate.easeOut {
-			transition: transform .7s cubic-bezier(0,.7,.3,1);
-		}
-	}
 }
 </style>

packages/client/src/components/chart-tooltip.vue

@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkTooltip from './MkTooltip.vue';
+import MkTooltip from './ui/tooltip.vue';
 
 const props = defineProps<{
 	showing: boolean;

packages/client/src/components/code.vue

@@ -11,5 +11,5 @@ defineProps<{
 	inline?: boolean;
 }>();
 
-const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'));
+const XCode = defineAsyncComponent(() => import('./code-core.vue'));
 </script>

packages/client/src/components/cropper-dialog.vue

@@ -30,7 +30,7 @@ import { nextTick, onMounted } from 'vue';
 import * as misskey from 'misskey-js';
 import Cropper from 'cropperjs';
 import tinycolor from 'tinycolor2';
-import XModalWindow from '@/components/MkModalWindow.vue';
+import XModalWindow from '@/components/ui/modal-window.vue';
 import * as os from '@/os';
 import { $i } from '@/account';
 import { defaultStore } from '@/store';

packages/client/src/components/date-separated-list.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent, h, PropType, TransitionGroup } from 'vue';
-import MkAd from '@/components/global/MkAd.vue';
+import MkAd from '@/components/global/ad.vue';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 
@@ -13,22 +13,22 @@ export default defineComponent({
 		direction: {
 			type: String,
 			required: false,
-			default: 'down',
+			default: 'down'
 		},
 		reversed: {
 			type: Boolean,
 			required: false,
-			default: false,
+			default: false
 		},
 		noGap: {
 			type: Boolean,
 			required: false,
-			default: false,
+			default: false
 		},
 		ad: {
 			type: Boolean,
 			required: false,
-			default: false,
+			default: false
 		},
 	},
 
@@ -38,7 +38,7 @@ export default defineComponent({
 			const month = new Date(time).getMonth() + 1;
 			return i18n.t('monthAndDay', {
 				month: month.toString(),
-				day: date.toString(),
+				day: date.toString()
 			});
 		}
 
@@ -48,7 +48,7 @@ export default defineComponent({
 			if (!slots || !slots.default) return;
 
 			const el = slots.default({
-				item: item,
+				item: item
 			})[0];
 			if (el.key == null && item.id) el.key = item.id;
 
@@ -60,20 +60,20 @@ export default defineComponent({
 					class: 'separator',
 					key: item.id + ':separator',
 				}, h('p', {
-					class: 'date',
+					class: 'date'
 				}, [
 					h('span', [
 						h('i', {
 							class: 'fas fa-angle-up icon',
 						}),
-						getDateText(item.createdAt),
+						getDateText(item.createdAt)
 					]),
 					h('span', [
 						getDateText(props.items[i + 1].createdAt),
 						h('i', {
 							class: 'fas fa-angle-down icon',
-						}),
+						})
-					]),
+					])
 				]));
 
 				return [el, separator];
@@ -102,7 +102,7 @@ export default defineComponent({
 					class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
 				},
 			{ default: renderChildren });
-	},
+	}
 });
 </script>
 

packages/client/src/components/dialog.vue

@@ -40,8 +40,8 @@
 
 <script lang="ts" setup>
 import { onBeforeUnmount, onMounted, ref } from 'vue';
-import MkModal from '@/components/MkModal.vue';
+import MkModal from '@/components/ui/modal.vue';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import MkSelect from '@/components/form/select.vue';
 import { i18n } from '@/i18n';

packages/client/src/components/drive-file-thumbnail.vue

@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import * as Misskey from 'misskey-js';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
+import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
 
 const props = defineProps<{
 	file: Misskey.entities.DriveFile;

packages/client/src/components/drive-select-dialog.vue

@@ -1,6 +1,5 @@
 <template>
-<XModalWindow
+<XModalWindow ref="dialog"
-	ref="dialog"
 	:width="800"
 	:height="500"
 	:with-ok-button="true"
@@ -21,8 +20,8 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import XDrive from '@/components/MkDrive.vue';
+import XDrive from './drive.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
+import XModalWindow from '@/components/ui/modal-window.vue';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
 

packages/client/src/components/drive-window.vue

@@ -1,6 +1,5 @@
 <template>
-<XWindow
+<XWindow ref="window"
-	ref="window"
 	:initial-width="800"
 	:initial-height="500"
 	:can-resize="true"
@@ -16,8 +15,8 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as Misskey from 'misskey-js';
-import XDrive from '@/components/MkDrive.vue';
+import XDrive from './drive.vue';
-import XWindow from '@/components/MkWindow.vue';
+import XWindow from '@/components/ui/window.vue';
 import { i18n } from '@/i18n';
 
 defineProps<{

packages/client/src/components/drive.file.vue

@@ -1,6 +1,5 @@
 <template>
-<div
+<div class="ncvczrfv"
-	class="ncvczrfv"
 	:class="{ isSelected }"
 	draggable="true"
 	:title="title"
@@ -35,7 +34,7 @@
 import { computed, defineAsyncComponent, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
+import MkDriveFileThumbnail from './drive-file-thumbnail.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
@@ -64,31 +63,31 @@ function getMenu() {
 	return [{
 		text: i18n.ts.rename,
 		icon: 'fas fa-i-cursor',
-		action: rename,
+		action: rename
 	}, {
 		text: props.file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
 		icon: props.file.isSensitive ? 'fas fa-eye' : 'fas fa-eye-slash',
-		action: toggleSensitive,
+		action: toggleSensitive
 	}, {
 		text: i18n.ts.describeFile,
 		icon: 'fas fa-i-cursor',
-		action: describe,
+		action: describe
 	}, null, {
 		text: i18n.ts.copyUrl,
 		icon: 'fas fa-link',
-		action: copyUrl,
+		action: copyUrl
 	}, {
 		type: 'a',
 		href: props.file.url,
 		target: '_blank',
 		text: i18n.ts.download,
 		icon: 'fas fa-download',
-		download: props.file.name,
+		download: props.file.name
 	}, null, {
 		text: i18n.ts.delete,
 		icon: 'fas fa-trash-alt',
 		danger: true,
-		action: deleteFile,
+		action: deleteFile
 	}];
 }
 
@@ -128,35 +127,35 @@ function rename() {
 		if (canceled) return;
 		os.api('drive/files/update', {
 			fileId: props.file.id,
-			name: name,
+			name: name
 		});
 	});
 }
 
 function describe() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkMediaCaption.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/media-caption.vue')), {
 		title: i18n.ts.describeFile,
 		input: {
 			placeholder: i18n.ts.inputNewDescription,
 			default: props.file.comment != null ? props.file.comment : '',
 		},
-		image: props.file,
+		image: props.file
 	}, {
 		done: result => {
 			if (!result || result.canceled) return;
 			let comment = result.result;
 			os.api('drive/files/update', {
 				fileId: props.file.id,
-				comment: comment.length === 0 ? null : comment,
+				comment: comment.length === 0 ? null : comment
 			});
-		},
+		}
 	}, 'closed');
 }
 
 function toggleSensitive() {
 	os.api('drive/files/update', {
 		fileId: props.file.id,
-		isSensitive: !props.file.isSensitive,
+		isSensitive: !props.file.isSensitive
 	});
 }
 
@@ -177,7 +176,7 @@ async function deleteFile() {
 
 	if (canceled) return;
 	os.api('drive/files/delete', {
-		fileId: props.file.id,
+		fileId: props.file.id
 	});
 }
 </script>

packages/client/src/components/drive.folder.vue

@@ -1,6 +1,5 @@
 <template>
-<div
+<div class="rghtznwe"
-	class="rghtznwe"
 	:class="{ draghover }"
 	draggable="true"
 	:title="title"
@@ -124,7 +123,7 @@ function onDrop(ev: DragEvent) {
 		emit('removeFile', file.id);
 		os.api('drive/files/update', {
 			fileId: file.id,
-			folderId: props.folder.id,
+			folderId: props.folder.id
 		});
 	}
 	//#endregion
@@ -140,7 +139,7 @@ function onDrop(ev: DragEvent) {
 		emit('removeFolder', folder.id);
 		os.api('drive/folders/update', {
 			folderId: folder.id,
-			parentId: props.folder.id,
+			parentId: props.folder.id
 		}).then(() => {
 			// noop
 		}).catch(err => {
@@ -148,13 +147,13 @@ function onDrop(ev: DragEvent) {
 				case 'detected-circular-definition':
 					os.alert({
 						title: i18n.ts.unableToProcess,
-						text: i18n.ts.circularReferenceFolder,
+						text: i18n.ts.circularReferenceFolder
 					});
 					break;
 				default:
 					os.alert({
 						type: 'error',
-						text: i18n.ts.somethingHappened,
+						text: i18n.ts.somethingHappened
 					});
 			}
 		});
@@ -187,19 +186,19 @@ function rename() {
 	os.inputText({
 		title: i18n.ts.renameFolder,
 		placeholder: i18n.ts.inputNewFolderName,
-		default: props.folder.name,
+		default: props.folder.name
 	}).then(({ canceled, result: name }) => {
 		if (canceled) return;
 		os.api('drive/folders/update', {
 			folderId: props.folder.id,
-			name: name,
+			name: name
 		});
 	});
 }
 
 function deleteFolder() {
 	os.api('drive/folders/delete', {
-		folderId: props.folder.id,
+		folderId: props.folder.id
 	}).then(() => {
 		if (defaultStore.state.uploadFolder === props.folder.id) {
 			defaultStore.set('uploadFolder', null);
@@ -210,13 +209,13 @@ function deleteFolder() {
 				os.alert({
 					type: 'error',
 					title: i18n.ts.unableToDelete,
-					text: i18n.ts.hasChildFilesOrFolders,
+					text: i18n.ts.hasChildFilesOrFolders
 				});
 				break;
 			default:
 				os.alert({
 					type: 'error',
-					text: i18n.ts.unableToDelete,
+					text: i18n.ts.unableToDelete
 				});
 		}
 	});
@@ -231,11 +230,11 @@ function onContextmenu(ev: MouseEvent) {
 		text: i18n.ts.openInWindow,
 		icon: 'fas fa-window-restore',
 		action: () => {
-			os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
+			os.popup(defineAsyncComponent(() => import('./drive-window.vue')), {
-				initialFolder: props.folder,
+				initialFolder: props.folder
 			}, {
 			}, 'closed');
-		},
+		}
 	}, null, {
 		text: i18n.ts.rename,
 		icon: 'fas fa-i-cursor',

packages/client/src/components/drive.vue

@@ -90,10 +90,10 @@
 <script lang="ts" setup>
 import { markRaw, nextTick, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import MkButton from './MkButton.vue';
+import XNavFolder from './drive.nav-folder.vue';
-import XNavFolder from '@/components/MkDrive.navFolder.vue';
+import XFolder from './drive.folder.vue';
-import XFolder from '@/components/MkDrive.folder.vue';
+import XFile from './drive.file.vue';
-import XFile from '@/components/MkDrive.file.vue';
+import MkButton from './ui/button.vue';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { defaultStore } from '@/store';

packages/client/src/components/emoji-picker-dialog.vue

@@ -27,8 +27,8 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkModal from '@/components/MkModal.vue';
+import MkModal from '@/components/ui/modal.vue';
-import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
+import MkEmojiPicker from '@/components/emoji-picker.vue';
 import { defaultStore } from '@/store';
 
 withDefaults(defineProps<{
@@ -51,8 +51,8 @@ const emit = defineEmits<{
 const modal = ref<InstanceType<typeof MkModal>>();
 const picker = ref<InstanceType<typeof MkEmojiPicker>>();
 
-function chosen(results: { reaction: string, withRenote: boolean }) {
+function chosen(emoji: any) {
-	emit('done', results);
+	emit('done', emoji);
 	modal.value?.close();
 }
 

packages/client/src/components/emoji-picker-window.vue

@@ -13,8 +13,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkWindow from '@/components/MkWindow.vue';
+import MkWindow from '@/components/ui/window.vue';
-import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
+import MkEmojiPicker from '@/components/emoji-picker.vue';
 
 withDefaults(defineProps<{
 	src?: HTMLElement;

packages/client/src/components/emoji-picker.vue

@@ -74,24 +74,22 @@
 		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="fas fa-leaf fa-fw"></i></button>
 		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="fas fa-hashtag fa-fw"></i></button>
 	</div>
-	<MkSwitch v-if="props.asReactionPicker" v-model="withRenote" class="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, watch, onMounted } from 'vue';
 import * as Misskey from 'misskey-js';
-import XSection from '@/components/MkEmojiPicker.section.vue';
+import XSection from './emoji-picker.section.vue';
 import { emojilist, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import Ripple from '@/components/MkRipple.vue';
+import Ripple from '@/components/ripple.vue';
 import * as os from '@/os';
 import { isTouchUsing } from '@/scripts/touch';
 import { deviceKind } from '@/scripts/device-kind';
 import { emojiCategories, instance } from '@/instance';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
-import MkSwitch from '@/components/form/switch.vue';
 
 const props = withDefaults(defineProps<{
 	showPinned?: boolean;
@@ -103,11 +101,10 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'chosen', v: { reaction: string, withRenote: boolean } | string): void;
+	(ev: 'chosen', v: string): void;
 }>();
 
 const search = ref<HTMLInputElement>();
-const withRenote = ref<boolean>(true);
 const emojis = ref<HTMLDivElement>();
 
 const {
@@ -281,7 +278,6 @@ function focus() {
 function reset() {
 	if (emojis.value) emojis.value.scrollTop = 0;
 	q.value = '';
-	withRenote.value = false; // 毎回Renoteをfalseに戻す
 }
 
 function getKey(emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef): string {
@@ -298,7 +294,7 @@ function chosen(emoji: any, ev?: MouseEvent) {
 	}
 
 	const key = getKey(emoji);
-	emit('chosen', (props.asReactionPicker) ? { reaction: key, withRenote: withRenote.value } : key);
+	emit('chosen', key);
 
 	// 最近使った絵文字更新
 	if (!pinned.value.includes(key)) {
@@ -456,10 +452,6 @@ defineExpose({
 		}
 	}
 
-	> .withRenote {
-		padding: 12px;
-	}
-
 	> .tabs {
 		display: flex;
 		display: none;

packages/client/src/components/file-list-for-admin.vue

@@ -35,8 +35,8 @@
 import { computed } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
 import MkSwitch from '@/components/ui/switch.vue';
-import MkPagination from '@/components/MkPagination.vue';
+import MkPagination from '@/components/ui/pagination.vue';
-import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
+import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue';
 import bytes from '@/filters/bytes';
 import * as os from '@/os';
 import { i18n } from '@/i18n';

packages/client/src/components/forgot-password.vue

@@ -33,8 +33,8 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
+import XModalWindow from '@/components/ui/modal-window.vue';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import * as os from '@/os';
 import { instance } from '@/instance';

packages/client/src/components/form-dialog.vue

@@ -61,9 +61,9 @@ import FormTextarea from './form/textarea.vue';
 import FormSwitch from './form/switch.vue';
 import FormSelect from './form/select.vue';
 import FormRange from './form/range.vue';
-import MkButton from './MkButton.vue';
+import MkButton from './ui/button.vue';
 import FormRadios from './form/radios.vue';
-import XModalWindow from '@/components/MkModalWindow.vue';
+import XModalWindow from '@/components/ui/modal-window.vue';
 
 export default defineComponent({
 	components: {

packages/client/src/components/form/checkbox.vue

@@ -23,7 +23,7 @@
 <script lang="ts" setup>
 import { toRefs, Ref } from 'vue';
 import * as os from '@/os';
-import Ripple from '@/components/MkRipple.vue';
+import Ripple from '@/components/ripple.vue';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{

packages/client/src/components/form/input.vue

@@ -36,7 +36,7 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
 import { debounce } from 'throttle-debounce';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';
 

packages/client/src/components/form/range.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="timctyfi" :class="{ disabled, easing }">
+<div class="timctyfi" :class="{ disabled }">
 	<div class="label"><slot name="label"></slot></div>
 	<div v-adaptive-border class="body">
 		<div ref="containerEl" class="container">
@@ -28,11 +28,9 @@ const props = withDefaults(defineProps<{
 	step?: number;
 	textConverter?: (value: number) => string,
 	showTicks?: boolean;
-	easing?: boolean;
 }>(), {
 	step: 1,
 	textConverter: (v) => v.toString(),
-	easing: false,
 });
 
 const emit = defineEmits<{
@@ -98,7 +96,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 	ev.preventDefault();
 
 	const tooltipShowing = ref(true);
-	os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/ui/tooltip.vue')), {
 		showing: tooltipShowing,
 		text: computed(() => {
 			return props.textConverter(finalValue.value);
@@ -200,6 +198,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 					height: 100%;
 					background: var(--accent);
 					opacity: 0.5;
+					//transition: width 0.2s cubic-bezier(0,0,0,1);
 				}
 			}
 
@@ -232,6 +231,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 				cursor: grab;
 				background: var(--accent);
 				border-radius: 999px;
+				//transition: left 0.2s cubic-bezier(0,0,0,1);
 
 				&:hover {
 					background: var(--accentLighten);
@@ -239,21 +239,5 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 			}
 		}
 	}
-
-	&.easing {
-		> .body {
-			> .container {
-				> .track {
-					> .highlight {
-						transition: width 0.2s cubic-bezier(0,0,0,1);
-					}
-				}
-
-				> .thumb {
-					transition: left 0.2s cubic-bezier(0,0,0,1);
-				}
-			}
-		}
-	}
 }
 </style>

packages/client/src/components/form/select.vue

@@ -28,7 +28,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode, useSlots } from 'vue';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';

packages/client/src/components/form/slot.vue

@@ -8,12 +8,12 @@
 </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts">
-import { } from 'vue';
+import { defineComponent } from 'vue';
 
-function focus() {
+export default defineComponent({
-	// TODO
+
-}
+});
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/form/suspense.vue

@@ -17,7 +17,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType, ref, watch } from 'vue';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 
 export default defineComponent({
 	components: {

packages/client/src/components/form/textarea.vue

@@ -29,7 +29,7 @@
 <script lang="ts">
 import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
 import { debounce } from 'throttle-debounce';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import { i18n } from '@/i18n';
 
 export default defineComponent({

packages/client/src/components/formula.vue

@@ -1,5 +1,5 @@
 <template>
-<XFormula :formula="formula" :block="block"/>
+<XFormula :formula="formula" :block="block" />
 </template>
 
 <script lang="ts">
@@ -8,17 +8,17 @@ import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		XFormula: defineAsyncComponent(() => import('@/components/MkFormulaCore.vue')),
+		XFormula: defineAsyncComponent(() => import('./formula-core.vue'))
 	},
 	props: {
 		formula: {
 			type: String,
-			required: true,
+			required: true
 		},
 		block: {
 			type: Boolean,
-			required: true,
+			required: true
-		},
+		}
-	},
+	}
 });
 </script>

packages/client/src/components/gallery-post-preview.vue

@@ -14,15 +14,26 @@
 </MkA>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts">
-import { } from 'vue';
+import { defineComponent } from 'vue';
 import { userName } from '@/filters/user';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
+import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
 import * as os from '@/os';
 
-const props = defineProps<{
+export default defineComponent({
-	post: any;
+	components: {
-}>();
+		ImgWithBlurhash
+	},
+	props: {
+		post: {
+			type: Object,
+			required: true
+		},
+	},
+	methods: {
+		userName
+	}
+});
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/global/MkAd.vue

@@ -1,186 +0,0 @@
-<template>
-<div v-if="chosen" class="qiivuoyo">
-	<div v-if="!showMenu" class="main" :class="chosen.place">
-		<a :href="chosen.url" target="_blank">
-			<img :src="chosen.imageUrl">
-			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="fas fa-info-circle info-circle"></span></button>
-		</a>
-	</div>
-	<div v-else class="menu">
-		<div class="body">
-			<div>Ads by {{ host }}</div>
-			<!--<MkButton class="button" primary>{{ $ts._ad.like }}</MkButton>-->
-			<MkButton v-if="chosen.ratio !== 0" class="button" @click="reduceFrequency">{{ $ts._ad.reduceFrequencyOfThisAd }}</MkButton>
-			<button class="_textButton" @click="toggleMenu">{{ $ts._ad.back }}</button>
-		</div>
-	</div>
-</div>
-<div v-else></div>
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue';
-import { instance } from '@/instance';
-import { host } from '@/config';
-import MkButton from '@/components/MkButton.vue';
-import { defaultStore } from '@/store';
-import * as os from '@/os';
-
-type Ad = (typeof instance)['ads'][number];
-
-const props = defineProps<{
-	prefer: string[];
-	specify?: Ad;
-}>();
-
-const showMenu = ref(false);
-const toggleMenu = (): void => {
-	showMenu.value = !showMenu.value;
-};
-
-const choseAd = (): Ad | null => {
-	if (props.specify) {
-		return props.specify;
-	}
-
-	const allAds = instance.ads.map(ad => defaultStore.state.mutedAds.includes(ad.id) ? {
-		...ad,
-		ratio: 0,
-	} : ad);
-
-	let ads = allAds.filter(ad => props.prefer.includes(ad.place));
-
-	if (ads.length === 0) {
-		ads = allAds.filter(ad => ad.place === 'square');
-	}
-
-	const lowPriorityAds = ads.filter(ad => ad.ratio === 0);
-	ads = ads.filter(ad => ad.ratio !== 0);
-
-	if (ads.length === 0) {
-		if (lowPriorityAds.length !== 0) {
-			return lowPriorityAds[Math.floor(Math.random() * lowPriorityAds.length)];
-		} else {
-			return null;
-		}
-	}
-
-	const totalFactor = ads.reduce((a, b) => a + b.ratio, 0);
-	const r = Math.random() * totalFactor;
-
-	let stackedFactor = 0;
-	for (const ad of ads) {
-		if (r >= stackedFactor && r <= stackedFactor + ad.ratio) {
-			return ad;
-		} else {
-			stackedFactor += ad.ratio;
-		}
-	}
-
-	return null;
-};
-
-const chosen = ref(choseAd());
-
-function reduceFrequency(): void {
-	if (chosen.value == null) return;
-	if (defaultStore.state.mutedAds.includes(chosen.value.id)) return;
-	defaultStore.push('mutedAds', chosen.value.id);
-	os.success();
-	chosen.value = choseAd();
-	showMenu.value = false;
-}
-</script>
-
-<style lang="scss" scoped>
-.qiivuoyo {
-	background-size: auto auto;
-	background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--ad) 8px, var(--ad) 14px );
-
-	> .main {
-		text-align: center;
-
-		> a {
-			display: inline-block;
-			position: relative;
-			vertical-align: bottom;
-
-			&:hover {
-				> img {
-					filter: contrast(120%);
-				}
-			}
-
-			> img {
-				display: block;
-				object-fit: contain;
-				margin: auto;
-				border-radius: 5px;
-			}
-
-			> .menu {
-				position: absolute;
-				top: 1px;
-				right: 1px;
-
-				> .info-circle {
-					border: 3px solid var(--panel);
-					border-radius: 50%;
-					background: var(--panel);
-				}
-			}
-		}
-
-		&.square {
-			> a ,
-			> a > img {
-				max-width: min(300px, 100%);
-				max-height: 300px;
-			}
-		}
-
-		&.horizontal {
-			padding: 8px;
-
-			> a ,
-			> a > img {
-				max-width: min(600px, 100%);
-				max-height: 80px;
-			}
-		}
-
-		&.horizontal-big {
-			padding: 8px;
-
-			> a ,
-			> a > img {
-				max-width: min(600px, 100%);
-				max-height: 250px;
-			}
-		}
-
-		&.vertical {
-			> a ,
-			> a > img {
-				max-width: min(100px, 100%);
-			}
-		}
-	}
-
-	> .menu {
-		padding: 8px;
-		text-align: center;
-
-		> .body {
-			padding: 8px;
-			margin: 0 auto;
-			max-width: 400px;
-			border: solid 1px var(--divider);
-
-			> .button {
-				margin: 8px auto;
-			}
-		}
-	}
-}
-</style>

packages/client/src/components/global/ad.vue

@@ -0,0 +1,206 @@
+<template>
+<div v-if="ad" class="qiivuoyo">
+	<div v-if="!showMenu" class="main" :class="ad.place">
+		<a :href="ad.url" target="_blank">
+			<img :src="ad.imageUrl">
+			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="fas fa-info-circle info-circle"></span></button>
+		</a>
+	</div>
+	<div v-else class="menu">
+		<div class="body">
+			<div>Ads by {{ host }}</div>
+			<!--<MkButton class="button" primary>{{ $ts._ad.like }}</MkButton>-->
+			<MkButton v-if="ad.ratio !== 0" class="button" @click="reduceFrequency">{{ $ts._ad.reduceFrequencyOfThisAd }}</MkButton>
+			<button class="_textButton" @click="toggleMenu">{{ $ts._ad.back }}</button>
+		</div>
+	</div>
+</div>
+<div v-else></div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+import { instance } from '@/instance';
+import { host } from '@/config';
+import MkButton from '@/components/ui/button.vue';
+import { defaultStore } from '@/store';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkButton
+	},
+
+	props: {
+		prefer: {
+			type: Array,
+			required: true
+		},
+		specify: {
+			type: Object,
+			required: false
+		},
+	},
+
+	setup(props) {
+		const showMenu = ref(false);
+		const toggleMenu = () => {
+			showMenu.value = !showMenu.value;
+		};
+
+		const choseAd = (): (typeof instance)['ads'][number] | null => {
+			if (props.specify) {
+				return props.specify as (typeof instance)['ads'][number];
+			}
+
+			const allAds = instance.ads.map(ad => defaultStore.state.mutedAds.includes(ad.id) ? {
+				...ad,
+				ratio: 0
+			} : ad);
+
+			let ads = allAds.filter(ad => props.prefer.includes(ad.place));
+
+			if (ads.length === 0) {
+				ads = allAds.filter(ad => ad.place === 'square');
+			}
+
+			const lowPriorityAds = ads.filter(ad => ad.ratio === 0);
+			ads = ads.filter(ad => ad.ratio !== 0);
+
+			if (ads.length === 0) {
+				if (lowPriorityAds.length !== 0) {
+					return lowPriorityAds[Math.floor(Math.random() * lowPriorityAds.length)];
+				} else {
+					return null;
+				}
+			}
+
+			const totalFactor = ads.reduce((a, b) => a + b.ratio, 0);
+			const r = Math.random() * totalFactor;
+
+			let stackedFactor = 0;
+			for (const ad of ads) {
+				if (r >= stackedFactor && r <= stackedFactor + ad.ratio) {
+					return ad;
+				} else {
+					stackedFactor += ad.ratio;
+				}
+			}
+
+			return null;
+		};
+
+		const chosen = ref(choseAd());
+
+		const reduceFrequency = () => {
+			if (chosen.value == null) return;
+			if (defaultStore.state.mutedAds.includes(chosen.value.id)) return;
+			defaultStore.push('mutedAds', chosen.value.id);
+			os.success();
+			chosen.value = choseAd();
+			showMenu.value = false;
+		};
+
+		return {
+			ad: chosen,
+			showMenu,
+			toggleMenu,
+			host,
+			reduceFrequency,
+		};
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.qiivuoyo {
+	background-size: auto auto;
+	background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--ad) 8px, var(--ad) 14px );
+
+	> .main {
+		text-align: center;
+
+		> a {
+			display: inline-block;
+			position: relative;
+			vertical-align: bottom;
+
+			&:hover {
+				> img {
+					filter: contrast(120%);
+				}
+			}
+
+			> img {
+				display: block;
+				object-fit: contain;
+				margin: auto;
+				border-radius: 5px;
+			}
+
+			> .menu {
+				position: absolute;
+				top: 1px;
+				right: 1px;
+
+				> .info-circle {
+					border: 3px solid var(--panel);
+					border-radius: 50%;
+					background: var(--panel);
+				}
+			}
+		}
+
+		&.square {
+			> a ,
+			> a > img {
+				max-width: min(300px, 100%);
+				max-height: 300px;
+			}
+		}
+
+		&.horizontal {
+			padding: 8px;
+
+			> a ,
+			> a > img {
+				max-width: min(600px, 100%);
+				max-height: 80px;
+			}
+		}
+
+		&.horizontal-big {
+			padding: 8px;
+
+			> a ,
+			> a > img {
+				max-width: min(600px, 100%);
+				max-height: 250px;
+			}
+		}
+
+		&.vertical {
+			> a ,
+			> a > img {
+				max-width: min(100px, 100%);
+			}
+		}
+	}
+
+	> .menu {
+		padding: 8px;
+		text-align: center;
+
+		> .body {
+			padding: 8px;
+			margin: 0 auto;
+			max-width: 400px;
+			border: solid 1px var(--divider);
+
+			> .button {
+				margin: 8px auto;
+			}
+		}
+	}
+}
+</style>

packages/client/src/components/global/avatar.vue

@@ -15,7 +15,7 @@ import * as misskey from 'misskey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
 import { acct, userPage } from '@/filters/user';
-import MkUserOnlineIndicator from '@/components/MkUserOnlineIndicator.vue';
+import MkUserOnlineIndicator from '@/components/user-online-indicator.vue';
 import { defaultStore } from '@/store';
 
 const props = withDefaults(defineProps<{

packages/client/src/components/global/error.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts" setup>
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import { i18n } from '@/i18n';
 </script>
 

packages/client/src/components/global/i18n.ts

@@ -30,7 +30,7 @@ export default defineComponent({
 			} else {
 				if (nextBracketOpen > 0) parsed.push(str.substr(0, nextBracketOpen));
 				parsed.push({
-					arg: str.substring(nextBracketOpen + 1, nextBracketClose),
+					arg: str.substring(nextBracketOpen + 1, nextBracketClose)
 				});
 			}
 
@@ -38,5 +38,5 @@ export default defineComponent({
 		}
 
 		return h(this.tag, parsed.map(x => typeof x === 'string' ? (this.textTag ? h(this.textTag, x) : x) : this.$slots[x.arg]()));
-	},
+	}
 });

packages/client/src/components/global/loading.vue

@@ -44,7 +44,7 @@ const props = withDefaults(defineProps<{
 	text-align: center;
 	cursor: wait;
 
-	--size: 38px;
+	--size: 40px;
 
 	&.colored {
 		color: var(--accent);

packages/client/src/components/global/page-header.vue

@@ -1,8 +1,5 @@
 <template>
 <div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-	<div v-if="narrow" class="buttons left">
-		<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
-	</div>
 	<template v-if="metadata">
 		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
 			<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
@@ -47,7 +44,6 @@ import { scrollToTop } from '@/scripts/scroll';
 import { i18n } from '@/i18n';
 import { globalEvents } from '@/events';
 import { injectPageMetadata } from '@/scripts/page-metadata';
-import { $i } from '@/account';
 
 type Tab = {
 	key?: string | null;
@@ -66,7 +62,6 @@ const props = defineProps<{
 		handler: (ev: MouseEvent) => void;
 	}[];
 	thin?: boolean;
-	displayMyAvatar?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -205,6 +200,7 @@ onUnmounted(() => {
 		> .titleContainer {
 			flex: 1;
 			margin: 0 auto;
+			margin-left: var(--height);
 
 			> *:first-child {
 				margin-left: auto;
@@ -220,24 +216,9 @@ onUnmounted(() => {
 		--margin: 8px;
 		display: flex;
     align-items: center;
-		min-width: var(--height);
 		height: var(--height);
 		margin: 0 var(--margin);
 
-		&.left {
-			margin-right: auto;
-
-			> .avatar {
-				$size: 32px;
-				display: inline-block;
-				width: $size;
-				height: $size;
-				vertical-align: bottom;
-				margin: 0 8px;
-				pointer-events: none;
-			}
-		}
-
 		&.right {
 			margin-left: auto;
 		}

packages/client/src/components/global/router-view.vue

@@ -4,7 +4,7 @@
 		<component :is="currentPageComponent" :key="key" v-bind="Object.fromEntries(currentPageProps)"/>
 
 		<template #fallback>
-			<MkLoading/>
+			Loading...
 		</template>
 	</Suspense>
 </KeepAlive>

packages/client/src/components/global/url.vue

@@ -18,39 +18,54 @@
 </component>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts">
-import { defineAsyncComponent, ref } from 'vue';
+import { defineAsyncComponent, defineComponent, ref } from 'vue';
 import { toUnicode as decodePunycode } from 'punycode/';
 import { url as local } from '@/config';
 import * as os from '@/os';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { safeURIDecode } from '@/scripts/safe-uri-decode';
 
-const props = defineProps<{
+export default defineComponent({
-	url: string;
+	props: {
-	rel?: string;
+		url: {
-}>();
+			type: String,
+			required: true,
+		},
+		rel: {
+			type: String,
+			required: false,
+			default: null,
+		},
+	},
+	setup(props) {
+		const self = props.url.startsWith(local);
+		const url = new URL(props.url);
+		const el = ref();
 		
-const self = props.url.startsWith(local);
+		useTooltip(el, (showing) => {
-const url = new URL(props.url);
+			os.popup(defineAsyncComponent(() => import('@/components/url-preview-popup.vue')), {
-const el = ref();
-
-useTooltip(el, (showing) => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 				showing,
 				url: props.url,
 				source: el.value,
 			}, {}, 'closed');
-});
+		});
 
-const schema = url.protocol;
+		return {
-const hostname = decodePunycode(url.hostname);
+			local,
-const port = url.port;
+			schema: url.protocol,
-const pathname = safeURIDecode(url.pathname);
+			hostname: decodePunycode(url.hostname),
-const query = safeURIDecode(url.search);
+			port: url.port,
-const hash = safeURIDecode(url.hash);
+			pathname: safeURIDecode(url.pathname),
-const attr = self ? 'to' : 'href';
+			query: safeURIDecode(url.search),
-const target = self ? null : '_blank';
+			hash: safeURIDecode(url.hash),
+			self: self,
+			attr: self ? 'to' : 'href',
+			target: self ? null : '_blank',
+			el,
+		};
+	},
+});
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/image-viewer.vue

@@ -17,7 +17,7 @@ import { } from 'vue';
 import * as misskey from 'misskey-js';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
-import MkModal from '@/components/MkModal.vue';
+import MkModal from '@/components/ui/modal.vue';
 
 const props = withDefaults(defineProps<{
 	image: misskey.entities.DriveFile;

packages/client/src/components/index.ts

@@ -1,22 +1,22 @@
 import { App } from 'vue';
 
-import Mfm from './global/MkMisskeyFlavoredMarkdown.vue';
+import Mfm from './global/misskey-flavored-markdown.vue';
-import MkA from './global/MkA.vue';
+import MkA from './global/a.vue';
-import MkAcct from './global/MkAcct.vue';
+import MkAcct from './global/acct.vue';
-import MkAvatar from './global/MkAvatar.vue';
+import MkAvatar from './global/avatar.vue';
-import MkEmoji from './global/MkEmoji.vue';
+import MkEmoji from './global/emoji.vue';
-import MkUserName from './global/MkUserName.vue';
+import MkUserName from './global/user-name.vue';
-import MkEllipsis from './global/MkEllipsis.vue';
+import MkEllipsis from './global/ellipsis.vue';
-import MkTime from './global/MkTime.vue';
+import MkTime from './global/time.vue';
-import MkUrl from './global/MkUrl.vue';
+import MkUrl from './global/url.vue';
 import I18n from './global/i18n';
-import RouterView from './global/RouterView.vue';
+import RouterView from './global/router-view.vue';
-import MkLoading from './global/MkLoading.vue';
+import MkLoading from './global/loading.vue';
-import MkError from './global/MkError.vue';
+import MkError from './global/error.vue';
-import MkAd from './global/MkAd.vue';
+import MkAd from './global/ad.vue';
-import MkPageHeader from './global/MkPageHeader.vue';
+import MkPageHeader from './global/page-header.vue';
-import MkSpacer from './global/MkSpacer.vue';
+import MkSpacer from './global/spacer.vue';
-import MkStickyContainer from './global/MkStickyContainer.vue';
+import MkStickyContainer from './global/sticky-container.vue';
 
 export default function(app: App) {
 	app.component('I18n', I18n);

packages/client/src/components/instance-card-mini.vue

@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
-import MkMiniChart from '@/components/MkMiniChart.vue';
+import MkMiniChart from '@/components/mini-chart.vue';
 import * as os from '@/os';
 
 const props = defineProps<{

packages/client/src/components/instance-stats.vue

@@ -68,7 +68,7 @@ import {
 	DoughnutController,
 } from 'chart.js';
 import MkSelect from '@/components/form/select.vue';
-import MkChart from '@/components/MkChart.vue';
+import MkChart from '@/components/chart.vue';
 import { useChartTooltip } from '@/scripts/use-chart-tooltip';
 import * as os from '@/os';
 import { i18n } from '@/i18n';

packages/client/src/components/launch-pad.vue

@@ -21,7 +21,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import MkModal from '@/components/MkModal.vue';
+import MkModal from '@/components/ui/modal.vue';
 import { navbarItemDef } from '@/navbar';
 import { instanceName } from '@/config';
 import { defaultStore } from '@/store';

packages/client/src/components/link.vue

@@ -26,7 +26,7 @@ const target = self ? null : '_blank';
 const el = $ref();
 
 useTooltip($$(el), (showing) => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
+	os.popup(defineAsyncComponent(() => import('@/components/url-preview-popup.vue')), {
 		showing,
 		url: props.url,
 		source: el,

packages/client/src/components/media-caption.vue

@@ -30,8 +30,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { length } from 'stringz';
-import MkModal from '@/components/MkModal.vue';
+import MkModal from '@/components/ui/modal.vue';
-import MkButton from '@/components/MkButton.vue';
+import MkButton from '@/components/ui/button.vue';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
 

packages/client/src/components/media-image.vue

@@ -24,7 +24,7 @@
 import { watch } from 'vue';
 import * as misskey from 'misskey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
+import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
 import { defaultStore } from '@/store';
 
 const props = defineProps<{