Merge branch 'master' of https://github.com/misskey-dev/misskey into stage

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Chinese Simplified)

.github/workflows/lint.yml

@@ -17,5 +17,9 @@ jobs:
     - uses: actions/setup-node@v1
       with:
         node-version: 12.x
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
     - run: yarn install
     - run: yarn lint

.github/workflows/test.yml

@@ -75,6 +75,10 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
     - name: Install dependencies
       run: yarn install
     - name: Check yarn.lock

.vscode/extensions.json

@@ -3,7 +3,7 @@
 		"editorconfig.editorconfig",
 		"eg2.vscode-npm-script",
 		"ms-vscode.typescript-javascript-grammar",
-		"ms-vscode.vscode-typescript-tslint-plugin",
+		"dbaeumer.vscode-eslint",
 		"johnsoncodehk.volar",
 		"sysoev.language-stylus"
 	]

CHANGELOG.md

@@ -7,6 +7,42 @@
 
 -->
 
+## 12.98.0 (2021/12/03)
+
+### Improvements
+- API: /antennas/notes API で日付による絞り込みができるように
+- クライアント: アンケートに投票する際に確認ダイアログを出すように
+- クライアント: Renoteなノート詳細ページから元のノートページに遷移できるように
+- クライアント: 画像ポップアップでクリックで閉じられるように
+- クライアント: デザインの調整
+- フォロワーを解除できる機能
+
+### Bugfixes
+- クライアント: LTLやGTLが無効になっている場合でもUI上にタブが表示される問題を修正
+- クライアント: ログインにおいてパスワードが誤っている際のエラーメッセージが正しく表示されない問題を修正
+- クライアント: リアクションツールチップ、Renoteツールチップのユーザーの並び順を修正
+- クライアント: サウンドのマスターボリュームが正しく保存されない問題を修正
+- クライアント: 一部環境において通知が表示されると操作不能になる問題を修正
+- クライアント: モバイルでタップしたときにツールチップが表示される問題を修正
+- クライアント: リモートインスタンスのノートに返信するとき、対象のノートにそのリモートインスタンス内のユーザーへのメンションが含まれていると、返信テキスト内にローカルユーザーへのメンションとして引き継がれてしまう場合がある問題を修正
+- クライアント: 画像ビューワーで全体表示した時に上側の一部しか表示されない画像がある問題を修正
+- API: ユーザーを取得時に条件によっては内部エラーになる問題を修正
+
+### Changes
+- クライアント: ノートにモデレーターバッジを表示するのを廃止
+
+## 12.97.0 (2021/11/19)
+
+### Improvements
+- クライアント: 返信先やRenoteに対しても自動折りたたみされるように
+- クライアント: 長いスレッドの表示を改善
+- クライアント: 翻訳にもMFMを適用し、元の文章の改行などを保持するように
+- クライアント: アカウント削除に確認ダイアログを出すように
+
+### Bugfixes
+- クライアント: ユーザー検索の「全て」が動作しない問題を修正
+- クライアント: リアクション一覧、Renote一覧ツールチップのスタイルを修正
+
 ## 12.96.1 (2021/11/13)
 ### Improvements
 - npm scriptの互換性を向上

CONTRIBUTING.md

@@ -49,6 +49,11 @@ If your language is not listed in Crowdin, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
+## Development
+During development, it is useful to use the `npm run dev` command.
+This command monitors the server-side and client-side source files and automatically builds them if they are modified.
+In addition, it will also automatically start the Misskey server process.
+
 ## Testing
 - Test codes are located in [`/test`](/test).
 

Dockerfile

@@ -29,7 +29,6 @@ COPY --from=builder /misskey/built ./built
 COPY --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
 COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
 COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules
-COPY --from=builder /misskey/packages/client/built ./packages/client/built
 COPY . ./
 
 CMD ["npm", "run", "migrateandstart"]

README.md

@@ -1,116 +1,57 @@
-[![Misskey](/assets/about/banner.svg)](https://join.misskey.page/)
+[![Misskey](https://github.com/misskey-dev/assets/blob/main/banner.png?raw=true)](https://join.misskey.page/)
-
-<h1 align="center">Misskey</h1>
 
 <div align="center">
 
-[![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey)
+**🌎 A forever evolving, interplanetary microblogging platform. 🚀**
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
-[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
 
-**A forever evolving, interplanetary microblogging platform.**
+**Misskey** is a distributed microblogging platform with advanced features such as Reactions and a highly customizable UI.
 
-<a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
+[Learn more](https://misskey-hub.net/)
-Since it exists within the Fediverse (a universe where various social media platforms are organized),
+
-it is mutually linked with other social media platforms.
+---
-Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://join.misskey.page/">Find an instance!</a>
+
+[✨ Find an instance](https://misskey-hub.net/instances.html)
+•
+[📦 Create your own instance](https://misskey-hub.net/docs/install.html)
+•
+[🛠️ Contribute](./CONTRIBUTING.md)
+•
+[🚀 Join the community](https://discord.gg/Wp8gVStHW3)
+
+---
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
 
 </div>
 
----
+<div>
 
-Do you have a question? Or are you experiencing trouble?
+<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai.png?raw=true" align="right" height="320px"/></a>
-Visit [our forum](https://forum.misskey.io/)!
 
----
+## ✨ Features
+- **ActivityPub support**\
+	It is possible to interact with other software.
+- **Reactions**\
+	You can add "reactions" to each post, making it easy for you to express your feelings.
+- **Drive**\
+	An interface to manage uploaded files such as images, videos, sounds, etc.
+	You can also organize your favorite content into folders, making it easy to share again.
+- **Rich Web UI**\
+	Misskey has a rich WebUI by default.
+	It is highly customizable by flexibly changing the layout and installing various widgets and themes.
+	Furthermore, plug-ins can be created using AiScript, a original programming language.
+- and more...
 
-![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
+</div>
 
-:sparkles: Features
+<div style="clear: both;"></div>
-----------------------------------------------------------------
-<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
-<h3>Posting</h3>
+## Sponsors
-<p>
-Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
-</p>
-
----
-
-<h3 >Reactions</h3>
-<p>
-Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
-</p>
-
----
-
-<h3>Interface</h3>
-<p>
-Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
-</p>
-
----
-
-<h3>Misskey Drive</h3>
-<p>
-Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
-</p>
-
----
-
-...and more!
-
-:package: Create your own instance
-----------------------------------------------------------------
-Please see the [Setup and Installation Guide](https://misskey-hub.net/docs/install/install.html).
-
-:wrench: Contribution
-----------------------------------------------------------------
-Please see the [Contribution Guide](./CONTRIBUTING.md).
-
-### Collaborators
-<table>
-	<tr>
-		<td><img src="https://avatars3.githubusercontent.com/u/4439005?s=460&v=4" alt="syuilo" width="100"></td>
-		<td><img src="https://avatars0.githubusercontent.com/u/10798641?s=460&v=4" alt="AyaMorisawa" width="100"></td>
-		<td><img src="https://avatars1.githubusercontent.com/u/30769358?s=460&v=4" alt="mei23" width="100"></td>
-		<td><img src="https://avatars2.githubusercontent.com/u/20679825?s=460&v=4" alt="acid-chicken" width="100"></td>
-		<td><img src="https://avatars2.githubusercontent.com/u/6533808?s=460&v=4" alt="rinsuki" width="100"></td>
-		<td><img src="https://avatars0.githubusercontent.com/u/7973572?s=460&v=4" alt="tamaina" width="100"></td>
-		<td><img src="https://avatars1.githubusercontent.com/u/7106976?s=460&v=4" alt="Xeltica" width="100"></td>
-		<td><img src="https://avatars1.githubusercontent.com/u/17376330?s=460&v=4" alt="u1-liquid" width="100"></td>
-	</tr>
-	<tr>
-		<td align="center"><a href="https://github.com/syuilo">@syuilo</a></td>
-		<td align="center"><a href="https://github.com/AyaMorisawa">@AyaMorisawa</a></td>
-		<td align="center"><a href="https://github.com/mei23">@mei23</a></td>
-		<td align="center"><a href="https://github.com/acid-chicken">@acid-chicken</a></td>
-		<td align="center"><a href="https://github.com/rinsuki">@rinsuki</a></td>
-		<td align="center"><a href="https://github.com/tamaina">@tamaina</a></td>
-		<td align="center"><a href="https://github.com/Xeltica">@Xeltica</a></td>
-		<td align="center"><a href="https://github.com/u1-liquid">@u1-liquid</a></td>
-	</tr>
-</table>
-
----
-
-To receive updates of this repo, follow [@repo@misskey.io](https://misskey.io/@repo) on fediverse.
-
-Related projects
-----------------------------------------------------------------
-- [misskey.js](https://github.com/misskey-dev/misskey.js) - Misskey SDK for JavaScript
-- [mfm.js](https://github.com/misskey-dev/mfm.js) - MFM parser
-
-Sponsors
-----------------------------------------------------------------
 <div align="center">
 	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank" style="display: inline-block;"><img src="https://rss3.io/assets/images/Logo.svg" alt="RSS3" style="display: inline-block; height: 60px;"></a>
 </div>
 
-:heart: Backers
+## Backers
-----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
 <td><img src="https://c8.patreon.com/2/200/20832595" alt="Roujo " width="100"></td>

gulpfile.js

@@ -57,6 +57,6 @@ gulp.task('default', gulp.task('build'));
 
 gulp.task('watch', () => {
 	gulp.watch([
-		'./packages/**/*',
+		'./packages/*/src/**/*',
 	], { ignoreInitial: false }, gulp.task('build'));
 });

locales/cs-CZ.yml

@@ -52,6 +52,7 @@ searchUser: "Vyhledat uživatele"
 reply: "Odpovědět"
 loadMore: "Zobrazit více"
 showMore: "Zobrazit více"
+youGotNewFollower: "Máte nového následovníka"
 mention: "Zmínění"
 mentions: "Zmínění"
 importAndExport: "Import a export"
@@ -163,6 +164,7 @@ clearQueue: "Vyčistit frontu"
 clearQueueConfirmTitle: "Jste si jisti že zrušit všechny úlohy ve frontě?"
 clearCachedFiles: "Vyprázdnit mezipaměť"
 blockedInstances: "Blokované instance"
+noUsers: "Žádní uživatelé"
 editProfile: "Upravit můj profil"
 pinLimitExceeded: "Nemůžete připnout další poznámky."
 intro: "Instalace Misskey byla dokončena! Prosím vytvořte admina."
@@ -170,6 +172,7 @@ done: "Hotovo"
 processing: "Zpracovávám"
 preview: "Náhled"
 default: "Výchozí"
+noCustomEmojis: "Bez Emoji"
 blocked: "Blokováno"
 suspended: "Suspendováno"
 all: "Vše"
@@ -402,6 +405,9 @@ smtpPass: "Heslo"
 clearCache: "Vyprázdnit mezipaměť"
 info: "Informace"
 user: "Uživatelé"
+_email:
+  _follow:
+    title: "Máte nového následovníka"
 _mfm:
   mention: "Zmínění"
   quote: "Citovat"
@@ -464,6 +470,7 @@ _pages:
     types:
       array: "Seznamy"
 _notification:
+  youWereFollowed: "Máte nového následovníka"
   youWereInvitedToGroup: "Pozvat do skupiny"
   _types:
     follow: "Sledovaní"

locales/de-DE.yml

@@ -620,6 +620,8 @@ reportAbuse: "Melden"
 reportAbuseOf: "{name} melden"
 fillAbuseReportDescription: "Bitte gib zusätzliche Informationen zu dieser Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
 abuseReported: "Die Meldung wurde versendet. Vielen Dank."
+reporteeOrigin: "Herkunft des Gemeldeten"
+reporterOrigin: "Herkunft des Meldenden"
 send: "Senden"
 abuseMarkAsResolved: "Meldung als gelöst markieren"
 openInNewTab: "In neuem Tab öffnen"
@@ -790,17 +792,35 @@ pubSub: "Pub/Sub Benutzerkonten"
 lastCommunication: "Letzte Kommunikation"
 resolved: "Gelöst"
 unresolved: "Ungelöst"
+breakFollow: "Follower entfernen"
 itsOn: "Eingeschaltet"
 itsOff: "Ausgeschaltet"
 emailRequiredForSignup: "Angaben einer Email-Adresse als benötigt markieren"
 unread: "Ungelesen"
 filter: "Filter"
+controlPanel: "Systemsteuerung"
 manageAccounts: "Benutzerkonten verwalten"
 makeReactionsPublic: "Reaktionsverlauf veröffentlichen"
 makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktionen einsehen können."
 classic: "Classic"
 muteThread: "Thread stummschalten"
 unmuteThread: "Threadstummschaltung aufheben"
+ffVisibility: "Sichtbarkeit von Gefolgten/Followern"
+ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer dir folgt."
+continueThread: "Weiteren Threadverlauf anzeigen"
+deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
+incorrectPassword: "Falsches Passwort."
+voteConfirm: "Wirklich für \"{choice}\" abstimmen?"
+_emailUnavailable:
+  used: "Diese Email-Adresse wird bereits verwendet"
+  format: "Das Format dieser Email-Adresse ist ungültig"
+  disposable: "Wegwerf-Email-Adressen können nicht verwendet werden"
+  mx: "Dieser Email-Server ist ungültig"
+  smtp: "Dieser Email-Server antwortet nicht"
+_ffVisibility:
+  public: "Öffentlich"
+  followers: "Nur für Follower sichtbar"
+  private: "Privat"
 _signup:
   almostThere: "Fast geschafft"
   emailAddressInfo: "Bitte gib deine Email-Adresse ein."
@@ -812,13 +832,6 @@ _accountDelete:
   requestAccountDelete: "Löschung des Benutzerkontos anfordern"
   started: "Löschung wurde eingeleitet."
   inProgress: "Löschung in Bearbeitung"
-_docs:
-  continueReading: "Mehr lesen"
-  features: "Funktionen"
-  generalTopics: "Allgemeine Themen"
-  advancedTopics: "Erweiterte Themen"
-  admin: "Administration"
-  translateWarn: "Dies ist ein übersetztes Dokument. Es kann zu Unterschieden mit dem Original kommen."
 _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
@@ -921,6 +934,8 @@ _mfm:
   rainbowDescription: "Lässt den Inhalt in Regenbogenfarben erscheinen."
   sparkle: "Glitzer"
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
+  rotate: "Drehen"
+  rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel"
 _reversi:
   reversi: "Reversi"
   gameSettings: "Spieleinstellungen"

locales/en-US.yml

@@ -620,6 +620,8 @@ reportAbuse: "Report"
 reportAbuseOf: "Report {name}"
 fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific note, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
+reporteeOrigin: "Reportee Origin"
+reporterOrigin: "Reporter Origin"
 send: "Send"
 abuseMarkAsResolved: "Mark report as resolved"
 openInNewTab: "Open in new tab"
@@ -802,6 +804,22 @@ makeReactionsPublicDescription: "This will make the list of all your past reacti
 classic: "Classic"
 muteThread: "Mute thread"
 unmuteThread: "Unmute thread"
+ffVisibility: "Follows/Followers Visibility"
+ffVisibilityDescription: "Allows you to configure who can see who you follow and who follows you."
+continueThread: "View thread continuation"
+deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
+incorrectPassword: "Incorrect password."
+voteConfirm: "Confirm your vote for \"{choice}\"?"
+_emailUnavailable:
+  used: "This email address is already being used"
+  format: "The format of this email address is invalid"
+  disposable: "Disposable email addresses may not be used"
+  mx: "This email server is invalid"
+  smtp: "This email server is not responding"
+_ffVisibility:
+  public: "Public"
+  followers: "Visible to followers only"
+  private: "Private"
 _signup:
   almostThere: "Almost there"
   emailAddressInfo: "Please enter your email address."
@@ -813,13 +831,6 @@ _accountDelete:
   requestAccountDelete: "Request account deletion"
   started: "Deletion has been started."
   inProgress: "Deletion is currently in progress"
-_docs:
-  continueReading: "Read more"
-  features: "Features"
-  generalTopics: "General topics"
-  advancedTopics: "Advanced Topics"
-  admin: "Administration"
-  translateWarn: "This is a translated document. Its contents may differ from the original."
 _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
@@ -922,6 +933,8 @@ _mfm:
   rainbowDescription: "Makes the content appear in rainbow colors."
   sparkle: "Sparkle"
   sparkleDescription: "Gives content a sparkling particle effect."
+  rotate: "Rotate"
+  rotateDescription: "Turns content by a specified angle."
 _reversi:
   reversi: "Reversi"
   gameSettings: "Game settings"

locales/eo-UY.yml

@@ -2,18 +2,18 @@
 _lang_: "Esperanto"
 headlineMisskey: "Jen la reto konektata de notoj"
 introMisskey: "Bonvenon! Misskey estas malfermitkoda malcentraliza etbloga servo.\nKreu \"noto\"n por paroli vian penson al iuj ĉirkaŭ vi. 📡\nLa funkcion \"reago\" ebligas esprimi rapide vian senton pri ies noto en Fediverso. 👍\nBonvole esploru novan mondon. 🚀"
-monthAndDay: "{{day}}/{{month}}"
+monthAndDay: "la {day}a de la {month}a"
 search: "Serĉi"
 notifications: "Sciigoj"
 username: "Uzantnomo"
 password: "Pasvorto"
 forgotPassword: "Ĉu vi forgesis pasvorton?"
-fetchingAsApObject: "Informpetado de kunfederaĵo…"
+fetchingAsApObject: "Informpetado de la Fediverso…"
-ok: "Akcepteble"
+ok: "OK"
-gotIt: "Mi komprenas"
+gotIt: "Kompreni"
 cancel: "Nuligi"
 enterUsername: "Entajpu uzantnomon"
-renotedBy: "Noto plusendita de {user}"
+renotedBy: "Plusendita de {user}"
 noNotes: "Neniu noto!"
 noNotifications: "Vi ne havas sciigojn."
 instance: "Nodo"
@@ -23,7 +23,7 @@ otherSettings: "Aliaj agordoj"
 openInWindow: "Malfermi en fenestro"
 profile: "Profilo"
 timeline: "Templinio"
-noAccountDescription: "Neniu priskribo"
+noAccountDescription: "Neniu sinprezento"
 login: "Ensaluti"
 loggingIn: "Ensalutado…"
 logout: "Elsaluti"
@@ -35,28 +35,28 @@ addUser: "Aldoni uzanton"
 favorite: "Preferi"
 favorites: "Preferaĵoj"
 unfavorite: "Malpreferi"
-favorited: "Aldonita al via listo de preferaĵoj."
+favorited: "Aldonita al viaj preferaĵoj."
-alreadyFavorited: "Ĝi jam estis aldonita al via listo de preferaĵoj."
+alreadyFavorited: "Jam aldonita al viaj preferaĵoj."
-cantFavorite: "Ne aldonita al via listo de preferaĵoj."
+cantFavorite: "Oni ne povis aldoni al viaj preferaĵoj."
 pin: "Alpingli"
 unpin: "Depingli"
 copyContent: "Kopii enhavon"
 copyLink: "Kopii ligilon"
 delete: "Forviŝi"
-deleteAndEdit: "Redakti foriginte"
+deleteAndEdit: "Forviŝi kaj redakti"
-deleteAndEditConfirm: "Ĉu vi certas, ke vi volas forigi kaj redakti la noton? Tio forviŝos reagojn, plusendojn, kaj respondojn ĉiujn de ĝi."
+deleteAndEditConfirm: "Ĉu vi certas ke vi volas redakti foriginte la noton? Tio forviŝos reagojn, plusendojn, kaj respondojn ĉiujn apartenantajn al ĝi."
 addToList: "Aldoni al listo"
 sendMessage: "Sendi mesaĝon"
 copyUsername: "Kopii uzantnomon"
 searchUser: "Serĉi uzanton"
 reply: "Respondi"
-loadMore: "Vidu pli"
+loadMore: "Vidi pli"
 showMore: "Vidi pli"
 youGotNewFollower: "eksekvis vin"
 receiveFollowRequest: "Peto de sekvado estas ricevita"
 followRequestAccepted: "La peto de sekvado akceptita"
 mention: "Mencioj"
-mentions: "Al vi"
+mentions: "Mencioj"
 directNotes: "Rekte senditaj"
 importAndExport: "Importi/eksporti"
 import: "Importi"
@@ -77,19 +77,22 @@ manageLists: "Administri liston"
 error: "Eraro"
 somethingHappened: "Problemo okazis"
 retry: "Provi denove"
+serverIsDead: "La servilo ne respondas. Vole atendu iom kaj penu denove."
 enterListName: "Entajpu nomon de la listo"
 privacy: "Privateco"
-defaultNoteVisibility: "Implicitaĵo de videbleco"
+makeFollowManuallyApprove: "Eksekvi vin devas peti al vi"
+defaultNoteVisibility: "Implicita videbleco de la noto"
 follow: "Sekvi"
 followRequest: "Peti de sekvado"
 followRequests: "Petoj de sekvado"
 unfollow: "Ne plu sekvi"
+followRequestPending: "Atendado akcepti vian peton de eksekvado"
 enterEmoji: "Entajpu emoĵion"
 renote: "Plusendi la noton"
-unrenote: "Malfari plusendadon"
+unrenote: "Malfari plusendon"
 renoted: "Sukcese plusendita"
 cantRenote: "Oni ne povas plusendi la noton."
-cantReRenote: "Plusendo de noto ne estas plusendebla."
+cantReRenote: "Plusendo ne estas plusendebla."
 quote: "Citi"
 pinnedNote: "Alpinglita noto"
 pinned: "Alpingli"
@@ -98,11 +101,12 @@ clickToShow: "Klaku por malkaŝu"
 sensitive: "Enhavo ne estas deca por laborejo (NSFW)"
 add: "Aldoni"
 reaction: "Reagoj"
-rememberNoteVisibility: "Rememoru videblecon de la noto laste sendita "
+reactionSettingDescription: "Agordi la reagojn kiujn vi volas prefere montrigi ĉe la elektilo de reagoj"
+rememberNoteVisibility: "Rememori la agordon de videbleco de la laste sendita"
 attachCancel: "Deigi aldonaĵon"
 markAsSensitive: "Troviĝi NSFW"
 unmarkAsSensitive: "Ne troviĝi NSFW"
-enterFileName: "Entajpu nomon de dosiero"
+enterFileName: "Entajpu nomon de la dosiero"
 mute: "Silentigi"
 unmute: "Malsilentigi"
 block: "Bloki"
@@ -118,16 +122,16 @@ selectAntenna: "Elekti antenon"
 selectWidget: "Elekti enestraĵon"
 editWidgets: "Redakti fenestraĵon"
 editWidgetsExit: "Fini la redaktadon"
-customEmojis: "Personecigitaj emoĵioj"
 emoji: "Emoĵio"
 emojis: "Emoĵio"
-emojiName: "Nomo de emoĵio"
+emojiName: "Nomo de la emoĵio"
 emojiUrl: "URL de la emoĵio"
 addEmoji: "Aldoni emoĵion"
 settingGuide: "Agordaj rekomendoj"
-cacheRemoteFiles: "Stapli transajn dosierojn"
+cacheRemoteFiles: "Stapli forajn dosierojn"
-flagAsBot: "Agordo por robota uzanto"
+flagAsBot: "Fari la flagon por robota uzanto"
-flagAsCat: "Agordo de katiĝa uzanto"
+flagAsCat: "Fari la flagon por kat-iĝi"
+autoAcceptFollowed: "Aŭtomate akcepti la peton de sekvado far uzantoj kiujn vi sekvas"
 addAccount: "Aldoni konton"
 showOnRemote: "Vidi ĉe la surloka nodo"
 general: "Ĝenerala"
@@ -137,17 +141,18 @@ removeWallpaper: "Forviŝi ekranfonon. "
 searchWith: "Serĉi: {q}"
 youHaveNoLists: "Vi ne havas listojn."
 followConfirm: "Ĉu vi certas ke vi volas sekvi {name}'(o)n?"
-host: "Gastigo"
+host: "Nodo"
 selectUser: "Elekti uzanton"
 recipient: "Ricevonto"
 annotation: "Komentarioj"
-federation: "Kunfederaĵo"
+federation: "Federaĵo"
 instances: "Nodoj"
 latestRequestSentAt: "Lastatempa sendo"
 latestRequestReceivedAt: "Lastatempa ricevo"
 latestStatus: "Laŭstato"
-perHour: "Po horo"
+charts: "Diagramoj"
-perDay: "Po tago"
+perHour: "por horo"
+perDay: "por tago"
 blockThisInstance: "Bloki la nodon"
 operations: "Agoj"
 software: "Programaro"
@@ -156,75 +161,86 @@ metadata: "Metadatumoj"
 withNFiles: "{n} dosiero(j)"
 monitor: "Monitoro"
 network: "Reto"
-disk: "Diskilo"
+disk: "Disko"
 instanceInfo: "Informoj pri la nodo"
 statistics: "Statistikoj"
 clearCachedFiles: "Malplenigi la staplon"
-clearCachedFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn transajn dosierojn en la staplo?"
+clearCachedFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn forajn dosierojn en la staplo?"
 blockedInstances: "Blokitaj nodoj"
-muteAndBlock: "Silentigitoj kaj blokitoj"
+muteAndBlock: "Silentigi / Bloki"
 mutedUsers: "Silentigitaj uzantoj"
 blockedUsers: "Blokitaj uzantoj"
-noUsers: "Sen uzantoj"
+noUsers: "Neniu uzanto"
 editProfile: "Redakti profilon"
 noteDeleteConfirm: "Ĉu vi certas ke vi volas forviŝi la noton?"
-pinLimitExceeded: "Vi povas alpingli ne pli noton."
+pinLimitExceeded: "Vi ne povas alpingli pli"
 done: "Fini"
 processing: "Prilaborado…"
 preview: "Antaŭmontro"
+default: "Implicitaĵo"
 noCustomEmojis: "Neniu emoĵio"
-federating: "Nun kunfederanta"
+noJobs: "Neniu laboro"
-blocked: "Blokita"
+federating: "Federantaj"
-suspended: "Suspendita"
+blocked: "Blokitaj"
+suspended: "Suspenditaj"
 all: "Ĉiuj"
-subscribing: "Abonata"
+subscribing: "Abonitaj"
-publishing: "Al kiu dissendas"
+publishing: "Abonintaj"
 notResponding: "Alvokato ne disponeblas"
 instanceFollowing: "Sekvatoj en la nodo"
 instanceFollowers: "Sekvantoj el la nodo"
-instanceUsers: "Uzantoj de tiu ĉi nodo"
+instanceUsers: "Uzantoj de la nodo"
 changePassword: "Ŝanĝi pasvorton"
 security: "Sekureco"
-retypedNotMatch: "Enigitoj ne estas konformaj."
+retypedNotMatch: "La enigitoj ne estas konformaj."
 currentPassword: "Aktuala pasvorto"
 newPassword: "Nova pasvorto"
 newPasswordRetype: "Reentajpu la novan pasvorton"
 attachFile: "Aldoni dosieron"
-more: "Plu!"
+more: "Pli!"
 featured: "Maksimumi"
 usernameOrUserId: "Uzantnomo aŭ identigilo de uzanto"
-noSuchUser: "Neniuj uzantoj trovitaj."
+noSuchUser: "Neniuj uzantoj trovitaj"
 lookup: "Informpeti"
 announcements: "Novaĵoj"
-imageUrl: "URL de bildo"
+imageUrl: "URL de la bildo"
 remove: "Forigi"
-removed: "Forviŝis"
+removed: "Forigita"
-removeAreYouSure: "Ĉu vi certas ke vi volas forigi \"{x}\"'(o)n?"
+removeAreYouSure: "Ĉu vi certas ke vi volas forigi \"{x}\"n?"
-deleteAreYouSure: "Ĉu vi certas ke vi volas forviŝi \"{x}\"'(o)n?"
+deleteAreYouSure: "Ĉu vi certas ke vi volas forviŝi \"{x}\"'?"
+resetAreYouSure: "Ĉu vi certas restarigi?"
 saved: "Konservita"
 messaging: "Retbabili"
 upload: "Alŝuti"
 fromDrive: "De la disko"
 fromUrl: "De URL"
 uploadFromUrl: "Alŝuti de URL"
-uploadFromUrlDescription: "URL de dosiero kiun vi volas alŝuti"
+uploadFromUrlDescription: "URL de la dosiero kiun vi volas alŝuti"
+uploadFromUrlRequested: "La alŝutado estis patita"
 explore: "Esplori"
 games: "Miskiaj Ludoj"
 messageRead: "Legita"
+noMoreHistory: "Ne plu de la historio"
 startMessaging: "Komenci babiladon"
 nUsersRead: "Legita de {n} homoj"
+agreeTo: "Mi akceptas {0}'(o)n"
 tos: "Kondiĉoj de uzado"
 start: "Komenciĝi"
 home: "Hejma"
-remoteUserCaution: "Ĉi tiuj infomoj ne estas tute ekzaktaj pro transa uzanto."
+remoteUserCaution: "Ĉi tiuj infomoj de la uzanto el fora nodo, ne estas tute ekzaktaj."
 activity: "Aktiveco"
 images: "Bildoj"
 birthday: "Naskiĝdato"
+yearsOld: "{age} jaroj aĝa"
 registeredDate: "Dato de registriĝo"
-location: "Loko"
+location: "Kie"
 theme: "Koloraro"
+themeForLightMode: "Luma kolararo en la luma modo"
+themeForDarkMode: "Malluma kolararo en la malluma modo"
 light: "Luma"
 dark: "Malluma"
+lightThemes: "Luma koloraro"
+darkThemes: "Malluma koloraro"
 drive: "Disko"
 fileName: "Dosiernomo"
 selectFile: "Elekti dosieron"
@@ -239,19 +255,24 @@ deleteFolder: "Forviŝi dosierujon"
 addFile: "Aldoni dosieron"
 emptyDrive: "La disko malplenas"
 emptyFolder: "La dosierujo malplenas"
-unableToDelete: "Ne forigebla"
+unableToDelete: "Ne forviŝebla"
-inputNewFileName: "Entajpu nova nomon de la dosiero"
+inputNewFileName: "Entajpu novan nomon de la dosiero"
-inputNewFolderName: "Entajpu nova nomon de la dosierujo"
+inputNewDescription: "Entajpu novan priskribon"
+inputNewFolderName: "Entajpu novan nomon de la dosierujo"
 hasChildFilesOrFolders: "La dosierujo ne estas forviŝebla, ĉar ĝi ne malplenas."
 copyUrl: "Kopii URL"
 rename: "Alinomi"
 avatar: "Ikono"
 banner: "Standardo"
 nsfw: "Enhavo ne estas deca por laborejo (NSFW)"
+disconnectedFromServer: "Malkonektita de servilo"
 reload: "Reŝargi"
+doNothing: "Ignori"
+reloadConfirm: "Ĉu vi volas reŝargi?"
 watch: "Observi"
 unwatch: "Malobservi"
 accept: "Permesi"
+reject: "Malakcepti"
 normal: "Normala"
 instanceName: "Nomo de la nodo"
 instanceDescription: "Priskribo de la nodo "
@@ -265,6 +286,7 @@ dayX: "{day}a"
 monthX: "La {month}a monato"
 yearX: "La jaro {year}"
 pages: "Paĝoj"
+integration: "Integri"
 connectService: "Konekti"
 disconnectService: "Farkonektiĝi"
 enableLocalTimeline: "Ebligi lokan templinion"
@@ -273,23 +295,28 @@ registration: "Registri"
 enableRegistration: "Ebligi novan uzanton registriĝon"
 invite: "Inviti"
 driveCapacityPerLocalAccount: "Volumo de disko po unu loka uzanto"
-driveCapacityPerRemoteAccount: "Volumo de disko po unu transa uzanto"
+driveCapacityPerRemoteAccount: "Volumo de disko po unu fora uzanto"
 iconUrl: "URL de la ikono (retpaĝsimbolo, ktp)"
 bannerUrl: "URL de standardo"
 backgroundImageUrl: "URL de fona bildo"
 basicInfo: "Baza informo"
 pinnedUsers: "Alpinglita uzanto"
+pinnedUsersDescription: "Listigu uzantnomojn apartige en ĉiu linio por alpingli al la paĝoj ekz \"Esplori\"."
 pinnedPages: "Alpinglitaj paĝoj"
+pinnedPagesDescription: "Listigu dosierindiko apartige en ĉiu linio por alpingli al la ĉefpaĝo de la nodo."
 pinnedNotes: "Alpinglita noto"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Ebligi hCaptcha"
 hcaptchaSiteKey: "Reteja ŝlosilo"
 hcaptchaSecretKey: "Sekreta ŝlosilo"
 recaptcha: "reCAPTCHA"
-enableRecaptcha: "Ebligi reCAPTCHA'on"
+enableRecaptcha: "Ebligi reCAPTCHA"
 recaptchaSiteKey: "Reteja ŝlosilo"
 recaptchaSecretKey: "Sekreta ŝlosilo"
 antennas: "Antenoj"
 manageAntennas: "Administri antenojn"
 name: "Nomo"
+antennaSource: "Fonto de la anteno"
 notifyAntenna: "Oni sciigos novajn notojn"
 withFileAntenna: "Nur kun aldonaĵo"
 withReplies: "Inkluzive respondoj"
@@ -311,29 +338,35 @@ userList: "Listoj"
 about: "Informoj"
 aboutMisskey: "Pri Misskey"
 administrator: "Administranto"
+token: "Ĵetono"
 twoStepAuthentication: "Dua-faktora aŭtentiko"
 moderator: "Kontrolisto"
 nUsersMentioned: "{n} uzanto(j) menciis"
 securityKey: "Sekureca ŝlosilo"
 securityKeyName: "Nomo de la ŝlosilo"
+registerSecurityKey: "Registri ŝlosilon de sekureco"
 lastUsed: "Plej malnove uzita"
 unregister: "Malregistriĝi"
 passwordLessLogin: "Ensaluti sen pasvorto"
 resetPassword: "Restarigi pasvorton"
 newPasswordIs: "La nova pasvorto estas {password}."
-share: "Diskonigi"
+reduceUiAnimation: "Redukti la animacioj de la fasado"
+share: "Kundividi"
 notFound: "Ne trovita"
 cacheClear: "Malplenigi staplon"
-markAsReadAllNotifications: "Marki ĉiujn sciigojn kiel legito"
+markAsReadAllNotifications: "Marki ĉiujn sciigojn kiel legita"
 help: "Manlibro de uzado"
 inputMessageHere: "Entajpu masaĝo tie ĉi"
 close: "Fermi"
 group: "Grupo"
 groups: "Grupoj"
 createGroup: "Krei grupon"
+ownedGroups: "Administrataj grupoj"
+joinedGroups: "Al grupoj kiuj vi aliĝis"
 invites: "Inviti"
 groupName: "Grupa nomo"
 members: "Membroj"
+transfer: "Movi"
 messagingWithUser: "Babili private"
 messagingWithGroup: "Babili grupe"
 title: "Titolo"
@@ -342,6 +375,7 @@ enable: "Ebligi"
 next: "Sekve"
 retype: "Retajpu"
 noteOf: "Noto de {user}"
+inviteToGroup: "Inviti al grupo"
 quoteAttached: "Kun citaĵo"
 quoteQuestion: "Ĉu vi aldonas citaĵon?"
 noMessagesYet: "Ankoraŭ neniu mesaĝo"
@@ -350,27 +384,38 @@ onlyOneFileCanBeAttached: "Oni povas aldoni nur unu dosieron po mesaĝo."
 signinRequired: "Bonvolu ensaluti"
 invitations: "Inviti"
 invitationCode: "Invita kodo"
+available: "Disposabla"
 unavailable: "Ne disponebla"
+usernameInvalidFormat: "La uzantnomo povas enhavi minusklajn kaj majusklajn literojn, numerojn, nur kaj '_'."
+tooShort: "Tro mallonga"
+tooLong: "Tro longa"
+weakPassword: "Malforta pasvorto"
+normalPassword: "Normala pasvorto"
+strongPassword: "Forta pasvorto"
 passwordMatched: "Konforma"
 passwordNotMatched: "Nekonforma"
+signinWith: "Ensaluti kun {x}"
 or: "Aŭ"
 language: "Lingvo"
 uiLanguage: "Lingvo de fasado"
 aboutX: "Pri {x}"
-useOsNativeEmojis: "Oni uzas la emoĵioj de la denaska sistemo"
+useOsNativeEmojis: "Uzi la emoĵiojn implicitan de la operaciumo"
 youHaveNoGroups: "Neniuj grupoj"
+noHistory: "Neniom historio"
+signinHistory: "Historio de aliroj al la konto"
 doing: "Traktado..."
 category: "Kategorio"
 tags: "Etikedoj"
+docSource: "Fonto de la dokumento"
 createAccount: "Krei konton"
 existingAccount: "Ekzista konto"
 regenerate: "Regeneri"
 fontSize: "Tipara grando"
 noFollowRequests: "Vi ne havas peto de sekvado"
-openImageInNewTab: "Fermi la bildon en nova tablo"
+openImageInNewTab: "Malfermi la bildojn en nova tablo"
 dashboard: "Stirpanelo"
 local: "Loka"
-remote: "Transa"
+remote: "Fora"
 total: "Entute"
 appearance: "Eksteraĵo"
 clientSettings: "Agordoj de kliento"
@@ -378,6 +423,7 @@ accountSettings: "Agordoj de konto"
 numberOfDays: "Nombro de tagoj"
 hideThisNote: "Kaŝi la noton"
 objectStorageBaseUrl: "Baza URL"
+objectStoragePrefix: "Prefix"
 objectStorageRegion: "Regiono"
 objectStorageUseSSL: "Oni uzas SSL"
 serverLogs: "Servila protokolo"
@@ -390,8 +436,9 @@ showInPage: "Vidi en paĝo"
 popout: "Superigi"
 volume: "Laŭteco"
 masterVolume: "Baza laŭteco"
+details: "Detaloj"
 chooseEmoji: "Elekti emoĵion"
-recentUsed: "Lastatempaj uzitaj"
+recentUsed: "Lastatempe uzitaj"
 install: "Instali"
 uninstall: "Malinstali"
 installedApps: "Instalita programo"
@@ -400,18 +447,23 @@ installedDate: "Dato de instalado"
 lastUsedDate: "Lastfoje uzita je"
 state: "Stato"
 sort: "Ordigado"
+ascendingOrder: "Kreski"
+descendingOrder: "Malkreski"
+scratchpad: "Malneta redaktilo"
 output: "Elmeto"
 script: "Skripto"
-disablePagesScript: "Malebligi AiScripto en la paĝoj"
+disablePagesScript: "Malebligi AiScript en la paĝoj"
 deleteAllFiles: "Forviŝi ĉiujn dosierojn"
 deleteAllFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn dosierojn?"
+removeAllFollowing: "Ĉesi sekvi ĉiujn sekvatojn"
 userSuspended: "Ĉi tiu uzanto estas flostigita."
 userSilenced: "Ĉi tiu uzanto estas mutigita."
 menu: "Menuo"
 addItem: "Aldoni novaĵon"
 rooms: "Ĉambro"
 deletedNote: "Forviŝita noto"
-invisibleNote: "Malpublika noto"
+invisibleNote: "Malpublikigita noto"
+enableInfiniteScroll: "Ebligi infinitan rulumon"
 visibility: "Videbleco"
 poll: "Balotujo"
 useCw: "Kaŝi enhavo"
@@ -426,16 +478,23 @@ author: "Aŭtoro"
 manage: "Administro"
 plugins: "Kromaĵoj"
 deck: "Kartaro"
+useFullReactionPicker: "Uzi la tuton de la elektilon de reagoj"
 width: "Larĝeco"
 height: "Alteco"
+large: "Granda"
 medium: "Meza"
 small: "Malgranda"
+generateAccessToken: "Generi ĵetonon de aliro"
+permission: "Permesoj"
+enableAll: "Ebligi ĉiujn"
+disableAll: "Malebligi ĉiujn"
+notificationType: "Tipo de sciigoj"
 edit: "Redakti"
 emailServer: "Retpoŝta servilo"
 email: "Retpoŝto"
 emailAddress: "Retpoŝta adreso"
 smtpConfig: "Agordoj de SMTP servilo"
-smtpHost: "Gastigo"
+smtpHost: "Transa servilo"
 smtpPort: "Pordo"
 smtpUser: "Uzantnomo"
 smtpPass: "Pasvorto"
@@ -444,13 +503,20 @@ userSaysSomething: "{name} parolis ion"
 makeActive: "Aktivigi"
 display: "Vidi"
 copy: "Kopii"
+metrics: "mezurciferoj"
 overview: "Resumo"
+logs: "Protokoloj"
+delayed: "Prokrasto "
 database: "Datumbazo"
 channel: "Kanalo"
 create: "Krei"
 notificationSetting: "Agordoj de sciigoj"
 useGlobalSetting: "Oni uzas malloka agordo"
+other: "Aliaj"
+regenerateLoginToken: "Regeneri la ĵetonon de aliro"
 fileIdOrUrl: "Dosiera identigilo aŭ URL"
+chatOpenBehavior: "Konduto por malfermi la fenestron de babilejo"
+behavior: "Konduto"
 sample: "Ekzemplo"
 abuseReports: "Signaloj"
 reportAbuse: "Signalo"
@@ -458,20 +524,21 @@ reportAbuseOf: "Signali kontraŭ {name}'(o)"
 send: "Sendi"
 openInNewTab: "Malfermi en nova langeto"
 editTheseSettingsMayBreakAccount: "Redakti ĉi tiujn agordojn povas damaĝi vian konton."
-instanceTicker: "Informoj pri la nodo kiu dissendas la noton"
+instanceTicker: "Nomo de la nodo sendinta notojn"
+waitingFor: "Atendado pro {x}"
 random: "Hazarde"
 system: "Sistemo"
 desktop: "Labortablo"
 createNew: "Krei novan"
 optional: "Opciaj"
 public: "Publika"
-i18nInfo: "Misskey estas tradukata en diversaj lingvoj far volontuloj. Oni povas kontribui por la tradukado ĉe {link}."
+i18nInfo: "Misskey estas tradukata en diversaj lingvoj de volontuloj. Oni povas kontribui ĉe {link}."
 accountInfo: "Kontaj Informoj"
 notesCount: "La nombro de notoj"
 repliesCount: "La nombro de respondoj senditaj"
-renotesCount: "La nombro de notoj kiujn la uzanto plusendis"
+renotesCount: "La nombro de notoj plusenditaj de la uzanto"
 repliedCount: "La nombro de respondoj ricevitaj"
-renotedCount: "La nombro de uzantulaj notoj plusenditaj"
+renotedCount: "La nombro de plusendoj de la notoj skribitaj de la uzanto"
 followingCount: "La nombro de sekvatoj"
 followersCount: "La nombro de sekvantoj"
 sentReactionsCount: "La nombro de la reagoj senditaj"
@@ -485,10 +552,15 @@ noteFavoritesCount: "La nombro de notoj preferataj"
 pageLikesCount: "La nombro de paĝoj kiun la uzanto preferas"
 pageLikedCount: "La nombro de uzantoj, kiuj preferas paĝon de ĉi tiu uzanto"
 contact: "Kontakto"
+useSystemFont: "Uzi la tiparon implicitan de la sistemo"
+developer: "Evoluiganto"
 makeExplorable: "Videbligi konton sur la paĝo \"Esplori\""
+makeExplorableDescription: "Se vi elŝaltas tiun, via konto ne montros en la paĝo \"Esplori\"."
 duplicate: "Duobligi"
 left: "Maldekstra"
 center: "Centra"
+wide: "Vasta"
+narrow: "Malvasta"
 showTitlebar: "Videbligi titolan stangon"
 clearCache: "Malplenigi staplon"
 onlineUsersCount: "{n} uzanto(j) estas surlinea"
@@ -498,9 +570,11 @@ myTheme: "Miaj koloraroj"
 backgroundColor: "Fona koloro"
 textColor: "Teksto"
 saveAs: "Konservi kiel…"
+advanced: "Altnivela"
 value: "Valoro"
 createdAt: "Kreita je"
 updatedAt: "Laste ĝisdatigita"
+saveConfirm: "Ĉu vi konservas la ŝanĝon?"
 deleteConfirm: "Ĉu certas forviŝi?"
 closeAccount: "Forigi konton"
 currentVersion: "Nuna versio"
@@ -511,9 +585,10 @@ inUse: "Uzata"
 editCode: "Redakti kodon"
 emailNotification: "Sciigoj per retpoŝto"
 inChannelSearch: "Serĉi en kanalo"
-useReactionPickerForContextMenu: "Malfermi reago-elektilon per dekstro-klaki"
+useReactionPickerForContextMenu: "Dekstre-klaki por malfermi la elektilon de reagoj"
-typingUsers: "{users} nun entajpas…"
+typingUsers: "{users} nun skribas…"
 clear: "Vakigi"
+markAllAsRead: "Marki ĉiujn kiel legito"
 goBack: "Reiri antaŭ"
 addDescription: "Priskribi"
 info: "Informoj"
@@ -532,7 +607,7 @@ memo: "Memorigilo"
 high: "Alta"
 middle: "Meza"
 low: "Malalta"
-customCss: "Uzantula CSS"
+customCss: "Personecigita CSS"
 global: "Malloka"
 sent: "Sendi"
 received: "Ricevita"
@@ -542,14 +617,31 @@ troubleshooting: "Problemsolvi"
 learnMore: "Lernu pli"
 translate: "Traduki"
 translatedFrom: "Tradukita el {x}"
+itsOn: "Ŝaltita"
+unread: "Nelegita"
 controlPanel: "Ŝaltpodio"
 classic: "Klasika"
-_docs:
+ffVisibility: "Videbleco pri viaj sekvataro/sekvantaro\n"
-  continueReading: "Legi plu"
+ffVisibilityDescription: "Agordi la videblecon kiu povas vidi tiujn kiujn vi sekvas kaj tiujn kiuj sekvas vin."
-  features: "Funkcioj"
+continueThread: "Vidi pli mesaĝarojn"
-  admin: "Administro"
+incorrectPassword: "Nevalida pasvorto"
+_emailUnavailable:
+  used: "La retpoŝto jam estas uzita."
+  format: "Nevalida formato."
+  disposable: "Dumtempa retpoŝto ne estas uzebla."
+  smtp: "Tiu retpoŝta servilo ne respondas"
+_ffVisibility:
+  public: "Publika"
+  followers: "Afiŝi nur al sekvantoj"
+  private: "Malpublikigita"
+_signup:
+  emailAddressInfo: "Entajpu vian retpoŝton"
+_accountDelete:
+  accountDelete: "Forigi konton"
 _ad:
   back: "Nuligi"
+_forgotPassword:
+  enterEmail: "Entajpu la retpoŝton kiun vi registrigis al via konto. Ligilo por restarigi pasvorton estos sendita al la retpoŝto."
 _gallery:
   liked: "Ŝatitaj notoj"
   like: "Ŝati"
@@ -571,7 +663,7 @@ _aboutMisskey:
   contributors: "Precipaj kontribuantoj"
   allContributors: "Ĉiuj kontribuantoj"
   source: "Fontkodo"
-  translation: "Traduki Misskey'on"
+  translation: "Traduki Misskey"
   patrons: "Mecenatoj"
 _mfm:
   dummy: "Misskey evoluigas la mondon de Fediverso"
@@ -587,19 +679,21 @@ _mfm:
   inlineMath: "Formulo (en linio)"
   blockMath: "Formulo (bloko)"
   quote: "Citi"
-  emoji: "Personecigitaj emoĵioj"
   search: "Serĉi"
   flip: "Inversa"
   x2: "Granda"
   x3: "Grandega"
   x4: "Pli grandega"
   font: "Presliteraro"
+  rotate: "Orientiĝo"
 _reversi:
   total: "Entute"
 _instanceTicker:
   none: "Ne montri"
-  remote: "Montri al transaj uzantoj"
+  remote: "Montri al foraj uzantoj"
   always: "Ĉiam montri"
+_serverDisconnectedBehavior:
+  reload: "Aŭtomate reŝargi"
 _channel:
   create: "Krei kanalon"
   edit: "Redakti kanalon"
@@ -613,13 +707,14 @@ _menuDisplay:
   hide: "Kaŝi"
 _wordMute:
   muteWords: "Silentigitaj vortoj"
-  soft: "En kliento"
+  soft: "Per la kliento"
-  hard: "En servilo"
+  hard: "Per la servilo"
   mutedNotes: "Silentigitaj notoj"
 _theme:
   manage: "Administri kolorarojn"
   code: "Kolorara kodo"
   description: "Priskribo"
+  defaultValue: "Implicitaĵa valoro"
   color: "Koloro"
   darken: "Malbrileco"
   lighten: "Brileco"
@@ -630,7 +725,7 @@ _theme:
     hashtag: "Kradvorto"
     mention: "Mencioj"
     mentionMe: "Mencio al vi"
-    renote: "Noto plusendita"
+    renote: "Plusendita"
     buttonBg: "Fono de butono"
     driveFolderBg: "Fono de dosierujo de la disko"
     messageBg: "Fono de retbabilejo"
@@ -648,7 +743,7 @@ _ago:
   secondsAgo: "Antaŭ {n} sekundo(j)"
   minutesAgo: "Antaŭ {n} minutoj"
   hoursAgo: "Antaŭ {n} horo(j)"
-  daysAgo: "Antaŭ {n} tagoj"
+  daysAgo: "Antaŭ {n} tago(j)"
   weeksAgo: "Antaŭ {n} semajnoj"
   monthsAgo: "Antaŭ {n} monatoj"
   yearsAgo: "Antaŭ {n} jaroj"
@@ -661,7 +756,7 @@ _tutorial:
   title: "Uzado de Misskey"
   step1_1: "Bonvenon."
   step7_2: "Se vi volas scii pli pri Misskey, rigardu la fakon {help}."
-  step7_3: "Do, bonvolu amuziĝi Misskey'on🚀"
+  step7_3: "Do, bonvolu amuziĝi sur Misskey🚀"
 _2fa:
   registerKey: "Nove registri ŝlosilon"
 _permissions:
@@ -702,13 +797,13 @@ _widgets:
   timeline: "Templinio"
   clock: "Horloĝo"
   activity: "Aktiveco"
-  federation: "Kunfederaĵo"
+  federation: "Federaĵo"
   slideshow: "Bildoprezento"
   button: "Butono"
-  onlineUsers: "Surkonektita uzanto"
+  onlineUsers: "Surkonektitaj uzantoj"
   aichan: "Ai"
 _cw:
-  show: "Vidu pli"
+  show: "Vidi pli"
   files: "{count} dosiero(j)"
 _poll:
   choiceN: "Balotilo {n}"
@@ -720,15 +815,15 @@ _poll:
   closed: "Oni jam balotis ĝin"
 _visibility:
   public: "Publika"
-  publicDescription: "Via noto estos videbla de ĉiuj uzantoj"
+  publicDescription: "Afiŝi al ĉiuj en la Fediverso"
   home: "Hejma"
   homeDescription: "Dissendi nur sur hejma templinio"
   followers: "Nur al sekvantoj"
-  followersDescription: "Publiki nur al viaj sekvantoj"
+  followersDescription: "Afiŝi nur al sekvantoj"
   specified: "Rekte"
-  specifiedDescription: "Montri nur al specifaj uzantoj"
+  specifiedDescription: "Afiŝi nur al specifaj uzantoj"
   localOnly: "Nur loka"
-  localOnlyDescription: "Ne montri al transaj uzantoj"
+  localOnlyDescription: "Ne afiŝi al foraj uzantoj"
 _postForm:
   replyPlaceholder: "Respondi la noton…"
   quotePlaceholder: "Citi la noton…"
@@ -761,6 +856,8 @@ _timelines:
 _rooms:
   translate: "Movi"
   chooseImage: "Elekti bildon"
+  _roomType:
+    default: "Implicitaĵo"
   _furnitures:
     bed: "Lito"
     low-table: "Malaltotablo"
@@ -790,10 +887,12 @@ _pages:
   featured: "Ravaĵoj"
   contents: "Enhavo"
   content: "Paĝo en bloko"
+  title: "Temlinio"
   url: "URL de paĝo"
   alignCenter: "Centrigi"
   chooseBlock: "Aldoni blokon"
   contentBlocks: "Enhavo"
+  inputBlocks: "Enigo"
   blocks:
     text: "Teksto"
     textarea: "Areo de teksto"
@@ -802,14 +901,24 @@ _pages:
     _post:
       canvasId: "Kanvasa identigilo"
     textInput: "Enmeto el teksto"
+    _textInput:
+      text: "Titolo"
+      default: "Implicitaĵa valoro"
     textareaInput: "Enmeto el teksto en multaj linioj"
+    _textareaInput:
+      text: "Titolo"
+      default: "Implicitaĵa valoro"
     numberInput: "Nombra enmeto"
     _numberInput:
       text: "Titolo"
+      default: "Implicitaĵa valoro"
     _canvas:
       id: "Kanvasa identigilo"
     _note:
       id: "Identigilo de noto"
+    _switch:
+      text: "Titolo"
+      default: "Implicitaĵa valoro"
     _counter:
       text: "Titolo"
     _button:
@@ -817,6 +926,9 @@ _pages:
       _action:
         _pushEvent:
           event: "Nomo de la evento"
+    _radioButton:
+      title: "Titolo"
+      default: "Implicitaĵa valoro"
   script:
     categories:
       text: "Manipulo de teksto"
@@ -835,6 +947,7 @@ _pages:
         arg1: "Teksto"
       _join:
         arg1: "Listoj"
+        arg2: "apartigilo"
       _randomPick:
         arg1: "Listoj"
       _dailyRandomPick:
@@ -862,6 +975,10 @@ _pages:
       stringArray: "List de teksto"
     emptySlot: "Malplena junto"
     argVariables: "Eniga junto"
+_relayStatus:
+  requesting: "Atendado de aprobon"
+  accepted: "Konfirmita"
+  rejected: "Malakceptita"
 _notification:
   fileUploaded: "La dosiero sukcese alŝutiĝis."
   youGotMention: "{name} mencis"
@@ -876,13 +993,13 @@ _notification:
   yourFollowRequestAccepted: "Via peto de sekvado estis akceptita."
   _types:
     all: "Ĉio"
-    follow: "Nova sekvatoj"
+    follow: "Novaj sekvatoj"
     mention: "Mencioj"
     reply: "Respondoj"
-    renote: "Notoj plusenditaj"
+    renote: "Plusendoj"
     quote: "Citi"
     reaction: "Reagoj"
-    receiveFollowRequest: "Ricevita peton de sekvado"
+    receiveFollowRequest: "Ricevi peton de sekvado"
     followRequestAccepted: "Akceptita peto por sekvado"
 _deck:
   profile: "Agordaro"
@@ -891,5 +1008,5 @@ _deck:
     tl: "Templinio"
     antenna: "Antenoj"
     list: "Listoj"
-    mentions: "Al vi"
+    mentions: "Mencioj"
     direct: "Rekte"

locales/es-ES.yml

@@ -737,10 +737,9 @@ pubSub: "Cuentas Pub/Sub"
 lastCommunication: "Última comunicación"
 resolved: "Resuelto"
 unresolved: "Sin resolver"
+controlPanel: "Panel de control"
 _accountDelete:
   accountDelete: "Eliminar Cuenta"
-_docs:
-  admin: "Administrar"
 _ad:
   back: "Deseleccionar"
 _gallery:
@@ -769,6 +768,7 @@ _mfm:
   flip: "Echar de un capirotazo"
   flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
   font: "Fuente"
+  rotate: "Rotar"
 _reversi:
   reversi: "Reversi"
   gameSettings: "Configuración del juego"

locales/fr-FR.yml

@@ -919,6 +919,7 @@ _mfm:
   rainbowDescription: "Permet d'afficher le contenu en couleurs arc-en-ciel."
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
+  rotate: "Pivoter"
 _reversi:
   reversi: "Reversi"
   gameSettings: "Réglages de la partie"

locales/id-ID.yml

@@ -806,6 +806,10 @@ muteThread: "Bisukan thread"
 unmuteThread: "Suarakan thread"
 ffVisibility: "Visibilitas Mengikuti/Pengikut"
 ffVisibilityDescription: "Mengatur siapa yang dapat melihat pengikutmu dan yang kamu ikuti."
+continueThread: "Lihat lanjutan thread"
+deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
+incorrectPassword: "Kata sandi salah."
+voteConfirm: "Konfirmasi suara kamu untuk ({choice})？"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."
@@ -929,6 +933,8 @@ _mfm:
   rainbowDescription: "Membuat konten muncul dalam warna pelangi."
   sparkle: "Kelap-kelip"
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
+  rotate: "Putar"
+  rotateDescription: "Putar konten sesuai sudut yang ditentukan."
 _reversi:
   reversi: "Reversi"
   gameSettings: "Pengaturan permainan"

locales/it-IT.yml

@@ -745,10 +745,8 @@ global: "Federata"
 sent: "Inviare"
 hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
-_docs:
+_ffVisibility:
-  continueReading: "Leggi di più"
+  public: "Pubblico"
-  features: "Funzionalità"
-  admin: "Gestione"
 _ad:
   back: "Indietro"
   reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
@@ -808,6 +806,7 @@ _mfm:
   font: "Tipo di carattere"
   fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
   rainbow: "Arcobaleno"
+  rotate: "Ruota"
 _reversi:
   reversi: "Reversi"
   gameSettings: "Impostazioni di gioco"

locales/ja-JP.yml

@@ -792,6 +792,7 @@ pubSub: "Pub/Subのアカウント"
 lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
+breakFollow: "フォロワーを解除"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
@@ -806,6 +807,10 @@ muteThread: "スレッドをミュート"
 unmuteThread: "スレッドのミュートを解除"
 ffVisibility: "つながりの公開範囲"
 ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開範囲を設定できます。"
+continueThread: "さらにスレッドを見る"
+deleteAccountConfirm: "アカウントが削除されます。よろしいですか？"
+incorrectPassword: "パスワードが間違っています。"
+voteConfirm: "「{choice}」に投票しますか？"
 
 _emailUnavailable:
   used: "既に使用されています"
@@ -821,7 +826,7 @@ _ffVisibility:
 
 _signup:
   almostThere: "ほとんど完了です"
-  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。"
+  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
   emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"
 
 _accountDelete:
@@ -942,6 +947,8 @@ _mfm:
   rainbowDescription: "内容をレインボーにします。"
   sparkle: "キラキラ"
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
+  rotate: "回転"
+  rotateDescription: "指定した角度で回転させます。"
 
 _reversi:
   reversi: "リバーシ"

locales/ja-KS.yml

@@ -653,8 +653,6 @@ low: "低い"
 global: "グローバル"
 sent: "送信"
 hashtags: "ハッシュタグ"
-_docs:
-  admin: "管理"
 _ad:
   back: "戻る"
 _gallery:
@@ -702,6 +700,7 @@ _mfm:
   spin: "アニメーション(回転)"
   blur: "ぼかし"
   font: "フォント"
+  rotate: "回転"
 _reversi:
   reversi: "リバーシ"
   gameSettings: "対局の設定"

locales/ko-KR.yml

@@ -788,6 +788,8 @@ lastCommunication: "마지막 통신"
 resolved: "해결됨"
 unresolved: "해결되지 않음"
 controlPanel: "제어판"
+_ffVisibility:
+  public: "게시"
 _accountDelete:
   accountDelete: "계정 삭제"
   mayTakeTime: "계정 삭제는 서버에 부하를 가하기 때문에, 작성한 콘텐츠나 업로드한 파일의 수가 많으면 완료까지 시간이 걸릴 수 있습니다."
@@ -795,13 +797,6 @@ _accountDelete:
   requestAccountDelete: "계정 삭제 요청"
   started: "삭제 작업이 시작되었습니다."
   inProgress: "삭제 진행 중"
-_docs:
-  continueReading: "계속 읽기"
-  features: "기능"
-  generalTopics: "일반 주제"
-  advancedTopics: "심화 주제"
-  admin: "관리"
-  translateWarn: "이 문서는 번역되었기 때문에 원본과는 내용이 다를 수 있습니다."
 _ad:
   back: "뒤로"
   reduceFrequencyOfThisAd: "이 광고의 표시 빈도 낮추기"
@@ -904,6 +899,7 @@ _mfm:
   rainbowDescription: "내용을 무지개로 표시합니다."
   sparkle: "반짝반짝"
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
+  rotate: "회전"
 _reversi:
   reversi: "리버시"
   gameSettings: "대국 설정"

locales/nl-NL.yml

@@ -1,3 +1,193 @@
 ---
 _lang_: "Nederlands"
 headlineMisskey: "Netwerk verbonden door notities"
+introMisskey: "Welkom! Misskey is een open source, gedecentraliseerde microblogdienst.\nMaak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\" kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀"
+monthAndDay: "{day} {month}"
+search: "Zoeken"
+notifications: "Meldingen"
+username: "Gebruikersnaam"
+password: "Wachtwoord"
+forgotPassword: "Wachtwoord vergeten"
+fetchingAsApObject: "Ophalen vanuit de Fediverse"
+ok: "Ok"
+gotIt: "Begrepen"
+cancel: "Annuleren"
+enterUsername: "Voer een gebruikersnaam in"
+renotedBy: "Hergedeeld door {user}"
+noNotes: "Geen notities"
+noNotifications: "Geen meldingen"
+instance: "Server"
+settings: "Instellingen"
+basicSettings: "Basisinstellingen"
+otherSettings: "Overige instellingen"
+openInWindow: "In een venster openen"
+profile: "Profiel"
+timeline: "Tijdlijn"
+noAccountDescription: "Deze gebruiker heeft nog geen bio geschreven"
+login: "Inloggen"
+loggingIn: "Aan het inloggen"
+logout: "Afmelden"
+signup: "Registreren"
+uploading: "Bezig met uploaden"
+save: "Opslaan"
+users: "Gebruikers"
+addUser: "Toevoegen gebruiker"
+favorite: "Favorieten"
+favorites: "Toevoegen aan favorieten"
+unfavorite: "Verwijderen uit favorieten"
+favorited: "Toegevoegd aan favorieten."
+alreadyFavorited: "Al toegevoegd aan favorieten"
+cantFavorite: "Kon niet toevoegen aan favorieten"
+pin: "Vastmaken aan profielpagina"
+unpin: "Losmaken van profielpagina"
+copyContent: "Kopiëren inhoud"
+copyLink: "Kopiëren link"
+delete: "Verwijderen"
+deleteAndEdit: "Verwijderen en bewerken"
+deleteAndEditConfirm: "Weet je zeker dat je deze notitie wilt verwijderen en dan bewerken? Je verliest alle reacties, herdelingen en antwoorden erop."
+addToList: "Aan lijst toevoegen"
+sendMessage: "Verstuur bericht"
+copyUsername: "Kopiëren gebruikersnaam "
+searchUser: "Zoeken een gebruiker"
+reply: "Antwoord"
+loadMore: "Laad meer"
+showMore: "Toon meer"
+youGotNewFollower: "volgde jou"
+receiveFollowRequest: "Volgverzoek ontvangen"
+followRequestAccepted: "Volgverzoek geaccepteerd"
+mention: "Vermelding"
+mentions: "Vermeldingen"
+directNotes: "Directe notities"
+importAndExport: "Import / export"
+import: "Import"
+export: "Export"
+files: "Bestanden"
+download: "Downloaden"
+driveFileDeleteConfirm: "Weet je zeker dat je het bestand \"{name}\" wilt verwijderen? Notities met dit bestand als bijlage worden ook verwijderd."
+unfollowConfirm: "Weet je zeker dat je {name} wilt ontvolgen?"
+exportRequested: "Je hebt een export aangevraagd. Dit kan een tijdje duren. Het wordt toegevoegd aan je Drive zodra het is voltooid."
+importRequested: "Je hebt een import aangevraagd. Dit kan even duren."
+lists: "Lijsten"
+noLists: "Je hebt geen lijsten"
+note: "Notitie"
+notes: "Notities"
+following: "Volgend"
+followers: "Volgers"
+followsYou: "Volgt jou"
+createList: "Creëer lijst"
+manageLists: "Beheren lijsten"
+error: "Fout"
+somethingHappened: "Er is iets misgegaan."
+retry: "Probeer opnieuw"
+pageLoadError: "Pagina laden mislukt"
+pageLoadErrorDescription: "Dit wordt normaal gesproken veroorzaakt door netwerkfouten of door de cache van de browser. Probeer de cache te wissen en probeer het na een tijdje wachten opnieuw."
+serverIsDead: "De server reageert niet. Wacht even en probeer het opnieuw."
+youShouldUpgradeClient: "Werk je client bij om deze pagina te zien."
+enterListName: "Voer de naam van de lijst in"
+privacy: "Privacy"
+makeFollowManuallyApprove: "Volgverzoeken vergen een goedkeuring"
+defaultNoteVisibility: "Standaard zichtbaarheid"
+follow: "Volgen"
+followRequest: "Verzoek om te mogen volgen"
+followRequests: "Volgverzoeken"
+unfollow: "Ontvolgen"
+followRequestPending: "Wachten op goedkeuring volgverzoek"
+enterEmoji: "Voer een emoji in"
+renote: "Herdelen"
+unrenote: "Stop herdelen"
+renoted: "Herdeeld"
+cantRenote: "Dit bericht kan niet worden herdeeld"
+cantReRenote: "Een herdeling kan niet worden herdeeld"
+quote: "Quote"
+pinnedNote: "Vastgemaakte notitie"
+pinned: "Vastmaken aan profielpagina"
+you: "Jij"
+clickToShow: "Klik om te bekijken"
+sensitive: "NSFW"
+add: "Toevoegen"
+reaction: "Reacties"
+reactionSettingDescription: "Configureer welke reacties je wilt weergeven in de reactiekiezer."
+reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
+rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
+attachCancel: "Verwijder bijlage"
+markAsSensitive: "Markeren als NSFW"
+unmarkAsSensitive: "Geen NSFW"
+enterFileName: "Invoeren bestandsnaam"
+mute: "Dempen"
+unmute: "Stop dempen"
+block: "Blokkeren"
+unblock: "Deblokkeren"
+suspend: "Opschorten"
+unsuspend: "Heractiveren"
+blockConfirm: "Weet je zeker dat je dit account wil blokkeren?"
+instances: "Server"
+remove: "Verwijderen"
+nsfw: "NSFW"
+pinnedNotes: "Vastgemaakte notitie"
+userList: "Lijsten"
+smtpUser: "Gebruikersnaam"
+smtpPass: "Wachtwoord"
+user: "Gebruikers"
+muteThread: "Discussies dempen "
+unmuteThread: "Dempen van discussie ongedaan maken"
+_email:
+  _follow:
+    title: "volgde jou"
+_mfm:
+  mention: "Vermelding"
+  quote: "Quote"
+  search: "Zoeken"
+_theme:
+  keys:
+    mention: "Vermelding"
+    renote: "Herdelen"
+_sfx:
+  note: "Notities"
+  notification: "Meldingen"
+_widgets:
+  notifications: "Meldingen"
+  timeline: "Tijdlijn"
+_cw:
+  show: "Laad meer"
+_visibility:
+  followers: "Volgers"
+_profile:
+  username: "Gebruikersnaam"
+_exportOrImport:
+  followingList: "Volgend"
+  muteList: "Dempen"
+  blockingList: "Blokkeren"
+  userLists: "Lijsten"
+_pages:
+  script:
+    categories:
+      list: "Lijsten"
+    blocks:
+      _join:
+        arg1: "Lijsten"
+      _randomPick:
+        arg1: "Lijsten"
+      _dailyRandomPick:
+        arg1: "Lijsten"
+      _seedRandomPick:
+        arg2: "Lijsten"
+      _pick:
+        arg1: "Lijsten"
+      _listLen:
+        arg1: "Lijsten"
+    types:
+      array: "Lijsten"
+_notification:
+  youWereFollowed: "volgde jou"
+  _types:
+    follow: "Volgend"
+    mention: "Vermelding"
+    renote: "Herdelen"
+    quote: "Quote"
+    reaction: "Reacties"
+_deck:
+  _columns:
+    notifications: "Meldingen"
+    tl: "Tijdlijn"
+    list: "Lijsten"
+    mentions: "Vermeldingen"

locales/pl-PL.yml

@@ -738,8 +738,8 @@ ratio: "Stosunek"
 global: "Globalna"
 sent: "Wyślij"
 hashtags: "Hashtag"
-_docs:
+_ffVisibility:
-  admin: "Zarządzanie"
+  public: "Publikuj"
 _ad:
   back: "Wróć"
   reduceFrequencyOfThisAd: "Pokazuj tę reklamę rzadziej"
@@ -815,6 +815,7 @@ _mfm:
   blur: "Rozmycie"
   font: "Czcionka"
   fontDescription: "Wybiera czcionkę do wyświetlania treści."
+  rotate: "Obróć"
 _reversi:
   reversi: "Reversi"
   gameSettings: "Ustawienia gry"

locales/pt-PT.yml

@@ -1,22 +1,33 @@
 ---
 _lang_: "Português"
+headlineMisskey: "Rede conectada por notas"
 monthAndDay: "{day}/{month}"
 search: "Pesquisar"
 notifications: "Notificações"
 username: "Nome de usuário"
 password: "Senha"
+forgotPassword: "Esqueci a senha"
+fetchingAsApObject: "Buscando no Fediverso"
 ok: "OK"
 gotIt: "Entendi"
 cancel: "Cancelar"
 enterUsername: "Digite o nome de usuário"
 renotedBy: "Repostado por {user}"
 noNotes: "Sem posts"
+noNotifications: "Sem notificações"
+instance: "Instância"
 settings: "Configurações"
 basicSettings: "Configurações básicas"
 otherSettings: "Outras configurações"
+openInWindow: "Abrir numa janela"
 profile: "Perfil"
 timeline: "Timeline"
+login: "Iniciar sessão"
+loggingIn: "Iniciando sessão…"
 logout: "Sair"
+signup: "Registrar-se"
+uploading: "Enviando…"
+save: "Guardar"
 users: "Usuários"
 favorite: "Favoritar"
 favorites: "Favoritar"

locales/ru-RU.yml

@@ -620,6 +620,8 @@ reportAbuse: "Жалоба"
 reportAbuseOf: "Пожаловаться на пользователя {name}"
 fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь о конкретной заметке, будьте добры приложить ссылку на неё."
 abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
+reporteeOrigin: "Куда сообщать"
+reporterOrigin: "Сообщено"
 send: "Отправить"
 abuseMarkAsResolved: "Отметить жалобу как решённую"
 openInNewTab: "Открыть в новой вкладке"
@@ -766,6 +768,7 @@ middle: "Средне"
 low: "Низкий"
 emailNotConfiguredWarning: "Не указан адрес электронной почты"
 ratio: "Соотношение"
+previewNoteText: "Предварительный просмотр текста"
 customCss: "Индивидуальный CSS"
 customCssWarn: "Используйте эту настройку только если знаете, что делаете. Ошибки здесь чреваты тем, что сайт перестанет нормально работать у вас."
 global: "Всеобщая"
@@ -780,19 +783,43 @@ learnMore: "Подробнее"
 misskeyUpdated: "Misskey обновился!"
 whatIsNew: "Что новенького?"
 translate: "Перевод"
+translatedFrom: "{x}Перевод с английского"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
 usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
 aiChanMode: "ИИ режим"
 keepCw: "Сохраняйте Предупреждения о содержимом"
+lastCommunication: "Последнее сообщение"
+resolved: "Решен"
+unresolved: "Неразрешенные"
+itsOff: "Он выключен!"
+emailRequiredForSignup: "Требуется адрес электронной почты для регистрации аккаунта"
+unread: "Непрочитанное"
+filter: "Фильтры"
 controlPanel: "Панель управления"
 manageAccounts: "Управление аккаунтом"
-_docs:
+makeReactionsPublic: "Опубликовать список реакций"
-  continueReading: "Читать подробнее"
+makeReactionsPublicDescription: "Список сделанных вами реакций доступен для просмотра всем желающим."
-  features: "Возможности"
+classic: "Классика"
-  generalTopics: "Основные темы"
+unmuteThread: "Отключить звук"
-  advancedTopics: "Дополнительные темы"
+ffVisibilityDescription: "Вы можете установить объем вашей следующей/последней информации."
-  admin: "Управление"
+_emailUnavailable:
-  translateWarn: "Это перевод документа. Он может неточно отражать содержимое оригинала."
+  used: "Уже используется"
+  format: "Неправильный формат"
+  smtp: "Почтовый сервер не отвечает"
+_ffVisibility:
+  public: "Опубликовать"
+  private: "Частный"
+_signup:
+  almostThere: "Почти готово!"
+  emailAddressInfo: "Пожалуйста, введите адрес электронной почты, который вы используете."
+  emailSent: "На указанный вами адрес электронной почты ({email}) было отправлено письмо с подтверждением. Перейдите по ссылке в электронном письме, чтобы завершить создание учетной записи."
+_accountDelete:
+  accountDelete: "Удалить свой аккаунт"
+  mayTakeTime: "Удаление учетной записи - это тяжелый процесс, который может занять много времени, если у вас создано много контента или загружено много файлов."
+  sendEmail: "Мы отправим уведомление на зарегистрированный вами адрес электронной почты, когда ваша учетная запись будет удалена."
+  requestAccountDelete: "Запросить удаление вашей учетной записи"
+  started: "Процесс удаления начался."
+  inProgress: "Удаление в процессе"
 _ad:
   back: "Выход"
   reduceFrequencyOfThisAd: "Реже показывать эту рекламу"
@@ -893,6 +920,9 @@ _mfm:
   fontDescription: "Так можно писать произвольным шрифтом."
   rainbow: "Радуга"
   rainbowDescription: "Заставлять содержимое отображаться в цветах радуги."
+  sparkle: "Блеск"
+  sparkleDescription: "Добавьте эффект искрящихся частиц."
+  rotate: "Повернуть"
 _reversi:
   reversi: "Реверси"
   gameSettings: "Настройки игры"
@@ -1119,6 +1149,10 @@ _permissions:
   "write:user-groups": "Изменять и удалять группы пользователей"
   "read:channels": "Смотреть каналы"
   "write:channels": "Изменять каналы"
+  "read:gallery": "Смотреть галерею"
+  "write:gallery": "Работа с галереей"
+  "read:gallery-likes": "Посмотреть галерею лайков"
+  "write:gallery-likes": "Манипулируйте понравившейся галереей"
 _auth:
   shareAccess: "Дать доступ для «{name}» к вашей учётной записи?"
   shareAccessAsk: "Уверены, что хотите дать приложению доступ к своей учётной записи?"

locales/uk-UA.yml

@@ -692,8 +692,6 @@ middle: "Середній"
 global: "Глобальна"
 sent: "Відправити"
 hashtags: "Хештеґ"
-_docs:
-  admin: "Управління"
 _ad:
   back: "Назад"
 _gallery:
@@ -773,6 +771,7 @@ _mfm:
   blurDescription: "Цей ефект зробить контент розмитим. Контент можна зробити чітким, якщо навести на нього вказівник миші."
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
+  rotate: "Обертати"
 _reversi:
   reversi: "Реверсі"
   gameSettings: "Налаштування гри"

locales/zh-CN.yml

@@ -1,20 +1,20 @@
 ---
 _lang_: "中文(简体)"
 headlineMisskey: "通过帖子连接在一起的网络"
-introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖子」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖子表达反馈👍\n来探索新的世界吧！🚀"
+introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
 notifications: "通知"
 username: "用户名"
 password: "密码"
-forgotPassword: "重置密码"
+forgotPassword: "忘记密码"
-fetchingAsApObject: "联合查询中"
+fetchingAsApObject: "联合查询"
 ok: "OK"
 gotIt: "我明白了"
 cancel: "取消"
 enterUsername: "输入用户名"
-renotedBy: "{user} 转发了"
+renotedBy: "由 {user} 转推"
-noNotes: "没有帖子"
+noNotes: "没有帖文"
 noNotifications: "无通知"
 instance: "实例"
 settings: "设置"
@@ -124,9 +124,9 @@ unblockConfirm: "确定要解除拉黑吗？"
 suspendConfirm: "要冻结吗？"
 unsuspendConfirm: "要解除冻结吗？"
 selectList: "选择列表"
-selectAntenna: "天线选择"
+selectAntenna: "选择天线"
 selectWidget: "选择小工具"
-editWidgets: "编辑小工具"
+editWidgets: "编辑部件"
 editWidgetsExit: "完成编辑"
 customEmojis: "自定义表情符号"
 emoji: "表情符号"
@@ -139,9 +139,9 @@ cacheRemoteFiles: "远程文件缓存"
 cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程实例载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
 flagAsBot: "这是一个机器人账号"
 flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
-flagAsCat: "这个账户是一只猫"
+flagAsCat: "将这个账户设定为一只猫"
-flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
+flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。"
-autoAcceptFollowed: "自动允许关注者的关注"
+autoAcceptFollowed: "自动允许关注"
 addAccount: "添加账户"
 loginFailed: "登录失败"
 showOnRemote: "转到所在实例显示"
@@ -620,6 +620,8 @@ reportAbuse: "举报"
 reportAbuseOf: "举报{name}"
 fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写URL地址。"
 abuseReported: "内容已发送。感谢您的报告。"
+reporteeOrigin: "举报来源"
+reporterOrigin: "举报者来源"
 send: "发送"
 abuseMarkAsResolved: "处理完毕"
 openInNewTab: "在新标签页中打开"
@@ -790,6 +792,7 @@ pubSub: "Pub/Sub账户"
 lastCommunication: "最近通信"
 resolved: "已解决"
 unresolved: "未解决"
+breakFollow: "移除关注者"
 itsOn: "已开启"
 itsOff: "已关闭"
 emailRequiredForSignup: "注册账户需要电子邮件地址"
@@ -797,7 +800,27 @@ unread: "未读"
 filter: "筛选"
 controlPanel: "控制面板"
 manageAccounts: "管理账户"
+makeReactionsPublic: "将回应设置为公开"
+makeReactionsPublicDescription: "将您发表过的回应设置成公开可见。"
 classic: "经典"
+muteThread: "屏蔽帖子列表"
+unmuteThread: "取消屏蔽帖子列表"
+ffVisibility: "连接的可见范围"
+ffVisibilityDescription: "您可以设置您的关注/关注者信息的公开范围"
+continueThread: "查看更多帖子"
+deleteAccountConfirm: "将要删除账户。是否确认？"
+incorrectPassword: "密码错误"
+voteConfirm: "确定投给“{choice}” ？"
+_emailUnavailable:
+  used: "已经被使用过"
+  format: "无效的格式"
+  disposable: "不是永久可用的地址"
+  mx: "邮件服务器不正确"
+  smtp: "邮件服务器没有响应"
+_ffVisibility:
+  public: "发布"
+  followers: "只有关注你的用户能看到"
+  private: "私密"
 _signup:
   almostThere: "即将完成"
   emailAddressInfo: "请输入您所使用的电子邮件地址"
@@ -809,13 +832,6 @@ _accountDelete:
   requestAccountDelete: "请求删除账户"
   started: "账户删除过程已开始。"
   inProgress: "正在删除"
-_docs:
-  continueReading: "继续阅读"
-  features: "特性"
-  generalTopics: "通常提示"
-  advancedTopics: "进阶提示"
-  admin: "管理"
-  translateWarn: "本文档是翻译后的文档。内容可能与原文有所不同。"
 _ad:
   back: "返回"
   reduceFrequencyOfThisAd: "减少此广告的频率"
@@ -918,6 +934,8 @@ _mfm:
   rainbowDescription: "用彩虹色来显示内容。"
   sparkle: "闪光"
   sparkleDescription: "添加发光粒子效果。"
+  rotate: "旋转"
+  rotateDescription: "旋转指定的角度。"
 _reversi:
   reversi: "黑白棋"
   gameSettings: "对局设置"

locales/zh-TW.yml

@@ -754,8 +754,8 @@ ratio: "%"
 global: "公開"
 sent: "發送"
 hashtags: "#tag"
-_docs:
+_ffVisibility:
-  admin: "管理"
+  public: "發佈"
 _ad:
   back: "返回"
   reduceFrequencyOfThisAd: "降低此廣告的頻率 "
@@ -840,6 +840,7 @@ _mfm:
   blur: "模糊"
   font: "字型"
   fontDescription: "您可以設定顯示內容的字型"
+  rotate: "旋轉"
 _reversi:
   reversi: "黑白棋"
   gameSettings: "對弈設定"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.96.1",
+	"version": "12.98.0+birb1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -17,10 +17,8 @@
 		"migrate": "cd packages/backend && npx typeorm migration:run",
 		"migrateandstart": "npm run migrate && npm run start",
 		"gulp": "gulp build",
-		"watch": "concurrently \"npm:watch-*\"",
+		"watch": "npm run dev",
-		"watch-webpack": "webpack --watch",
+		"dev": "node ./scripts/dev.js",
-		"watch-ts": "tsc -w -p packages/tsconfig.json && tsc-alias -w -p packages/tsconfig.json",
-		"watch-gulp": "gulp watch",
 		"lint": "node ./scripts/lint.js",
 		"cy:open": "cypress open",
 		"cy:run": "cypress run",
@@ -40,13 +38,16 @@
 		"gulp-cssnano": "2.1.3",
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.1.3",
-		"gulp-terser": "2.1.0"
+		"gulp-terser": "2.1.0",
+		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.54",
 		"@types/fluent-ffmpeg": "2.1.17",
+		"@typescript-eslint/parser": "5.4.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.0.0",
+		"cypress": "9.1.0",
-		"start-server-and-test": "1.14.0"
+		"start-server-and-test": "1.14.0",
+		"typescript": "4.5.2"
 	}
 }

packages/backend/.eslintrc.js

@@ -1,64 +1,9 @@
 module.exports = {
-	root: true,
-	parser: '@typescript-eslint/parser',
 	parserOptions: {
 		tsconfigRootDir: __dirname,
 		project: ['./tsconfig.json'],
 	},
-	plugins: [
-		'@typescript-eslint',
-		'import'
-	],
 	extends: [
-		'eslint:recommended',
+		'../shared/.eslintrc.js',
-		'plugin:@typescript-eslint/recommended',
-		'plugin:import/recommended',
-		'plugin:import/typescript'
 	],
-	rules: {
-		'indent': ['warn', 'tab', {
-			'SwitchCase': 1,
-			'MemberExpression': 'off',
-			'flatTernaryExpressions': true,
-			'ArrayExpression': 'first',
-			'ObjectExpression': 'first',
-		}],
-		'eol-last': ['error', 'always'],
-		'semi': ['error', 'always'],
-		'quotes': ['warn', 'single'],
-		'comma-dangle': ['warn', 'always-multiline'],
-		'keyword-spacing': ['error', {
-			'before': true,
-			'after': true,
-		}],
-		/* TODO: path aliasを使わないとwarnする
-		'no-restricted-imports': ['warn', {
-			'patterns': [
-			]
-		}],
-		*/
-		'no-multi-spaces': ['error'],
-		'no-var': ['error'],
-		'prefer-arrow-callback': ['error'],
-		'no-throw-literal': ['warn'],
-		'no-param-reassign': ['warn'],
-		'no-constant-condition': ['warn'],
-		'no-empty-pattern': ['warn'],
-		'no-async-promise-executor': ['off'],
-		'no-useless-escape': ['off'],
-		'no-multi-spaces': ['warn'],
-		'no-control-regex': ['warn'],
-		'no-empty': ['warn'],
-		'no-inner-declarations': ['off'],
-		'no-sparse-arrays': ['off'],
-		'@typescript-eslint/no-var-requires': ['warn'],
-		'@typescript-eslint/no-inferrable-types': ['warn'],
-		'@typescript-eslint/no-empty-function': ['off'],
-		'@typescript-eslint/no-non-null-assertion': ['off'],
-		'@typescript-eslint/no-misused-promises': ['error', {
-			'checksVoidReturn': false,
-		}],
-		'import/no-unresolved': ['off'],
-		'import/no-default-export': ['warn'],
-	},
 };

packages/backend/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+	"typescript.tsdk": "node_modules\\typescript\\lib",
+	"path-intellisense.mappings": {
+		"@": "${workspaceRoot}/packages/backend/src/"
+	}
+}

packages/backend/package.json

@@ -4,7 +4,7 @@
 	"scripts": {
 		"init": "npm run migrate",
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
-		"watch": "tsc -w -p tsconfig.json && tsc-alias -w -p tsconfig.json",
+		"watch": "node watch.mjs",
 		"lint": "eslint --quiet src/**/*.ts",
 		"mocha": "cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
 		"test": "npm run mocha"
@@ -179,7 +179,7 @@
 		"tmp": "0.2.1",
 		"ts-loader": "9.2.6",
 		"ts-node": "10.4.0",
-		"tsc-alias": "1.3.10",
+		"tsc-alias": "1.4.1",
 		"tsconfig-paths": "3.11.0",
 		"twemoji-parser": "13.1.0",
 		"typeorm": "0.2.39",
@@ -194,6 +194,7 @@
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.54",
 		"@types/fluent-ffmpeg": "2.1.17",
-		"cross-env": "7.0.3"
+		"cross-env": "7.0.3",
+		"execa": "6.0.0"
 	}
 }

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

@@ -82,8 +82,7 @@ export default class Reversi {
 		//#endregion
 
 		// ゲームが始まった時点で片方の色の石しかないか、始まった時点で勝敗が決定するようなマップの場合がある
-		if (!this.canPutSomewhere(BLACK))
+		if (!this.canPutSomewhere(BLACK)) this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
-			this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
 	}
 
 	/**
@@ -226,11 +225,12 @@ export default class Reversi {
 				// 座標が指し示す位置がボード外に出たとき
 				if (this.opts.loopedBoard && this.transformXyToPos(
 					(x = ((x % this.mapWidth) + this.mapWidth) % this.mapWidth),
-					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos)
+					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos) {
 						// 盤面の境界でループし、自分が石を置く位置に戻ってきたとき、挟めるようにしている (ref: Test4のマップ)
 					return found;
-				else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight)
+				} else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight) {
 					return []; // 挟めないことが確定 (盤面外に到達)
+				}
 
 				const pos = this.transformXyToPos(x, y);
 				if (this.mapDataGet(pos) === 'null') return []; // 挟めないことが確定 (配置不可能なマスに到達)

packages/backend/src/misc/get-file-info.ts

@@ -19,6 +19,7 @@ export type FileInfo = {
 	};
 	width?: number;
 	height?: number;
+	orientation?: number;
 	blurhash?: string;
 	warnings: string[];
 };
@@ -47,6 +48,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 	// image dimensions
 	let width: number | undefined;
 	let height: number | undefined;
+	let orientation: number | undefined;
 
 	if (['image/jpeg', 'image/gif', 'image/png', 'image/apng', 'image/webp', 'image/bmp', 'image/tiff', 'image/svg+xml', 'image/vnd.adobe.photoshop'].includes(type.mime)) {
 		const imageSize = await detectImageSize(path).catch(e => {
@@ -61,6 +63,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 		} else if (imageSize.wUnits === 'px') {
 			width = imageSize.width;
 			height = imageSize.height;
+			orientation = imageSize.orientation;
 
 			// 制限を超えている画像は octet-stream にする
 			if (imageSize.width > 16383 || imageSize.height > 16383) {
@@ -87,6 +90,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 		type,
 		width,
 		height,
+		orientation,
 		blurhash,
 		warnings,
 	};
@@ -163,6 +167,7 @@ async function detectImageSize(path: string): Promise<{
 	height: number;
 	wUnits: string;
 	hUnits: string;
+	orientation?: number;
 }> {
 	const readable = fs.createReadStream(path);
 	const imageSize = await probeImageSize(readable);

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

@@ -54,7 +54,7 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu
 
 	const queryOrNull = async () => (await Emojis.findOne({
 		name,
-		host
+		host,
 	})) || null;
 
 	const emoji = await cache.fetch(`${name} ${host}`, queryOrNull);
@@ -62,7 +62,7 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu
 	if (emoji == null) return null;
 
 	const isLocal = emoji.host == null;
-	const url = isLocal ? emoji.url : `${config.url}/proxy/image.png?${query({url: emoji.url})}`;
+	const url = isLocal ? emoji.url : `${config.url}/proxy/image.png?${query({ url: emoji.url })}`;
 
 	return {
 		name: emojiName,
@@ -111,12 +111,12 @@ export async function prefetchEmojis(emojis: { name: string; host: string | null
 	for (const host of hosts) {
 		emojisQuery.push({
 			name: In(notCachedEmojis.filter(e => e.host === host).map(e => e.name)),
-			host: host
+			host: host,
 		});
 	}
 	const _emojis = emojisQuery.length > 0 ? await Emojis.find({
 		where: emojisQuery,
-		select: ['name', 'host', 'url']
+		select: ['name', 'host', 'url'],
 	}) : [];
 	for (const emoji of _emojis) {
 		cache.set(`${emoji.name} ${emoji.host}`, emoji);

packages/backend/src/misc/reaction-lib.ts

@@ -1,3 +1,4 @@
+/* eslint-disable key-spacing */
 import { emojiRegex } from './emoji-regex';
 import { fetchMeta } from './fetch-meta';
 import { Emojis } from '@/models/index';

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

@@ -77,7 +77,7 @@ export class DriveFile {
 		default: {},
 		comment: 'The any properties of the DriveFile. For example, it includes image width/height.'
 	})
-	public properties: { width?: number; height?: number; avgColor?: string };
+	public properties: { width?: number; height?: number; orientation?: number; avgColor?: string };
 
 	@Index()
 	@Column('boolean')

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

@@ -28,6 +28,19 @@ export class DriveFileRepository extends Repository<DriveFile> {
 		);
 	}
 
+	public getPublicProperties(file: DriveFile): DriveFile['properties'] {
+		if (file.properties.orientation != null) {
+			const properties = JSON.parse(JSON.stringify(file.properties));
+			if (file.properties.orientation >= 5) {
+				[properties.width, properties.height] = [properties.height, properties.width];
+			}
+			properties.orientation = undefined;
+			return properties;
+		}
+
+		return file.properties;
+	}
+
 	public getPublicUrl(file: DriveFile, thumbnail = false, meta?: Meta): string | null {
 		// リモートかつメディアプロキシ
 		if (file.uri != null && file.userHost != null && config.mediaProxy != null) {
@@ -122,7 +135,7 @@ export class DriveFileRepository extends Repository<DriveFile> {
 			size: file.size,
 			isSensitive: file.isSensitive,
 			blurhash: file.blurhash,
-			properties: file.properties,
+			properties: opts.self ? file.properties : this.getPublicProperties(file),
 			url: opts.self ? file.url : this.getPublicUrl(file, false, meta),
 			thumbnailUrl: this.getPublicUrl(file, true, meta),
 			comment: file.comment,
@@ -202,6 +215,11 @@ export const packedDriveFileSchema = {
 					optional: true as const, nullable: false as const,
 					example: 720
 				},
+				orientation: {
+					type: 'number' as const,
+					optional: true as const, nullable: false as const,
+					example: 8
+				},
 				avgColor: {
 					type: 'string' as const,
 					optional: true as const, nullable: false as const,

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

@@ -189,12 +189,12 @@ export class UserRepository extends Repository<User> {
 
 		const followingCount = profile == null ? null :
 			(profile.ffVisibility === 'public') || (meId === user.id) ? user.followingCount :
-			(profile.ffVisibility === 'followers') && (relation!.isFollowing) ? user.followingCount :
+			(profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
 			null;
 
 		const followersCount = profile == null ? null :
 			(profile.ffVisibility === 'public') || (meId === user.id) ? user.followersCount :
-			(profile.ffVisibility === 'followers') && (relation!.isFollowing) ? user.followersCount :
+			(profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
 			null;
 
 		const falsy = opts.detail ? false : undefined;

packages/backend/src/remote/activitypub/ap-request.ts

@@ -66,7 +66,7 @@ function signToRequest(request: Request, key: PrivateKey, includeHeaders: string
 	const signatureHeader = `keyId="${key.keyId}",algorithm="rsa-sha256",headers="${includeHeaders.join(' ')}",signature="${signature}"`;
 
 	request.headers = objectAssignWithLcKey(request.headers, {
-		Signature: signatureHeader
+		Signature: signatureHeader,
 	});
 
 	return {

packages/backend/src/remote/activitypub/kernel/reject/follow.ts

@@ -1,8 +1,9 @@
 import { IRemoteUser } from '@/models/entities/user';
-import reject from '@/services/following/requests/reject';
+import { remoteReject } from '@/services/following/reject';
 import { IFollow } from '../../type';
 import DbResolver from '../../db-resolver';
 import { relayRejected } from '@/services/relay';
+import { Users } from '@/models';
 
 export default async (actor: IRemoteUser, activity: IFollow): Promise<string> => {
 	// ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある
@@ -14,7 +15,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<string> =>
 		return `skip: follower not found`;
 	}
 
-	if (follower.host != null) {
+	if (!Users.isLocalUser(follower)) {
 		return `skip: follower is not a local user`;
 	}
 
@@ -24,6 +25,6 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<string> =>
 		return await relayRejected(match[1]);
 	}
 
-	await reject(actor, follower);
+	await remoteReject(actor, follower);
 	return `ok`;
 };

packages/backend/src/remote/activitypub/kernel/undo/accept.ts

@@ -0,0 +1,27 @@
+import unfollow from '@/services/following/delete';
+import cancelRequest from '@/services/following/requests/cancel';
+import {IAccept} from '../../type';
+import { IRemoteUser } from '@/models/entities/user';
+import { Followings } from '@/models/index';
+import DbResolver from '../../db-resolver';
+
+export default async (actor: IRemoteUser, activity: IAccept): Promise<string> => {
+	const dbResolver = new DbResolver();
+
+	const follower = await dbResolver.getUserFromApId(activity.object);
+	if (follower == null) {
+		return `skip: follower not found`;
+	}
+
+	const following = await Followings.findOne({
+		followerId: follower.id,
+		followeeId: actor.id
+	});
+
+	if (following) {
+		await unfollow(follower, actor);
+		return `ok: unfollowed`;
+	}
+
+	return `skip: フォローされていない`;
+};

packages/backend/src/remote/activitypub/kernel/undo/index.ts

@@ -1,8 +1,9 @@
 import { IRemoteUser } from '@/models/entities/user';
-import { IUndo, isFollow, isBlock, isLike, isAnnounce, getApType } from '../../type';
+import {IUndo, isFollow, isBlock, isLike, isAnnounce, getApType, isAccept} from '../../type';
 import unfollow from './follow';
 import unblock from './block';
 import undoLike from './like';
+import undoAccept from './accept';
 import { undoAnnounce } from './announce';
 import Resolver from '../../resolver';
 import { apLogger } from '../../logger';
@@ -29,6 +30,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<string> => {
 	if (isBlock(object)) return await unblock(actor, object);
 	if (isLike(object)) return await undoLike(actor, object);
 	if (isAnnounce(object)) return await undoAnnounce(actor, object);
+	if (isAccept(object)) return await undoAccept(actor, object);
 
 	return `skip: unknown object type ${getApType(object)}`;
 };

packages/backend/src/remote/activitypub/models/person.ts

@@ -163,7 +163,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 				uri: person.id,
 				tags,
 				isBot,
-				isCat: (person as any).isCat === true
+				isCat: (person as any).isCat === true,
 			})) as IRemoteUser;
 
 			await transactionalEntityManager.save(new UserProfile({
@@ -173,14 +173,14 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 				fields,
 				birthday: bday ? bday[0] : null,
 				location: person['vcard:Address'] || null,
-				userHost: host
+				userHost: host,
 			}));
 
 			if (person.publicKey) {
 				await transactionalEntityManager.save(new UserPublickey({
 					userId: user.id,
 					keyId: person.publicKey.id,
-					keyPem: person.publicKey.publicKeyPem
+					keyPem: person.publicKey.publicKeyPem,
 				}));
 			}
 		});
@@ -189,7 +189,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 		if (isDuplicateKeyValueError(e)) {
 			// /users/@a => /users/:id のように入力がaliasなときにエラーになることがあるのを対応
 			const u = await Users.findOne({
-				uri: person.id
+				uri: person.id,
 			});
 
 			if (u) {
@@ -218,11 +218,11 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 	//#region アバターとヘッダー画像をフェッチ
 	const [avatar, banner] = await Promise.all([
 		person.icon,
-		person.image
+		person.image,
 	].map(img =>
 		img == null
 			? Promise.resolve(null)
-			: resolveImage(user!, img).catch(() => null)
+			: resolveImage(user!, img).catch(() => null),
 	));
 
 	const avatarId = avatar ? avatar.id : null;
@@ -258,7 +258,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 	const emojiNames = emojis.map(emoji => emoji.name);
 
 	await Users.update(user!.id, {
-		emojis: emojiNames
+		emojis: emojiNames,
 	});
 	//#endregion
 
@@ -301,11 +301,11 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 	// アバターとヘッダー画像をフェッチ
 	const [avatar, banner] = await Promise.all([
 		person.icon,
-		person.image
+		person.image,
 	].map(img =>
 		img == null
 			? Promise.resolve(null)
-			: resolveImage(exist, img).catch(() => null)
+			: resolveImage(exist, img).catch(() => null),
 	));
 
 	// カスタム絵文字取得
@@ -355,7 +355,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 	if (person.publicKey) {
 		await UserPublickeys.update({ userId: exist.id }, {
 			keyId: person.publicKey.id,
-			keyPem: person.publicKey.publicKeyPem
+			keyPem: person.publicKey.publicKeyPem,
 		});
 	}
 
@@ -372,9 +372,9 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 
 	// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
 	await Followings.update({
-		followerId: exist.id
+		followerId: exist.id,
 	}, {
-		followerSharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined)
+		followerSharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
 	});
 
 	await updateFeatured(exist.id).catch(err => logger.error(err));
@@ -411,8 +411,9 @@ const services: {
 };
 
 const $discord = (id: string, name: string) => {
-	if (typeof name !== 'string')
+	if (typeof name !== 'string') {
 		name = 'unknown#0000';
+	}
 	const [username, discriminator] = name.split('#');
 	return { id, username, discriminator };
 };
@@ -420,13 +421,15 @@ const $discord = (id: string, name: string) => {
 function addService(target: { [x: string]: any }, source: IApPropertyValue) {
 	const service = services[source.name];
 
-	if (typeof source.value !== 'string')
+	if (typeof source.value !== 'string') {
 		source.value = 'unknown';
+	}
 
 	const [id, username] = source.value.split('@');
 
-	if (service)
+	if (service) {
 		target[source.name.split(':')[2]] = service(id, username);
+	}
 }
 
 export function analyzeAttachments(attachments: IObject | IObject[] | undefined) {
@@ -443,7 +446,7 @@ export function analyzeAttachments(attachments: IObject | IObject[] | undefined)
 			} else {
 				fields.push({
 					name: attachment.name,
-					value: fromHtml(attachment.value)
+					value: fromHtml(attachment.value),
 				});
 			}
 		}
@@ -487,7 +490,7 @@ export async function updateFeatured(userId: User['id']) {
 				id: genId(new Date(Date.now() + td)),
 				createdAt: new Date(),
 				userId: user.id,
-				noteId: note!.id
+				noteId: note!.id,
 			});
 		}
 	});

packages/backend/src/server/api/2fa.ts

@@ -6,7 +6,7 @@ const ECC_PRELUDE = Buffer.from([0x04]);
 const NULL_BYTE = Buffer.from([0]);
 const PEM_PRELUDE = Buffer.from(
 	'3059301306072a8648ce3d020106082a8648ce3d030107034200',
-	'hex'
+	'hex',
 );
 
 // Android Safetynet attestations are signed with this cert:
@@ -68,7 +68,7 @@ function verifyCertificateChain(certificates: string[]) {
 		const signatureHex = certificate.getSignatureValueHex();
 
 		// Verify against CA
-		const Signature = new jsrsasign.KJUR.crypto.Signature({alg: algorithm});
+		const Signature = new jsrsasign.KJUR.crypto.Signature({ alg: algorithm });
 		Signature.init(CACert);
 		Signature.updateHex(certStruct);
 		valid = valid && !!Signature.verify(signatureHex); // true if CA signed the certificate
@@ -134,7 +134,7 @@ export function verifyLogin({
 
 	const verificationData = Buffer.concat(
 		[authenticatorData, hash(clientDataJSON)],
-		32 + authenticatorData.length
+		32 + authenticatorData.length,
 	);
 
 	return crypto
@@ -145,7 +145,7 @@ export function verifyLogin({
 
 export const procedures = {
 	none: {
-		verify({publicKey}: {publicKey: Map<number, Buffer>}) {
+		verify({ publicKey }: {publicKey: Map<number, Buffer>}) {
 			const negTwo = publicKey.get(-2);
 
 			if (!negTwo || negTwo.length != 32) {
@@ -158,14 +158,14 @@ export const procedures = {
 
 			const publicKeyU2F = Buffer.concat(
 				[ECC_PRELUDE, negTwo, negThree],
-				1 + 32 + 32
+				1 + 32 + 32,
 			);
 
 			return {
 				publicKey: publicKeyU2F,
-				valid: true
+				valid: true,
 			};
-		}
+		},
 	},
 	'android-key': {
 		verify({
@@ -174,7 +174,7 @@ export const procedures = {
 			clientDataHash,
 			publicKey,
 			rpIdHash,
-			credentialId
+			credentialId,
 		}: {
 			attStmt: any,
 			authenticatorData: Buffer,
@@ -189,7 +189,7 @@ export const procedures = {
 
 			const verificationData = Buffer.concat([
 				authenticatorData,
-				clientDataHash
+				clientDataHash,
 			]);
 
 			const attCert: Buffer = attStmt.x5c[0];
@@ -206,7 +206,7 @@ export const procedures = {
 
 			const publicKeyData = Buffer.concat(
 				[ECC_PRELUDE, negTwo, negThree],
-				1 + 32 + 32
+				1 + 32 + 32,
 			);
 
 			if (!attCert.equals(publicKeyData)) {
@@ -222,9 +222,9 @@ export const procedures = {
 
 			return {
 				valid: isValid,
-				publicKey: publicKeyData
+				publicKey: publicKeyData,
 			};
-		}
+		},
 	},
 	// what a stupid attestation
 	'android-safetynet': {
@@ -234,7 +234,7 @@ export const procedures = {
 			clientDataHash,
 			publicKey,
 			rpIdHash,
-			credentialId
+			credentialId,
 		}: {
 			attStmt: any,
 			authenticatorData: Buffer,
@@ -244,14 +244,14 @@ export const procedures = {
 			credentialId: Buffer,
 		}) {
 			const verificationData = hash(
-				Buffer.concat([authenticatorData, clientDataHash])
+				Buffer.concat([authenticatorData, clientDataHash]),
 			);
 
 			const jwsParts = attStmt.response.toString('utf-8').split('.');
 
 			const header = JSON.parse(base64URLDecode(jwsParts[0]).toString('utf-8'));
 			const response = JSON.parse(
-				base64URLDecode(jwsParts[1]).toString('utf-8')
+				base64URLDecode(jwsParts[1]).toString('utf-8'),
 			);
 			const signature = jwsParts[2];
 
@@ -273,7 +273,7 @@ export const procedures = {
 
 			const signatureBase = Buffer.from(
 				jwsParts[0] + '.' + jwsParts[1],
-				'utf-8'
+				'utf-8',
 			);
 
 			const valid = crypto
@@ -293,13 +293,13 @@ export const procedures = {
 
 			const publicKeyData = Buffer.concat(
 				[ECC_PRELUDE, negTwo, negThree],
-				1 + 32 + 32
+				1 + 32 + 32,
 			);
 			return {
 				valid,
-				publicKey: publicKeyData
+				publicKey: publicKeyData,
 			};
-		}
+		},
 	},
 	packed: {
 		verify({
@@ -308,7 +308,7 @@ export const procedures = {
 			clientDataHash,
 			publicKey,
 			rpIdHash,
-			credentialId
+			credentialId,
 		}: {
 			attStmt: any,
 			authenticatorData: Buffer,
@@ -319,7 +319,7 @@ export const procedures = {
 		}) {
 			const verificationData = Buffer.concat([
 				authenticatorData,
-				clientDataHash
+				clientDataHash,
 			]);
 
 			if (attStmt.x5c) {
@@ -342,12 +342,12 @@ export const procedures = {
 
 				const publicKeyData = Buffer.concat(
 					[ECC_PRELUDE, negTwo, negThree],
-					1 + 32 + 32
+					1 + 32 + 32,
 				);
 
 				return {
 					valid: validSignature,
-					publicKey: publicKeyData
+					publicKey: publicKeyData,
 				};
 			} else if (attStmt.ecdaaKeyId) {
 				// https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-ecdaa-algorithm-v2.0-id-20180227.html#ecdaa-verify-operation
@@ -357,7 +357,7 @@ export const procedures = {
 
 				throw new Error('self attestation is not supported');
 			}
-		}
+		},
 	},
 
 	'fido-u2f': {
@@ -367,7 +367,7 @@ export const procedures = {
 			clientDataHash,
 			publicKey,
 			rpIdHash,
-			credentialId
+			credentialId,
 		}: {
 			attStmt: any,
 			authenticatorData: Buffer,
@@ -397,7 +397,7 @@ export const procedures = {
 
 			const publicKeyU2F = Buffer.concat(
 				[ECC_PRELUDE, negTwo, negThree],
-				1 + 32 + 32
+				1 + 32 + 32,
 			);
 
 			const verificationData = Buffer.concat([
@@ -405,7 +405,7 @@ export const procedures = {
 				rpIdHash,
 				clientDataHash,
 				credentialId,
-				publicKeyU2F
+				publicKeyU2F,
 			]);
 
 			const validSignature = crypto
@@ -415,8 +415,8 @@ export const procedures = {
 
 			return {
 				valid: validSignature,
-				publicKey: publicKeyU2F
+				publicKey: publicKeyU2F,
 			};
-		}
+		},
-	}
+	},
 };

packages/backend/src/server/api/endpoints/antennas/notes.ts

@@ -33,6 +33,14 @@ export const meta = {
 		untilId: {
 			validator: $.optional.type(ID),
 		},
+
+		sinceDate: {
+			validator: $.optional.num,
+		},
+
+		untilDate: {
+			validator: $.optional.num,
+		},
 	},
 
 	errors: {
@@ -68,7 +76,8 @@ export default define(meta, async (ps, user) => {
 		.select('joining.noteId')
 		.where('joining.antennaId = :antennaId', { antennaId: antenna.id });
 
-	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
+			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere(`note.id IN (${ antennaQuery.getQuery() })`)
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('note.reply', 'reply')

packages/backend/src/server/api/endpoints/following/invalidate.ts

@@ -0,0 +1,82 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import * as ms from 'ms';
+import deleteFollowing from '@/services/following/delete';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { getUser } from '../../common/getters';
+import { Followings, Users } from '@/models/index';
+
+export const meta = {
+	tags: ['following', 'users'],
+
+	limit: {
+		duration: ms('1hour'),
+		max: 100
+	},
+
+	requireCredential: true as const,
+
+	kind: 'write:following',
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+		}
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '5b12c78d-2b28-4dca-99d2-f56139b42ff8'
+		},
+
+		followerIsYourself: {
+			message: 'Follower is yourself.',
+			code: 'FOLLOWER_IS_YOURSELF',
+			id: '07dc03b9-03da-422d-885b-438313707662'
+		},
+
+		notFollowing: {
+			message: 'The other use is not following you.',
+			code: 'NOT_FOLLOWING',
+			id: '5dbf82f5-c92b-40b1-87d1-6c8c0741fd09'
+		},
+	},
+
+	res: {
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
+		ref: 'User'
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const followee = user;
+
+	// Check if the follower is yourself
+	if (user.id === ps.userId) {
+		throw new ApiError(meta.errors.followerIsYourself);
+	}
+
+	// Get follower
+	const follower = await getUser(ps.userId).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
+
+	// Check not following
+	const exist = await Followings.findOne({
+		followerId: follower.id,
+		followeeId: followee.id
+	});
+
+	if (exist == null) {
+		throw new ApiError(meta.errors.notFollowing);
+	}
+
+	await deleteFollowing(follower, followee);
+
+	return await Users.pack(followee.id, user);
+});

packages/backend/src/server/api/endpoints/following/requests/reject.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
-import rejectFollowRequest from '@/services/following/requests/reject';
+import { rejectFollowRequest } from '@/services/following/reject';
 import define from '../../../define';
 import { ApiError } from '../../../error';
 import { getUser } from '../../../common/getters';

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -244,8 +244,9 @@ export default define(meta, async (ps, user) => {
 
 	if (ps.poll) {
 		if (typeof ps.poll.expiresAt === 'number') {
-			if (ps.poll.expiresAt < Date.now())
+			if (ps.poll.expiresAt < Date.now()) {
 				throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
+			}
 		} else if (typeof ps.poll.expiredAfter === 'number') {
 			ps.poll.expiresAt = Date.now() + ps.poll.expiredAfter;
 		}

packages/backend/src/server/api/endpoints/notes/polls/vote.ts

@@ -112,8 +112,9 @@ export default define(meta, async (ps, user) => {
 
 	if (exist.length) {
 		if (poll.multiple) {
-			if (exist.some(x => x.choice == ps.choice))
+			if (exist.some(x => x.choice == ps.choice)) {
 				throw new ApiError(meta.errors.alreadyVoted);
+			}
 		} else {
 			throw new ApiError(meta.errors.alreadyVoted);
 		}

packages/backend/src/server/api/service/github.ts

@@ -42,7 +42,7 @@ router.get('/disconnect/github', async ctx => {
 
 	const user = await Users.findOneOrFail({
 		host: null,
-		token: userToken
+		token: userToken,
 	});
 
 	const profile = await UserProfiles.findOneOrFail(user.id);
@@ -58,7 +58,7 @@ router.get('/disconnect/github', async ctx => {
 	// Publish i updated event
 	publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
 		detail: true,
-		includeSecrets: true
+		includeSecrets: true,
 	}));
 });
 
@@ -209,12 +209,13 @@ router.get('/gh/cb', async ctx => {
 				code,
 				{ redirect_uri },
 				(err, accessToken, refresh, result) => {
-					if (err)
+					if (err) {
 						rej(err);
-					else if (result.error)
+					} else if (result.error) {
 						rej(result.error);
-					else
+					} else {
 						res({ accessToken });
+					}
 				}));
 
 		const { login, id } = await getJson('https://api.github.com/user', 'application/vnd.github.v3+json', 10 * 1000, {

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

@@ -45,8 +45,6 @@
 			localStorage.setItem('lang', lang);
 			localStorage.setItem('locale', await res.text());
 			localStorage.setItem('localeVersion', v);
-		} else if (localeOutdated) {
-			// nop
 		} else {
 			await checkUpdate();
 			renderError('LOCALE_FETCH_FAILED');

packages/backend/src/server/well-known.ts

@@ -41,8 +41,8 @@ router.get('/.well-known/host-meta', async ctx => {
 	ctx.set('Content-Type', xrd);
 	ctx.body = XRD({ element: 'Link', attributes: {
 		type: xrd,
-		template: `${config.url}${webFingerPath}?resource={uri}`
+		template: `${config.url}${webFingerPath}?resource={uri}`,
-	}});
+	} });
 });
 
 router.get('/.well-known/host-meta.json', async ctx => {
@@ -51,8 +51,8 @@ router.get('/.well-known/host-meta.json', async ctx => {
 		links: [{
 			rel: 'lrdd',
 			type: jrd,
-			template: `${config.url}${webFingerPath}?resource={uri}`
+			template: `${config.url}${webFingerPath}?resource={uri}`,
-		}]
+		}],
 	};
 });
 

packages/backend/src/services/drive/add-file.ts

@@ -372,12 +372,16 @@ export default async function(
 	const properties: {
 		width?: number;
 		height?: number;
+		orientation?: number;
 	} = {};
 
 	if (info.width) {
 		properties['width'] = info.width;
 		properties['height'] = info.height;
 	}
+	if (info.orientation != null) {
+		properties['orientation'] = info.orientation;
+	}
 
 	const profile = user ? await UserProfiles.findOne(user.id) : null;
 

packages/backend/src/services/following/delete.ts

@@ -2,6 +2,7 @@ import { publishMainStream, publishUserEvent } from '@/services/stream';
 import { renderActivity } from '@/remote/activitypub/renderer/index';
 import renderFollow from '@/remote/activitypub/renderer/follow';
 import renderUndo from '@/remote/activitypub/renderer/undo';
+import renderReject from '@/remote/activitypub/renderer/reject';
 import { deliver } from '@/queue/index';
 import Logger from '../logger';
 import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
@@ -40,6 +41,12 @@ export default async function(follower: { id: User['id']; host: User['host']; ur
 		const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
 		deliver(follower, content, followee.inbox);
 	}
+
+	if (Users.isLocalUser(followee) && Users.isRemoteUser(follower)) {
+		// local user has null host
+		const content = renderActivity(renderReject(renderFollow(follower, followee), followee));
+		deliver(followee, content, follower.inbox);
+	}
 }
 
 export async function decrementFollowing(follower: { id: User['id']; host: User['host']; }, followee: { id: User['id']; host: User['host']; }) {

packages/backend/src/services/following/reject.ts

@@ -0,0 +1,105 @@
+import { renderActivity } from '@/remote/activitypub/renderer/index';
+import renderFollow from '@/remote/activitypub/renderer/follow';
+import renderReject from '@/remote/activitypub/renderer/reject';
+import { deliver } from '@/queue/index';
+import { publishMainStream, publishUserEvent } from '@/services/stream';
+import { User, ILocalUser, IRemoteUser } from '@/models/entities/user';
+import { Users, FollowRequests, Followings } from '@/models/index';
+import { decrementFollowing } from './delete';
+
+type Local = ILocalUser | { id: User['id']; host: User['host']; uri: User['host'] };
+type Remote = IRemoteUser;
+type Both = Local | Remote;
+
+/**
+ * API following/request/reject
+ */
+export async function rejectFollowRequest(user: Local, follower: Both) {
+	if (Users.isRemoteUser(follower)) {
+		deliverReject(user, follower);
+	}
+
+	await removeFollowRequest(user, follower);
+
+	if (Users.isLocalUser(follower)) {
+		publishUnfollow(user, follower);
+	}
+}
+
+/**
+ * API following/reject
+ */
+export async function rejectFollow(user: Local, follower: Both) {
+	if (Users.isRemoteUser(follower)) {
+		deliverReject(user, follower);
+	}
+
+	await removeFollow(user, follower);
+
+	if (Users.isLocalUser(follower)) {
+		publishUnfollow(user, follower);
+	}
+}
+
+/**
+ * AP Reject/Follow
+ */
+export async function remoteReject(actor: Remote, follower: Local) {
+	await removeFollowRequest(actor, follower);
+	await removeFollow(actor, follower);
+	publishUnfollow(actor, follower);
+}
+
+/**
+ * Remove follow request record
+ */
+async function removeFollowRequest(followee: Both, follower: Both) {
+	const request = await FollowRequests.findOne({
+		followeeId: followee.id,
+		followerId: follower.id
+	});
+
+	if (!request) return;
+
+	await FollowRequests.delete(request.id);
+}
+
+/**
+ * Remove follow record
+ */
+async function removeFollow(followee: Both, follower: Both) {
+	const following = await Followings.findOne({
+		followeeId: followee.id,
+		followerId: follower.id
+	});
+
+	if (!following) return;
+
+	await Followings.delete(following.id);
+	decrementFollowing(follower, followee);
+}
+
+/**
+ * Deliver Reject to remote
+ */
+async function deliverReject(followee: Local, follower: Remote) {
+	const request = await FollowRequests.findOne({
+		followeeId: followee.id,
+		followerId: follower.id
+	});
+
+	const content = renderActivity(renderReject(renderFollow(follower, followee, request?.requestId || undefined), followee));
+	deliver(followee, content, follower.inbox);
+}
+
+/**
+ * Publish unfollow to local
+ */
+async function publishUnfollow(followee: Both, follower: Local) {
+	const packedFollowee = await Users.pack(followee.id, follower, {
+		detail: true
+	});
+
+	publishUserEvent(follower.id, 'unfollow', packedFollowee);
+	publishMainStream(follower.id, 'unfollow', packedFollowee);
+}

packages/backend/src/services/following/requests/reject.ts

@@ -1,46 +0,0 @@
-import { renderActivity } from '@/remote/activitypub/renderer/index';
-import renderFollow from '@/remote/activitypub/renderer/follow';
-import renderReject from '@/remote/activitypub/renderer/reject';
-import { deliver } from '@/queue/index';
-import { publishMainStream, publishUserEvent } from '@/services/stream';
-import { User, ILocalUser } from '@/models/entities/user';
-import { Users, FollowRequests, Followings } from '@/models/index';
-import { decrementFollowing } from '../delete';
-
-export default async function(followee: { id: User['id']; host: User['host']; uri: User['host'] }, follower: User) {
-	if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
-		const request = await FollowRequests.findOne({
-			followeeId: followee.id,
-			followerId: follower.id
-		});
-
-		const content = renderActivity(renderReject(renderFollow(follower, followee, request!.requestId!), followee));
-		deliver(followee, content, follower.inbox);
-	}
-
-	const request = await FollowRequests.findOne({
-		followeeId: followee.id,
-		followerId: follower.id
-	});
-
-	if (request) {
-		await FollowRequests.delete(request.id);
-	} else {
-		const following = await Followings.findOne({
-			followeeId: followee.id,
-			followerId: follower.id
-		});
-
-		if (following) {
-			await Followings.delete(following.id);
-			decrementFollowing(follower, followee);
-		}
-	}
-
-	Users.pack(followee.id, follower, {
-		detail: true
-	}).then(packed => {
-		publishUserEvent(follower.id, 'unfollow', packed);
-		publishMainStream(follower.id, 'unfollow', packed);
-	});
-}

packages/backend/src/tools/add-emoji.ts

@@ -1,7 +1,10 @@
-import { Emojis } from '@/models/index';
+import { initDb } from '@/db/postgre';
 import { genId } from '@/misc/gen-id';
 
 async function main(name: string, url: string, alias?: string): Promise<any> {
+	await initDb();
+	const { Emojis } = await import('@/models/index');
+
 	const aliases = alias != null ? [ alias ] : [];
 
 	await Emojis.save({

packages/backend/src/tools/demote-admin.ts

@@ -1,13 +1,11 @@
 import { initDb } from '../db/postgre';
-import { getRepository } from 'typeorm';
-import { User } from '@/models/entities/user';
 
 async function main(username: string) {
 	if (!username) throw `username required`;
 	username = username.replace(/^@/, '');
 
 	await initDb();
-	const Users = getRepository(User);
+	const { Users } = await import('@/models/index');
 
 	const res = await Users.update({
 		usernameLower: username.toLowerCase(),

packages/backend/src/tools/mark-admin.ts

@@ -1,13 +1,11 @@
 import { initDb } from '../db/postgre';
-import { getRepository } from 'typeorm';
-import { User } from '@/models/entities/user';
 
 async function main(username: string) {
 	if (!username) throw `username required`;
 	username = username.replace(/^@/, '');
 
 	await initDb();
-	const Users = getRepository(User);
+	const { Users } = await import('@/models/index');
 
 	const res = await Users.update({
 		usernameLower: username.toLowerCase(),

packages/backend/src/tools/refresh-question.ts

@@ -1,6 +1,9 @@
-import { updateQuestion } from '@/remote/activitypub/models/question';
+import { initDb } from '@/db/postgre';
 
 async function main(uri: string): Promise<any> {
+	await initDb();
+	const { updateQuestion } = await import('@/remote/activitypub/models/question');
+
 	return await updateQuestion(uri);
 }
 

packages/backend/src/tools/show-signin-history.ts

@@ -1,4 +1,4 @@
-import { Users, Signins } from '@/models/index';
+import { initDb } from '@/db/postgre';
 
 // node built/tools/show-signin-history username
 //  => {Success} {Date} {IPAddrsss}
@@ -10,6 +10,9 @@ import { Users, Signins } from '@/models/index';
 //  with full request headers
 
 async function main(username: string, headers?: string[]) {
+	await initDb();
+	const { Users, Signins } = await import('@/models/index');
+
 	const user = await Users.findOne({
 		host: null,
 		usernameLower: username.toLowerCase(),

packages/backend/test/get-file-info.ts

@@ -17,6 +17,7 @@ describe('Get file info', () => {
 			},
 			width: undefined,
 			height: undefined,
+			orientation: undefined,
 		});
 	}));
 
@@ -34,6 +35,7 @@ describe('Get file info', () => {
 			},
 			width: 512,
 			height: 512,
+			orientation: undefined,
 		});
 	}));
 
@@ -51,6 +53,7 @@ describe('Get file info', () => {
 			},
 			width: 256,
 			height: 256,
+			orientation: undefined,
 		});
 	}));
 
@@ -68,6 +71,7 @@ describe('Get file info', () => {
 			},
 			width: 256,
 			height: 256,
+			orientation: undefined,
 		});
 	}));
 
@@ -85,6 +89,7 @@ describe('Get file info', () => {
 			},
 			width: 256,
 			height: 256,
+			orientation: undefined,
 		});
 	}));
 
@@ -102,6 +107,7 @@ describe('Get file info', () => {
 			},
 			width: 256,
 			height: 256,
+			orientation: undefined,
 		});
 	}));
 
@@ -120,6 +126,7 @@ describe('Get file info', () => {
 			},
 			width: 256,
 			height: 256,
+			orientation: undefined,
 		});
 	}));
 
@@ -137,6 +144,25 @@ describe('Get file info', () => {
 			},
 			width: 25000,
 			height: 25000,
+			orientation: undefined,
+		});
+	}));
+
+	it('Rotate JPEG', async (async () => {
+		const path = `${__dirname}/resources/rotate.jpg`;
+		const info = await getFileInfo(path) as any;
+		delete info.warnings;
+		delete info.blurhash;
+		assert.deepStrictEqual(info, {
+			size: 12624,
+			md5: '68d5b2d8d1d1acbbce99203e3ec3857e',
+			type: {
+				mime: 'image/jpeg',
+				ext: 'jpg'
+			},
+			width: 512,
+			height: 256,
+			orientation: 8,
 		});
 	}));
 });

packages/backend/tools/accept-migration.js

@@ -1,26 +0,0 @@
-"use strict";
-// ex) node built/tools/accept-migration Yo 1000000000001
-Object.defineProperty(exports, "__esModule", { value: true });
-const typeorm_1 = require("typeorm");
-const index_1 = require("@/config/index");
-(0, typeorm_1.createConnection)({
-    type: 'postgres',
-    host: index_1.default.db.host,
-    port: index_1.default.db.port,
-    username: index_1.default.db.user,
-    password: index_1.default.db.pass,
-    database: index_1.default.db.db,
-    extra: index_1.default.db.extra,
-    synchronize: false,
-    dropSchema: false,
-}).then(c => {
-    c.query(`INSERT INTO migrations(timestamp,name) VALUES (${process.argv[3]}, '${process.argv[2]}${process.argv[3]}');`).then(() => {
-        console.log('done');
-        process.exit(0);
-    }).catch(e => {
-        console.log('ERROR:');
-        console.log(e);
-        process.exit(1);
-    });
-});
-//# sourceMappingURL=accept-migration.js.map

packages/backend/tools/accept-migration.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"accept-migration.js","sourceRoot":"","sources":["accept-migration.ts"],"names":[],"mappings":";AAAA,yDAAyD;;AAEzD,qCAA2C;AAC3C,0CAAoC;AAEpC,IAAA,0BAAgB,EAAC;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACpB,IAAI,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACpB,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACxB,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACxB,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,EAAE;IACtB,KAAK,EAAE,eAAM,CAAC,EAAE,CAAC,KAAK;IACtB,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;CACjB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;IACX,CAAC,CAAC,KAAK,CAAC,kDAAkD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAChI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

packages/backend/tools/add-emoji.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("@/models/index");
-const gen_id_1 = require("@/misc/gen-id");
-async function main(name, url, alias) {
-    const aliases = alias != null ? [alias] : [];
-    await index_1.Emojis.save({
-        id: (0, gen_id_1.genId)(),
-        host: null,
-        name,
-        url,
-        aliases,
-        updatedAt: new Date()
-    });
-}
-const args = process.argv.slice(2);
-const name = args[0];
-const url = args[1];
-if (!name)
-    throw new Error('require name');
-if (!url)
-    throw new Error('require url');
-main(name, url).then(() => {
-    console.log('success');
-    process.exit(0);
-}).catch(e => {
-    console.warn(e);
-    process.exit(1);
-});
-//# sourceMappingURL=add-emoji.js.map

packages/backend/tools/add-emoji.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-emoji.js","sourceRoot":"","sources":["add-emoji.ts"],"names":[],"mappings":";;AAAA,0CAAwC;AACxC,0CAAsC;AAEtC,KAAK,UAAU,IAAI,CAAC,IAAY,EAAE,GAAW,EAAE,KAAc;IAC5D,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAE,KAAK,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/C,MAAM,cAAM,CAAC,IAAI,CAAC;QACjB,EAAE,EAAE,IAAA,cAAK,GAAE;QACX,IAAI,EAAE,IAAI;QACV,IAAI;QACJ,GAAG;QACH,OAAO;QACP,SAAS,EAAE,IAAI,IAAI,EAAE;KACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AACrB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpB,IAAI,CAAC,IAAI;IAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAC3C,IAAI,CAAC,GAAG;IAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;AAEzC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACzB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}

packages/backend/tools/demote-admin.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const postgre_1 = require("../db/postgre");
-const typeorm_1 = require("typeorm");
-const user_1 = require("@/models/entities/user");
-async function main(username) {
-    if (!username)
-        throw `username required`;
-    username = username.replace(/^@/, '');
-    await (0, postgre_1.initDb)();
-    const Users = (0, typeorm_1.getRepository)(user_1.User);
-    const res = await Users.update({
-        usernameLower: username.toLowerCase(),
-        host: null
-    }, {
-        isAdmin: false
-    });
-    if (res.affected !== 1) {
-        throw 'Failed';
-    }
-}
-const args = process.argv.slice(2);
-main(args[0]).then(() => {
-    console.log('Success');
-    process.exit(0);
-}).catch(e => {
-    console.error(`Error: ${e.message || e}`);
-    process.exit(1);
-});
-//# sourceMappingURL=demote-admin.js.map

packages/backend/tools/demote-admin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"demote-admin.js","sourceRoot":"","sources":["demote-admin.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AACvC,qCAAwC;AACxC,iDAA8C;AAE9C,KAAK,UAAU,IAAI,CAAC,QAAgB;IACnC,IAAI,CAAC,QAAQ;QAAE,MAAM,mBAAmB,CAAC;IACzC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAA,gBAAM,GAAE,CAAC;IACf,MAAM,KAAK,GAAG,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAC;IAElC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;QAC9B,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE;QACrC,IAAI,EAAE,IAAI;KACV,EAAE;QACF,OAAO,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;QACvB,MAAM,QAAQ,CAAC;KACf;AACF,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}

packages/backend/tools/mark-admin.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const postgre_1 = require("../db/postgre");
-const typeorm_1 = require("typeorm");
-const user_1 = require("@/models/entities/user");
-async function main(username) {
-    if (!username)
-        throw `username required`;
-    username = username.replace(/^@/, '');
-    await (0, postgre_1.initDb)();
-    const Users = (0, typeorm_1.getRepository)(user_1.User);
-    const res = await Users.update({
-        usernameLower: username.toLowerCase(),
-        host: null
-    }, {
-        isAdmin: true
-    });
-    if (res.affected !== 1) {
-        throw 'Failed';
-    }
-}
-const args = process.argv.slice(2);
-main(args[0]).then(() => {
-    console.log('Success');
-    process.exit(0);
-}).catch(e => {
-    console.error(`Error: ${e.message || e}`);
-    process.exit(1);
-});
-//# sourceMappingURL=mark-admin.js.map

packages/backend/tools/mark-admin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mark-admin.js","sourceRoot":"","sources":["mark-admin.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AACvC,qCAAwC;AACxC,iDAA8C;AAE9C,KAAK,UAAU,IAAI,CAAC,QAAgB;IACnC,IAAI,CAAC,QAAQ;QAAE,MAAM,mBAAmB,CAAC;IACzC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAA,gBAAM,GAAE,CAAC;IACf,MAAM,KAAK,GAAG,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAC;IAElC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;QAC9B,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE;QACrC,IAAI,EAAE,IAAI;KACV,EAAE;QACF,OAAO,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;QACvB,MAAM,QAAQ,CAAC;KACf;AACF,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}

packages/backend/tools/refresh-question.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const question_1 = require("@/remote/activitypub/models/question");
-async function main(uri) {
-    return await (0, question_1.updateQuestion)(uri);
-}
-const args = process.argv.slice(2);
-const uri = args[0];
-main(uri).then(result => {
-    console.log(`Done: ${result}`);
-}).catch(e => {
-    console.warn(e);
-});
-//# sourceMappingURL=refresh-question.js.map

packages/backend/tools/refresh-question.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"refresh-question.js","sourceRoot":"","sources":["refresh-question.ts"],"names":[],"mappings":";;AAAA,mEAAsE;AAEtE,KAAK,UAAU,IAAI,CAAC,GAAW;IAC9B,OAAO,MAAM,IAAA,yBAAc,EAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}

packages/backend/tools/resync-remote-user.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const postgre_1 = require("@/db/postgre");
-const Acct = require("misskey-js/built/acct");
-async function main(acct) {
-    await (0, postgre_1.initDb)();
-    const { resolveUser } = await Promise.resolve().then(() => require('@/remote/resolve-user'));
-    const { username, host } = Acct.parse(acct);
-    await resolveUser(username, host, {}, true);
-}
-// get args
-const args = process.argv.slice(2);
-let acct = args[0];
-// normalize args
-acct = acct.replace(/^@/, '');
-// check args
-if (!acct.match(/^\w+@\w/)) {
-    throw `Invalid acct format. Valid format are user@host`;
-}
-console.log(`resync ${acct}`);
-main(acct).then(() => {
-    console.log('Done');
-}).catch(e => {
-    console.warn(e);
-});
-//# sourceMappingURL=resync-remote-user.js.map

packages/backend/tools/resync-remote-user.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resync-remote-user.js","sourceRoot":"","sources":["resync-remote-user.ts"],"names":[],"mappings":";;AAAA,0CAAsC;AACtC,8CAA8C;AAE9C,KAAK,UAAU,IAAI,CAAC,IAAY;IAC/B,MAAM,IAAA,gBAAM,GAAE,CAAC;IACf,MAAM,EAAE,WAAW,EAAE,GAAG,2CAAa,uBAAuB,EAAC,CAAC;IAE9D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAED,WAAW;AACX,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnB,iBAAiB;AACjB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAE9B,aAAa;AACb,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;IAC3B,MAAM,iDAAiD,CAAC;CACxD;AAED,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;AAE9B,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACpB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}

packages/backend/tools/show-signin-history.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("@/models/index");
-// node built/tools/show-signin-history username
-//  => {Success} {Date} {IPAddrsss}
-// node built/tools/show-signin-history username user-agent,x-forwarded-for
-//  with user-agent and x-forwarded-for
-// node built/tools/show-signin-history username all
-//  with full request headers
-async function main(username, headers) {
-    const user = await index_1.Users.findOne({
-        host: null,
-        usernameLower: username.toLowerCase(),
-    });
-    if (user == null)
-        throw new Error('User not found');
-    const history = await index_1.Signins.find({
-        userId: user.id
-    });
-    for (const signin of history) {
-        console.log(`${signin.success ? 'OK' : 'NG'} ${signin.createdAt ? signin.createdAt.toISOString() : 'Unknown'} ${signin.ip}`);
-        // headers
-        if (headers != null) {
-            for (const key of Object.keys(signin.headers)) {
-                if (headers.includes('all') || headers.includes(key)) {
-                    console.log(`   ${key}: ${signin.headers[key]}`);
-                }
-            }
-        }
-    }
-}
-// get args
-const args = process.argv.slice(2);
-let username = args[0];
-let headers;
-if (args[1] != null) {
-    headers = args[1].split(/,/).map(header => header.toLowerCase());
-}
-// normalize args
-username = username.replace(/^@/, '');
-main(username, headers).then(() => {
-    process.exit(0);
-}).catch(e => {
-    console.warn(e);
-    process.exit(1);
-});
-//# sourceMappingURL=show-signin-history.js.map

packages/backend/tools/show-signin-history.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"show-signin-history.js","sourceRoot":"","sources":["show-signin-history.ts"],"names":[],"mappings":";;AAAA,0CAAgD;AAEhD,gDAAgD;AAChD,mCAAmC;AAEnC,2EAA2E;AAC3E,uCAAuC;AAEvC,oDAAoD;AACpD,6BAA6B;AAE7B,KAAK,UAAU,IAAI,CAAC,QAAgB,EAAE,OAAkB;IACvD,MAAM,IAAI,GAAG,MAAM,aAAK,CAAC,OAAO,CAAC;QAChC,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE;KACrC,CAAC,CAAC;IAEH,IAAI,IAAI,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEpD,MAAM,OAAO,GAAG,MAAM,eAAO,CAAC,IAAI,CAAC;QAClC,MAAM,EAAE,IAAI,CAAC,EAAE;KACf,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAE7H,UAAU;QACV,IAAI,OAAO,IAAI,IAAI,EAAE;YACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBAC9C,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACrD,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,KAAK,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBACjD;aACD;SACD;KACD;AACF,CAAC;AAED,WAAW;AACX,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AACvB,IAAI,OAA6B,CAAC;AAElC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;IACpB,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;CACjE;AAED,iBAAiB;AACjB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAEtC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}

packages/backend/watch.mjs

@@ -0,0 +1,23 @@
+import { execa } from 'execa';
+
+(async () => {
+	// なぜかchokidarが動かない影響で、watchされない
+	/*
+	execa('tsc-alias', ['-w', '-p', 'tsconfig.json'], {
+		stdout: process.stdout,
+		stderr: process.stderr,
+	});
+	*/
+
+	setInterval(() => {
+		execa('tsc-alias', ['-p', 'tsconfig.json'], {
+			stdout: process.stdout,
+			stderr: process.stderr,
+		});
+	}, 3000);
+
+	execa('tsc', ['-w', '-p', 'tsconfig.json'], {
+		stdout: process.stdout,
+		stderr: process.stderr,
+	});
+})();

packages/backend/yarn.lock

@@ -111,22 +111,6 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
   integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
 
-"@jfonx/console-utils@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@jfonx/console-utils/-/console-utils-1.0.3.tgz#cbb7f911e4191a4a2fe1ba4807d29f100b5d099f"
-  integrity sha512-/XbnqjWc7yNZVLAJJO9rimfIz9DYte+cj3EF9hwhIv7vw6ok2t3cjl0huYsmD89srKH03vWjeqAcIH86CuYj3g==
-  dependencies:
-    colors "^1.3.3"
-
-"@jfonx/file-utils@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@jfonx/file-utils/-/file-utils-3.0.1.tgz#8d3d6e931a283420fe29802ea71c28dd397cd8d3"
-  integrity sha512-qwH0CuzWmghtTHGMyuPHj6SJPQgWeiXFJBfrxCWMbzxVCa3aLZPEfzSdlSnC/UABsk6feRkNdHXw59rVshNPqw==
-  dependencies:
-    "@jfonx/console-utils" "^1.0.3"
-    comment-json "^4.1.0"
-    find-up "^4.1.0"
-
 "@koa/cors@3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-3.1.0.tgz#618bb073438cfdbd3ebd0e648a76e33b84f3a3b2"
@@ -1380,11 +1364,6 @@ array-includes@^3.1.4:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
-array-timsort@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
-  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -2007,7 +1986,7 @@ cheerio@^0.22.0:
     lodash.reject "^4.4.0"
     lodash.some "^4.4.0"
 
-chokidar@3.5.1, chokidar@^3.3.1, chokidar@^3.5.0:
+chokidar@3.5.1, chokidar@^3.3.1, chokidar@^3.5.2:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
   integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
@@ -2166,7 +2145,7 @@ colorette@^1.2.0, colorette@^1.2.1, colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-colors@^1.1.2, colors@^1.3.3, colors@^1.4.0:
+colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -2183,26 +2162,15 @@ commander@^2.19.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
 commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-comment-json@^4.1.0:
+commander@^8.2.0:
-  version "4.1.1"
+  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.1.1.tgz#49df4948704bebb1cc0ffa6910e25669b668b7c5"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-v8gmtPvxhBlhdRBLwdHSjGy9BgA23t9H1FctdQKyUrErPjSrJcdDMqBq9B4Irtm7w3TNYLQJNH6ARKnpyag1sA==
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-  dependencies:
-    array-timsort "^1.0.3"
-    core-util-is "^1.0.2"
-    esprima "^4.0.1"
-    has-own-prop "^2.0.0"
-    repeat-string "^1.6.1"
 
 compare-versions@3.6.0:
   version "3.6.0"
@@ -2305,11 +2273,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-core-util-is@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
 crc-32@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
@@ -2338,7 +2301,7 @@ cross-env@7.0.3:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3295,6 +3258,21 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
   integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
 
+execa@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-6.0.0.tgz#598b46f09ae44f5d8097a30cfb1681d0f0371503"
+  integrity sha512-m4wU9j4Z9nXXoqT8RSfl28JSwmMNLFF69OON8H/lL3NeU0tNpGz313bcOfYoBBHokB0dC2tMl3VUcKgHELhL2Q==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^3.0.1"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.0.1"
+    onetime "^6.0.0"
+    signal-exit "^3.0.5"
+    strip-final-newline "^3.0.0"
+
 execa@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
@@ -3435,7 +3413,7 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-node-modules@^2.1.0:
+find-node-modules@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-2.1.2.tgz#57565a3455baf671b835bc6b2134a9b938b9c53c"
   integrity sha512-x+3P4mbtRPlSiVE1Qco0Z4YLU8WFiFcuWTf3m75OV9Uzcfs2Bg+O9N+r/K0AnmINBW06KpfqKwYJbFlFq4qNug==
@@ -3465,14 +3443,6 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 findup-sync@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
@@ -3637,6 +3607,11 @@ get-stream@^5.0.0, get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -3734,7 +3709,7 @@ globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.2, globby@^11.0.4:
+globby@^11.0.4:
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -3816,11 +3791,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-own-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
-  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
-
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -4007,6 +3977,11 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
+human-signals@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5"
+  integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==
+
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -4425,6 +4400,11 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -5008,13 +4988,6 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -5266,6 +5239,11 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -5467,6 +5445,11 @@ multer@1.4.3:
     type-is "^1.6.4"
     xtend "^4.0.0"
 
+mylas@^2.1.4:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/mylas/-/mylas-2.1.5.tgz#7ccf41ec5a93ab2d63fc3678abf1942c0e7bdeb1"
+  integrity sha512-7ZyrJux1lipSR45IxDvWz7zJOXWTazTFCqD4/p8XBF4O+mtJwf7QpMWTH+jE4lV9O2I38xcpS0KTIp7GwhUTmA==
+
 mz@^2.4.0, mz@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -5657,6 +5640,13 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.0.1.tgz#748dd68ed7de377bb1f7132c7dafe657be5ab400"
+  integrity sha512-ybBJQUSyFwEEhqO2lXmyKOl9ucHtyZBWVM0h0FiMfT/+WKxCUZFa95qAR2X3w/w6oigN3B0b2UNHZbD+kdfD5w==
+  dependencies:
+    path-key "^4.0.0"
+
 npmlog@^4.0.1, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -5784,6 +5774,13 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
 only@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
@@ -5877,7 +5874,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -5912,13 +5909,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
 p-locate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
@@ -6024,6 +6014,11 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -6907,11 +6902,6 @@ rename@1.0.4:
   dependencies:
     debug "^2.5.2"
 
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
 request-promise-core@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
@@ -7252,6 +7242,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
+signal-exit@^3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+
 simple-concat@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
@@ -7572,6 +7567,11 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -7915,17 +7915,16 @@ ts-node@10.4.0:
     make-error "^1.1.1"
     yn "3.1.1"
 
-tsc-alias@1.3.10:
+tsc-alias@1.4.1:
-  version "1.3.10"
+  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/tsc-alias/-/tsc-alias-1.3.10.tgz#6ccf81c644092387ab9be3a3a75549a95eeffd80"
+  resolved "https://registry.yarnpkg.com/tsc-alias/-/tsc-alias-1.4.1.tgz#6a6075dd94267d9befdad1431f410bd0b8819805"
-  integrity sha512-7SF56qiV7Oh/bON+XjF/uAzEFqbmwCuEIHQyoTyVJAK80WnxaIyhO9TBwD/x8InIMU8lnvExQBOrgKkRPsHH+w==
+  integrity sha512-nHTR8qvM/LiYI8Fx6UrzAQXRngAuE2PEK+n9uXmQY6fN+oLZhweNFkCLbyxKDmlLfYnclSuaR+dSuvRd7FUu8Q==
   dependencies:
-    "@jfonx/console-utils" "^1.0.3"
+    chokidar "^3.5.2"
-    "@jfonx/file-utils" "^3.0.1"
+    commander "^8.2.0"
-    chokidar "^3.5.0"
+    find-node-modules "^2.1.2"
-    commander "^6.2.1"
+    globby "^11.0.4"
-    find-node-modules "^2.1.0"
+    mylas "^2.1.4"
-    globby "^11.0.2"
     normalize-path "^3.0.0"
 
 tsconfig-paths@3.11.0, tsconfig-paths@^3.11.0:

packages/client/.eslintrc

@@ -1,32 +0,0 @@
-{
-	"env": {
-		"node": false
-	},
-	"extends": [
-		"eslint:recommended",
-		"plugin:vue/recommended"
-	],
-	"rules": {
-		"vue/require-v-for-key": 0,
-		"vue/max-attributes-per-line": 0,
-		"vue/html-indent": 0,
-		"vue/html-self-closing": 0,
-		"vue/no-unused-vars": 0,
-		"vue/attributes-order": 0,
-		"vue/require-prop-types": 0,
-		"vue/require-default-prop": 0,
-		"vue/html-closing-bracket-spacing": 0,
-		"vue/singleline-html-element-content-newline": 0,
-		"vue/no-v-html": 0
-	},
-	"globals": {
-		"_DEV_": false,
-		"_LANGS_": false,
-		"_VERSION_": false,
-		"_ENV_": false,
-		"_PERF_PREFIX_": false,
-		"_DATA_TRANSFER_DRIVE_FILE_": false,
-		"_DATA_TRANSFER_DRIVE_FOLDER_": false,
-		"_DATA_TRANSFER_DECK_COLUMN_": false
-	}
-}

packages/client/.eslintrc.js

@@ -0,0 +1,61 @@
+module.exports = {
+	root: true,
+	env: {
+		"node": false
+	},
+	parser: "vue-eslint-parser",
+	parserOptions: {
+		"parser": "@typescript-eslint/parser",
+		tsconfigRootDir: __dirname,
+		//project: ['./tsconfig.json'],
+	},
+	extends: [
+		//"../shared/.eslintrc.js",
+		"plugin:vue/vue3-recommended"
+	],
+	rules: {
+		"vue/attributes-order": ["error", {
+			"alphabetical": false
+		}],
+		"vue/no-use-v-if-with-v-for": ["error", {
+			"allowUsingIterationVar": false
+		}],
+		"vue/no-ref-as-operand": "error",
+		"vue/no-multi-spaces": ["error", {
+			"ignoreProperties": false
+		}],
+		"vue/no-v-html": "error",
+		"vue/order-in-components": "error",
+		"vue/html-indent": ["warn", "tab", {
+			"attribute": 1,
+			"baseIndent": 0,
+			"closeBracket": 0,
+			"alignAttributesVertically": true,
+			"ignores": []
+		}],
+		"vue/html-closing-bracket-spacing": ["warn", {
+			"startTag": "never",
+			"endTag": "never",
+			"selfClosingTag": "never"
+		}],
+		"vue/multi-word-component-names": "warn",
+		"vue/require-v-for-key": "warn",
+		"vue/no-unused-components": "warn",
+		"vue/valid-v-for": "warn",
+		"vue/return-in-computed-property": "warn",
+		"vue/max-attributes-per-line": "off",
+		"vue/html-self-closing": "off",
+		"vue/singleline-html-element-content-newline": "off",
+	},
+	globals: {
+		"require": false,
+		"_DEV_": false,
+		"_LANGS_": false,
+		"_VERSION_": false,
+		"_ENV_": false,
+		"_PERF_PREFIX_": false,
+		"_DATA_TRANSFER_DRIVE_FILE_": false,
+		"_DATA_TRANSFER_DRIVE_FOLDER_": false,
+		"_DATA_TRANSFER_DECK_COLUMN_": false
+	}
+}

packages/client/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+	"typescript.tsdk": "node_modules\\typescript\\lib",
+	"path-intellisense.mappings": {
+		"@": "${workspaceRoot}/packages/client/src/"
+	},
+	"eslint.validate": [
+		"javascript",
+		"javascriptreact",
+		"vue"
+	]
+}

packages/client/package.json

@@ -2,7 +2,8 @@
 	"private": true,
 	"scripts": {
 		"watch": "webpack --watch",
-		"build": "webpack"
+		"build": "webpack",
+		"lint": "eslint --quiet src/**/*.{ts,vue}"
 	},
 	"resolutions": {
 		"chokidar": "^3.3.1",
@@ -72,7 +73,7 @@
 		"dateformat": "4.5.1",
 		"escape-regexp": "0.0.1",
 		"eslint": "8.2.0",
-		"eslint-plugin-vue": "8.0.3",
+		"eslint-plugin-vue": "8.1.1",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.2",
 		"glob": "7.2.0",
@@ -106,6 +107,7 @@
 		"punycode": "2.1.1",
 		"pureimage": "0.3.5",
 		"qrcode": "1.4.4",
+		"querystring": "0.2.1",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"reflect-metadata": "0.1.13",
@@ -151,8 +153,10 @@
 	"devDependencies": {
 		"@redocly/openapi-core": "1.0.0-beta.54",
 		"@types/fluent-ffmpeg": "2.1.17",
+		"@typescript-eslint/eslint-plugin": "5.4.0",
 		"cross-env": "7.0.3",
 		"cypress": "8.5.0",
+		"eslint-plugin-import": "2.25.3",
 		"start-server-and-test": "1.14.0"
 	}
 }

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

@@ -16,7 +16,7 @@
 			</MkTextarea>
 		</div>
 		<div class="_section">
-			<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $ts.send }}</MkButton>
+			<MkButton primary full :disabled="comment.length === 0" @click="send">{{ $ts.send }}</MkButton>
 		</div>
 	</div>
 </XWindow>
@@ -61,7 +61,7 @@ export default defineComponent({
 				userId: this.user.id,
 				comment: this.comment,
 			}, undefined, res => {
-				os.dialog({
+				os.alert({
 					type: 'success',
 					text: this.$ts.abuseReported
 				});

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

@@ -1,11 +1,11 @@
 <template>
 <svg class="mbcofsoe" viewBox="0 0 10 10" preserveAspectRatio="none">
 	<circle v-for="(angle, i) in graduations"
+					:key="i"
 					:cx="5 + (Math.sin(angle) * (5 - graduationsPadding))"
 					:cy="5 - (Math.cos(angle) * (5 - graduationsPadding))"
 					:r="i % 5 == 0 ? 0.125 : 0.05"
 					:fill="i % 5 == 0 ? majorGraduationColor : minorGraduationColor"
-					:key="i"
 	/>
 
 	<line

packages/client/src/components/autocomplete.vue

@@ -1,31 +1,31 @@
 <template>
 <div class="swhvrteh _popup _shadow" @contextmenu.prevent="() => {}">
-	<ol class="users" ref="suggests" v-if="type === 'user'">
+	<ol v-if="type === 'user'" ref="suggests" class="users">
-		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1" class="user">
+		<li v-for="user in users" tabindex="-1" class="user" @click="complete(type, user)" @keydown="onKeydown">
 			<img class="avatar" :src="user.avatarUrl"/>
 			<span class="name">
-				<MkUserName :user="user" :key="user.id"/>
+				<MkUserName :key="user.id" :user="user"/>
 			</span>
 			<span class="username">@{{ acct(user) }}</span>
 		</li>
-		<li @click="chooseUser()" @keydown="onKeydown" tabindex="-1" class="choose">{{ $ts.selectUser }}</li>
+		<li tabindex="-1" class="choose" @click="chooseUser()" @keydown="onKeydown">{{ $ts.selectUser }}</li>
 	</ol>
-	<ol class="hashtags" ref="suggests" v-else-if="hashtags.length > 0">
+	<ol v-else-if="hashtags.length > 0" ref="suggests" class="hashtags">
-		<li v-for="hashtag in hashtags" @click="complete(type, hashtag)" @keydown="onKeydown" tabindex="-1">
+		<li v-for="hashtag in hashtags" tabindex="-1" @click="complete(type, hashtag)" @keydown="onKeydown">
 			<span class="name">{{ hashtag }}</span>
 		</li>
 	</ol>
-	<ol class="emojis" ref="suggests" v-else-if="emojis.length > 0">
+	<ol v-else-if="emojis.length > 0" ref="suggests" class="emojis">
-		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
+		<li v-for="emoji in emojis" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
-			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
+			<span v-if="emoji.isCustomEmoji" class="emoji"><img :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
-			<span class="emoji" v-else-if="!$store.state.useOsNativeEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
+			<span v-else-if="!$store.state.useOsNativeEmojis" class="emoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
-			<span class="emoji" v-else>{{ emoji.emoji }}</span>
+			<span v-else class="emoji">{{ emoji.emoji }}</span>
 			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
-			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
+			<span v-if="emoji.aliasOf" class="alias">({{ emoji.aliasOf }})</span>
 		</li>
 	</ol>
-	<ol class="mfmTags" ref="suggests" v-else-if="mfmTags.length > 0">
+	<ol v-else-if="mfmTags.length > 0" ref="suggests" class="mfmTags">
-		<li v-for="tag in mfmTags" @click="complete(type, tag)" @keydown="onKeydown" tabindex="-1">
+		<li v-for="tag in mfmTags" tabindex="-1" @click="complete(type, tag)" @keydown="onKeydown">
 			<span class="tag">{{ tag }}</span>
 		</li>
 	</ol>

packages/client/src/components/channel-follow-button.vue

@@ -1,8 +1,8 @@
 <template>
 <button class="hdcaacmi _button"
 	:class="{ wait, active: isFollowing, full }"
-	@click="onClick"
 	:disabled="wait"
+	@click="onClick"
 >
 	<template v-if="!wait">
 		<template v-if="isFollowing">

packages/client/src/components/channel-preview.vue

@@ -44,6 +44,11 @@ export default defineComponent({
 		},
 	},
 
+	data() {
+		return {
+		};
+	},
+
 	computed: {
 		bannerStyle() {
 			if (this.channel.bannerUrl) {
@@ -53,11 +58,6 @@ export default defineComponent({
 			}
 		}
 	},
-
-	data() {
-		return {
-		};
-	},
 });
 </script>
 

packages/client/src/components/code-core.vue

@@ -1,6 +1,6 @@
 <template>
-<code v-if="inline" v-html="html" :class="`language-${prismLang}`"></code>
+<code v-if="inline" :class="`language-${prismLang}`" v-html="html"></code>
-<pre v-else :class="`language-${prismLang}`"><code v-html="html" :class="`language-${prismLang}`"></code></pre>
+<pre v-else :class="`language-${prismLang}`"><code :class="`language-${prismLang}`" v-html="html"></code></pre>
 </template>
 
 <script lang="ts">

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

@@ -31,10 +31,6 @@ export default defineComponent({
 	},
 
 	methods: {
-		focus() {
-			this.$slots.default[0].elm.focus();
-		},
-
 		getDateText(time: string) {
 			const date = new Date(time).getDate();
 			const month = new Date(time).getMonth() + 1;

packages/client/src/components/debobigego/base.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="rbusrurv" :class="{ wide: forceWide }" v-size="{ max: [400] }">
+<div v-size="{ max: [400] }" class="rbusrurv" :class="{ wide: forceWide }">
 	<slot></slot>
 </div>
 </template>

packages/client/src/components/debobigego/group.vue

@@ -1,7 +1,7 @@
 <template>
-<div class="vrtktovg _debobigegoItem _debobigegoNoConcat" v-size="{ max: [500] }" v-sticky-container>
+<div v-size="{ max: [500] }" v-sticky-container class="vrtktovg _debobigegoItem _debobigegoNoConcat">
 	<div class="_debobigegoLabel"><slot name="label"></slot></div>
-	<div class="main _debobigego_group" ref="child">
+	<div ref="child" class="main _debobigego_group">
 		<slot></slot>
 	</div>
 	<div class="_debobigegoCaption"><slot name="caption"></slot></div>

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

@@ -2,12 +2,12 @@
 <FormGroup class="_debobigegoItem">
 	<template #label><slot></slot></template>
 	<div class="ztzhwixg _debobigegoItem" :class="{ inline, disabled }">
-		<div class="icon" ref="icon"><slot name="icon"></slot></div>
+		<div ref="icon" class="icon"><slot name="icon"></slot></div>
 		<div class="input _debobigegoPanel">
-			<div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
+			<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
 			<input ref="inputEl"
-				:type="type"
 				v-model="v"
+				:type="type"
 				:disabled="disabled"
 				:required="required"
 				:readonly="readonly"
@@ -16,21 +16,21 @@
 				:autocomplete="autocomplete"
 				:spellcheck="spellcheck"
 				:step="step"
+				:list="id"
 				@focus="focused = true"
 				@blur="focused = false"
 				@keydown="onKeydown($event)"
 				@input="onInput"
-				:list="id"
 			>
-			<datalist :id="id" v-if="datalist">
+			<datalist v-if="datalist" :id="id">
 				<option v-for="data in datalist" :value="data"/>
 			</datalist>
-			<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
+			<div ref="suffixEl" class="suffix"><slot name="suffix"></slot></div>
 		</div>
 	</div>
 	<template #caption><slot name="desc"></slot></template>
 
-	<FormButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
+	<FormButton v-if="manualSave && changed" primary @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
 </FormGroup>
 </template>
 

packages/client/src/components/debobigego/link.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="qmfkfnzi _debobigegoItem">
-	<a class="main _button _debobigegoPanel _debobigegoClickable" :href="to" target="_blank" v-if="external">
+	<a v-if="external" class="main _button _debobigegoPanel _debobigegoClickable" :href="to" target="_blank">
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
 		<span class="right">
@@ -8,7 +8,7 @@
 			<i class="fas fa-external-link-alt icon"></i>
 		</span>
 	</a>
-	<MkA class="main _button _debobigegoPanel _debobigegoClickable" :class="{ active }" :to="to" :behavior="behavior" v-else>
+	<MkA v-else class="main _button _debobigegoPanel _debobigegoClickable" :class="{ active }" :to="to" :behavior="behavior">
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
 		<span class="right">

packages/client/src/components/debobigego/object-view.vue

@@ -3,8 +3,8 @@
 	<template #label><slot></slot></template>
 	<div class="drooglns _debobigegoItem" :class="{ tall }">
 		<div class="input _debobigegoPanel">
-			<textarea class="_monospace"
+			<textarea v-model="v"
-				v-model="v"
+				class="_monospace"
 				readonly
 				:spellcheck="false"
 			></textarea>

packages/client/src/components/debobigego/pagination.vue

@@ -2,10 +2,10 @@
 <FormGroup class="uljviswt _debobigegoItem">
 	<template #label><slot name="label"></slot></template>
 	<slot :items="items"></slot>
-	<div class="empty" v-if="empty" key="_empty_">
+	<div v-if="empty" key="_empty_" class="empty">
 		<slot name="empty"></slot>
 	</div>
-	<FormButton v-show="more" class="button" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary>
+	<FormButton v-show="more" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
 		<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
 		<template v-if="moreFetching"><MkLoading inline/></template>
 	</FormButton>