docs: Update install guide to use tag-merge strategy

Adapted from @toast's guide: https://mk.toast.cafe/notes/93o9n4tfsi

.config/example.yml

@@ -133,10 +133,3 @@ redis:
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]
-
-# images used on error screens. You can use absolute or relative URLs.
-# If you use relative URLs, be aware that the URL may be used on different pages/paths, so the path component should be absolute.
-#images:
-#  info: /twemoji/1f440.svg
-#  notFound: /twemoji/2049.svg
-#  error: /twemoji/1f480.svg

.dockerignore

@@ -1,6 +1,6 @@
 .autogen
+.vscode
 .config
-.woodpecker
 Dockerfile
 build/
 built/

.editorconfig

@@ -2,10 +2,9 @@ root = true
 
 [*]
 indent_style = tab
-indent_size = 4
+indent_size = 2
 charset = utf-8
 insert_final_newline = true
 
 [*.yml]
 indent_style = space
-indent_size = 2

.gitattributes

@@ -1 +1,7 @@
 *.svg -diff -text
+*.psd -diff -text
+*.ai -diff -text
+*.mqo -diff -text
+*.glb -diff -text
+*.blend -diff -text
+*.afdesign -diff -text

.gitignore

@@ -1,6 +1,6 @@
 # Visual Studio Code
 /.vscode
-/.vsls.json
+!/.vscode/extensions.json
 
 # Intelij-IDEA
 /.idea

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+	"recommendations": [
+		"editorconfig.editorconfig",
+		"dbaeumer.vscode-eslint",
+		"Vue.volar",
+		"Vue.vscode-typescript-vue-plugin"
+	]
+}

.vsls.json

@@ -0,0 +1,4 @@
+{
+	"$schema": "http://json.schemastore.org/vsls",
+	"gitignore": "exclude"
+}

.woodpecker/lint-sw.yml

@@ -1,22 +0,0 @@
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    settings:
-      depth: 1 # CI does not need commit history
-      recursive: true
-
-pipeline:
-  install:
-    when:
-      event:
-        - pull_request
-    image: node:18.6.0
-    commands:
-      - yarn install
-  lint:
-    when:
-      event:
-        - pull_request
-    image: node:18.6.0
-    commands:
-      - yarn workspace sw run lint

docs/install.md

@@ -38,22 +38,29 @@ Create a separate non-root user to run FoundKey:
 adduser --disabled-password --disabled-login foundkey
 ```
 
+The following steps will require logging into the `foundkey` user, so do that now.
+```sh
+su - foundkey
+```
+
 ## Install FoundKey
-1. Login to the `foundkey` user
+We recommend using a local branch and merging in upstream releases as they get tagged. This allows for easy local customization of your install.
 
-	`su - foundkey`
+First, clone the FoundKey repo:
+```sh
+git clone https://akkoma.dev/FoundKeyGang/FoundKey
+cd FoundKey
+```
 
-2. Clone the FoundKey repository
+Now create your local branch. In this example, we'll be using `toast.cafe` as the local branch name and release `v13.0.0-preview1` as the tag to track. To create that branch:
+```sh
+git checkout tags/v13.0.0-preview1 -b toast.cafe
+```
 
-	`git clone --recursive https://akkoma.dev/FoundKeyGang/FoundKey foundkey`
-
-3. Navigate to the repository
-
-	`cd foundkey`
-
-4. Install FoundKey's dependencies
-
-	`yarn install`
+Updating will be covered in a later section. For now you'll want to install the dependencies using Yarn:
+```sh
+yarn install
+```
 
 ## Configure FoundKey
 1. Copy `.config/example.yml` to `.config/default.yml`.
@@ -176,13 +183,21 @@ rc-service foundkey start
 You can check if the service is running with `rc-service foundkey status`.
 
 ### Updating FoundKey
-Use git to pull in the latest changes and rerun the build and migration commands:
-
+When a new release comes out, simply fetch and merge in the new tag. Here we opt to squash upstream commits as it allows for easy reverts in case something goes wrong.
+```sh
+git fetch -t
+git merge tags/v13.0.0-preview2 --squash
+  # you are now on the "next" release
+```
+
+Now you'll want to update your dependencies and rebuild:
 ```sh
-git pull
-git submodule update --init
 yarn install
 NODE_ENV=production yarn build
+```
+
+Next, run the database migrations:
+```sh
 yarn migrate
 ```
 

docs/oauth.md

@@ -1,9 +1,9 @@
 # 3rd party access
 Foundkey supports:
-- OAuth 2.0 Authorization Code grant per [RFC 6749](https://www.rfc-editor.org/rfc/rfc6749).
-- OAuth Bearer Token Usage per [RFC 6750](https://www.rfc-editor.org/rfc/rfc6750).
-- Proof Key for Code Exchange (PKCE) per [RFC 7636](https://www.rfc-editor.org/rfc/rfc7636).
-- OAuth 2.0 Authorization Server Metadata per [RFC 8414](https://www.rfc-editor.org/rfc/rfc8414.html).
+- OAuth 2.0 Authorization Code grant per RFC 6749.
+- OAuth Bearer Token Usage per RFC 6750.
+- Proof Key for Code Exchange (PKCE) per RFC 7636.
+- OAuth 2.0 Authorization Server Metadata per RFC 8414.
 
 # Discovery
 Because the implementation may change in the future, it is recommended that you use OAuth 2.0 Authorization Server Metadata a.k.a. OpenID Connect Discovery.

gulpfile.js

@@ -36,7 +36,7 @@ gulp.task('copy:client:locales', cb => {
 });
 
 gulp.task('build:backend:script', () => {
-	return gulp.src(['./packages/backend/src/server/web/boot.js'])
+	return gulp.src(['./packages/backend/src/server/web/boot.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js'])
 		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
 		.pipe(terser({
 			toplevel: true
@@ -45,7 +45,7 @@ gulp.task('build:backend:script', () => {
 });
 
 gulp.task('build:backend:style', () => {
-	return gulp.src(['./packages/backend/src/server/web/style.css'])
+	return gulp.src(['./packages/backend/src/server/web/style.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css'])
 		.pipe(cssnano({
 			zindex: false
 		}))

locales/ar-SA.yml

@@ -293,6 +293,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "الصفحات"
+integration: "التكامل"
+connectService: "اتصل"
+disconnectService: "اقطع الاتصال"
 enableLocalTimeline: "تفعيل الخيط المحلي"
 enableGlobalTimeline: "تفعيل الخيط الزمني الشامل"
 disablingTimelinesInfo: "سيتمكن المديرون والمشرفون من الوصول إلى كل الخيوط الزمنية\
@@ -399,6 +402,7 @@ normalPassword: "الكلمة السرية جيدة"
 strongPassword: "الكلمة السرية قوية"
 passwordMatched: "التطابق صحيح!"
 passwordNotMatched: "غير متطابقتان"
+signinWith: "الولوج عبر {x}"
 signinFailed: "فشل الولوج، خطأ في اسم المستخدم أو كلمة المرور."
 tapSecurityKey: "أنقر مفتاح الأمان"
 or: "أو"

locales/bn-BD.yml

@@ -308,6 +308,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "পৃষ্ঠা"
+integration: "ইন্টিগ্রেশন"
+connectService: "সংযুক্ত করুন"
+disconnectService: "সংযোগ বিচ্ছিন্ন করুন"
 enableLocalTimeline: "স্থানীয় টাইমলাইন চালু করুন"
 enableGlobalTimeline: "গ্লোবাল টাইমলাইন চালু করুন"
 disablingTimelinesInfo: "আপনি এই টাইমলাইনগুলি বন্ধ করলেও প্রশাসক এবং মডারেটররা এই\
@@ -414,6 +417,7 @@ normalPassword: "সাধারণ পাসওয়ার্ড"
 strongPassword: "শক্তিশালী পাসওয়ার্ড"
 passwordMatched: "মিলেছে"
 passwordNotMatched: "মিলেনি"
+signinWith: "{x} এর সাহায্যে সাইন ইন করুন"
 signinFailed: "লগ ইন করা যায়নি। আপনার ব্যবহারকারীর নাম এবং পাসওয়ার্ড চেক করুন."
 tapSecurityKey: "সিকিউরিটি কী স্পর্শ করুন"
 or: "অথবা"

locales/cs-CZ.yml

@@ -277,6 +277,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Stránky"
+integration: "Integrace"
+connectService: "Připojit"
+disconnectService: "Odpojit"
 enableLocalTimeline: "Povolit lokální čas"
 enableGlobalTimeline: "Povolit globální čas"
 enableRegistration: "Povolit registraci novým uživatelům"
@@ -350,6 +353,7 @@ normalPassword: "Dobré heslo"
 strongPassword: "Silné heslo"
 passwordMatched: "Hesla se schodují"
 passwordNotMatched: "Hesla se neschodují"
+signinWith: "Přihlásit se s {x}"
 signinFailed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
 or: "Nebo"
 language: "Jazyk"

locales/de-DE.yml

@@ -321,6 +321,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Seiten"
+integration: "Integration"
+connectService: "Verbinden"
+disconnectService: "Trennen"
 enableLocalTimeline: "Lokale Chronik aktivieren"
 enableGlobalTimeline: "Globale Chronik aktivieren"
 disablingTimelinesInfo: "Administratoren und Moderatoren haben immer Zugriff auf alle\
@@ -430,6 +433,7 @@ normalPassword: "Durchschnittliches Passwort"
 strongPassword: "Starkes Passwort"
 passwordMatched: "Stimmt überein"
 passwordNotMatched: "Stimmt nicht überein"
+signinWith: "Mit {x} anmelden"
 signinFailed: "Anmeldung fehlgeschlagen. Überprüfe Benutzername und Passswort."
 tapSecurityKey: "Tippe deinen Sicherheitsschlüssel an"
 or: "Oder"
@@ -1369,6 +1373,18 @@ recommended: "Empfehlung"
 check: "Check"
 maxCustomEmojiPicker: Maximale Anzahl vorgeschlagener benutzerdefinierter Emoji
 maxUnicodeEmojiPicker: Maximale Anzahl vorgeschlagener Unicode-Emoji
+_services:
+  _discord:
+    connected: 'Discord: @{username}#{discriminator} wurde mit Foundkey-Account @{mkUsername}
+      verknüpft!'
+    disconnected: Discord-Verknüpfung wurde entfernt.
+  _twitter:
+    connected: Twitter-Account @{twitterUserName} wurde mit Foundkey-Account @{userName}
+      verknüpft!
+    disconnected: Twitter-Verknüpfung wurde entfernt.
+  _github:
+    connected: GitHub-Account @{login} wurde mit Foundkey-Account @{userName} verknüpft!
+    disconnected: GitHub-Verknüpfung wurde entfernt.
 documentation: Dokumentation
 signinHistoryExpires: Frühere Login-Versuche werden aus Datenschutzgründen nach 60
   Tagen automatisch gelöscht.

locales/en-US.yml

@@ -96,8 +96,6 @@ unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
 renote: "Renote"
 unrenote: "Take back renote"
-unrenoteAll: "Take back all renotes"
-unrenoteAllConfirm: "Are you sure that you want to take back all renotes of this note?"
 quote: "Quote"
 pinnedNote: "Pinned note"
 you: "You"
@@ -313,6 +311,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Pages"
+integration: "Integration"
+connectService: "Connect"
+disconnectService: "Disconnect"
 enableLocalTimeline: "Enable local timeline"
 enableGlobalTimeline: "Enable global timeline"
 disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all\
@@ -419,6 +420,7 @@ normalPassword: "Average password"
 strongPassword: "Strong password"
 passwordMatched: "Matches"
 passwordNotMatched: "Does not match"
+signinWith: "Sign in with {x}"
 signinFailed: "Unable to sign in. The entered username or password is incorrect."
 tapSecurityKey: "Tap your security key"
 or: "Or"
@@ -1342,6 +1344,16 @@ _deck:
     list: "List"
     mentions: "Mentions"
     direct: "Direct notes"
+_services:
+  _discord:
+    connected: "Discord: @{username}#{discriminator} connected to FoundKey: @{mkUsername}!"
+    disconnected: "Discord linkage has been removed."
+  _twitter:
+    connected: "Twitter: @{twitterUserName} connected to FoundKey: @{userName}!"
+    disconnected: "Twitter linkage has been removed."
+  _github:
+    connected: "GitHub: @{login} connected to FoundKey: @{userName}!"
+    disconnected: "GitHub linkage has been removed."
 _translationService:
   _deepl:
     authKey: "DeepL Auth Key"

locales/es-ES.yml

@@ -311,6 +311,9 @@ dayX: "Día {day}"
 monthX: "Mes {month}"
 yearX: "Año {year}"
 pages: "Páginas"
+integration: "Integración"
+connectService: "Conectar"
+disconnectService: "Desconectar"
 enableLocalTimeline: "Habilitar linea de tiempo local"
 enableGlobalTimeline: "Habilitar linea de tiempo global"
 disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conveniencia\
@@ -417,6 +420,7 @@ normalPassword: "Buena contraseña"
 strongPassword: "Muy buena contraseña"
 passwordMatched: "Correcto"
 passwordNotMatched: "Las contraseñas no son las mismas"
+signinWith: "Inicie sesión con {x}"
 signinFailed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario\
   \ y contraseña correctos."
 tapSecurityKey: "Toque la clave de seguridad"

locales/fr-FR.yml

@@ -311,6 +311,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Pages"
+integration: "Intégrations"
+connectService: "Connexion"
+disconnectService: "Déconnexion"
 enableLocalTimeline: "Activer le fil local"
 enableGlobalTimeline: "Activer le fil global"
 disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur·rice·s\
@@ -420,6 +423,7 @@ normalPassword: "Mot de passe acceptable"
 strongPassword: "Mot de passe fort"
 passwordMatched: "Les mots de passe correspondent"
 passwordNotMatched: "Les mots de passe ne correspondent pas"
+signinWith: "Se connecter avec {x}"
 signinFailed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur\
   \ et mot de passe sont corrects."
 tapSecurityKey: "Appuyez sur votre clé de sécurité"
@@ -1327,6 +1331,18 @@ _deck:
     list: "Listes"
     mentions: "Mentions"
     direct: "Direct"
+_services:
+  _discord:
+    connected: '@{username}#{discriminator} sur Discord est connecté à @{mkUsername}
+      sur FoundKey !'
+    disconnected: La liaison avec Discord à été supprimée.
+  _twitter:
+    connected: '@{twitterUserName} sur Twitter est connecté à @{userName} sur FoundKey
+      !'
+    disconnected: La liaison avec Twitter à été supprimée.
+  _github:
+    disconnected: La liaison avec Github à été supprimée.
+    connected: '@{login} sur Github est connecté à @{userName} sur FoundKey !'
 exportAll: Tout exporter
 stopActivityDeliveryDescription: L'activité locale ne sera pas envoyé à cette instance.
   La réception de l'activité continuera de fonctionner comme avant.

locales/id-ID.yml

@@ -310,6 +310,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Halaman"
+integration: "Integrasi"
+connectService: "Sambungkan"
+disconnectService: "Putuskan"
 enableLocalTimeline: "Nyalakan linimasa lokal"
 enableGlobalTimeline: "Nyalakan linimasa global"
 disablingTimelinesInfo: "Admin dan Moderator akan selalu memiliki akses ke semua linimasa\
@@ -416,6 +419,7 @@ normalPassword: "Kata sandi baik"
 strongPassword: "Kata sandi kuat"
 passwordMatched: "Kata sandi sama"
 passwordNotMatched: "Kata sandi tidak sama"
+signinWith: "Masuk dengan {x}"
 signinFailed: "Tidak dapat masuk. Nama pengguna atau kata sandi yang kamu masukkan\
   \ salah."
 tapSecurityKey: "Ketuk kunci keamanan kamu"

locales/it-IT.yml

@@ -304,6 +304,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Pagine"
+integration: "App collegate"
+connectService: "Connessione"
+disconnectService: "Disconnessione "
 enableLocalTimeline: "Abilita Timeline locale"
 enableGlobalTimeline: "Abilita Timeline federata"
 disablingTimelinesInfo: "Anche se disabiliti queste timeline, gli amministratori e\
@@ -410,6 +413,7 @@ normalPassword: "Password buona"
 strongPassword: "Password forte"
 passwordMatched: "Corretta"
 passwordNotMatched: "Le password non corrispondono."
+signinWith: "Accedi con {x}"
 signinFailed: "Autenticazione non riuscita. Controlla la tua password e nome utente."
 tapSecurityKey: "Premi la chiave di sicurezza"
 or: "oppure"

locales/ja-JP.yml

@@ -286,6 +286,9 @@ dayX: "{day}日"
 monthX: "{month}月"
 yearX: "{year}年"
 pages: "ページ"
+integration: "連携"
+connectService: "接続する"
+disconnectService: "切断する"
 enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
 disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
@@ -389,6 +392,7 @@ normalPassword: "普通のパスワード"
 strongPassword: "強いパスワード"
 passwordMatched: "一致しました"
 passwordNotMatched: "一致していません"
+signinWith: "{x}でログイン"
 signinFailed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 tapSecurityKey: "セキュリティキーにタッチ"
 or: "もしくは"
@@ -1269,3 +1273,13 @@ _deck:
     list: "リスト"
     mentions: "あなた宛て"
     direct: "ダイレクト"
+_services:
+  _discord:
+    connected: "Discord: @{username}#{discriminator} を、FoundKey: @{mkUsername} に接続しました！"
+    disconnected: "Discordの連携を解除しました :v:"
+  _twitter:
+    connected: "Twitter: @{twitterUserName} を、FoundKey: @{userName} に接続しました！"
+    disconnected: "Twitterの連携を解除しました :v:"
+  _github:
+    connected: "GitHub: @{login} を、FoundKey: @{userName} に接続しました！"
+    disconnected: "GitHubの連携を解除しました :v:"

locales/ja-KS.yml

@@ -288,6 +288,7 @@ dayX: "{day}日"
 monthX: "{month}月"
 yearX: "{year}年"
 pages: "ページ"
+integration: "連携"
 enableLocalTimeline: "ローカルタイムラインを使えるようにする"
 enableGlobalTimeline: "グローバルタイムラインを使えるようにする"
 disablingTimelinesInfo: "ここらへんのタイムラインを使えんようにしてしもても、管理者とモデレーターは使えるままになってるで、そうやなかったら不便やからな。"
@@ -390,6 +391,7 @@ normalPassword: "普通のパスワード"
 strongPassword: "ええ感じのパスワード"
 passwordMatched: "よし！一致や！"
 passwordNotMatched: "一致しとらんで？"
+signinWith: "{x}でログイン"
 or: "それか"
 language: "言語"
 uiLanguage: "UIの表示言語"

locales/kab-KAB.yml

@@ -39,6 +39,7 @@ userList: "Tibdarin"
 securityKey: "Tasarutt n tɣellist"
 securityKeyName: "Isem n tsarutt"
 signinRequired: "Ttxil jerred"
+signinWith: "Tuqqna s {x}"
 tapSecurityKey: "Sekcem tasarutt-ik·im n tɣellist"
 uiLanguage: "Tutlayt n wegrudem"
 plugins: "Izegrar"

locales/ko-KR.yml

@@ -315,6 +315,9 @@ dayX: "{day}일"
 monthX: "{month}월"
 yearX: "{year}년"
 pages: "페이지"
+integration: "연동"
+connectService: "계정 연동"
+disconnectService: "계정 연동 해제"
 enableLocalTimeline: "로컬 타임라인 활성화"
 enableGlobalTimeline: "글로벌 타임라인 활성화"
 disablingTimelinesInfo: "특정 타임라인을 비활성화하더라도 관리자 및 모더레이터는 계속 사용할 수 있습니다."
@@ -435,6 +438,7 @@ normalPassword: "좋은 비밀번호"
 strongPassword: "강한 비밀번호"
 passwordMatched: "일치합니다"
 passwordNotMatched: "일치하지 않습니다"
+signinWith: "{x}로 로그인"
 signinFailed: "로그인할 수 없습니다. 사용자명과 비밀번호를 확인하여 주십시오."
 tapSecurityKey: "보안 키를 터치"
 or: "혹은"

locales/pl-PL.yml

@@ -298,6 +298,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Strony"
+integration: "Integracja"
+connectService: "Połącz"
+disconnectService: "Rozłącz"
 enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
 disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do\
@@ -404,6 +407,7 @@ normalPassword: "Dobre hasło"
 strongPassword: "Silne hasło"
 passwordMatched: "Pasuje"
 passwordNotMatched: "Hasła nie pasują do siebie"
+signinWith: "Zaloguj się z {x}"
 signinFailed: "Nie udało się zalogować. Wprowadzona nazwa użytkownika lub hasło są\
   \ nieprawidłowe."
 tapSecurityKey: "Wybierz swój klucz bezpieczeństwa"

locales/ro-RO.yml

@@ -311,6 +311,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Pagini"
+integration: "Integrare"
+connectService: "Conectează"
+disconnectService: "Deconectează"
 enableLocalTimeline: "Activează cronologia locală"
 enableGlobalTimeline: "Activeaza cronologia globală"
 disablingTimelinesInfo: "Administratorii și Moderatorii vor avea mereu access la toate\
@@ -417,6 +420,7 @@ normalPassword: "Parolă medie"
 strongPassword: "Parolă puternică"
 passwordMatched: "Se potrivește!"
 passwordNotMatched: "Nu se potrivește"
+signinWith: "Autentifică-te cu {x}"
 signinFailed: "Nu se poate autentifica. Numele de utilizator sau parola introduse\
   \ sunt incorecte."
 tapSecurityKey: "Apasă pe cheia ta de securitate."

locales/ru-RU.yml

@@ -304,6 +304,9 @@ dayX: "{day} день"
 monthX: "{month} месяц"
 yearX: "{year} год"
 pages: "Страницы"
+integration: "Интеграция"
+connectService: "Подключиться"
+disconnectService: "Отключиться"
 enableLocalTimeline: "Включить локальную ленту"
 enableGlobalTimeline: "Включить глобальную ленту"
 disablingTimelinesInfo: "У администраторов и модераторов есть доступ ко всем лентам,\
@@ -412,6 +415,7 @@ normalPassword: "Годный пароль"
 strongPassword: "Надёжный пароль"
 passwordMatched: "Совпали"
 passwordNotMatched: "Не совпадают"
+signinWith: "Использовать {x} для входа"
 signinFailed: "Невозможно войти в систему. Введенное вами имя пользователя или пароль\
   \ неверны."
 tapSecurityKey: "Нажмите на свой электронный ключ"

locales/sk-SK.yml

@@ -305,6 +305,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Stránky"
+integration: "Integrácia"
+connectService: "Pripojiť"
+disconnectService: "Odpojiť"
 enableLocalTimeline: "Povoliť lokálnu časovú os"
 enableGlobalTimeline: "Povoliť globálnu časovú os"
 disablingTimelinesInfo: "Administrátori a moderátori majú vždy prístup ku všetkým\
@@ -411,6 +414,7 @@ normalPassword: "Dobré heslo"
 strongPassword: "Silné heslo"
 passwordMatched: "Heslá sú rovnaké"
 passwordNotMatched: "Heslá nie sú rovnaké"
+signinWith: "Prihlásiť sa použitím {x}"
 signinFailed: "Nedá sa prihlásiť. Skontrolujte prosím meno používateľa a heslo."
 tapSecurityKey: "Ťuknite na bezpečnostný kľúč"
 or: "Alebo"

locales/uk-UA.yml

@@ -305,6 +305,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Сторінки"
+integration: "Інтеграція"
+connectService: "Під’єднати"
+disconnectService: "Відключитися"
 enableLocalTimeline: "Увімкнути локальну стрічку"
 enableGlobalTimeline: "Увімкнути глобальну стрічку"
 disablingTimelinesInfo: "Адміністратори та модератори завжди мають доступ до всіх\
@@ -411,6 +414,7 @@ normalPassword: "Достатній пароль"
 strongPassword: "Міцний пароль"
 passwordMatched: "Все вірно"
 passwordNotMatched: "Паролі не співпадають"
+signinWith: "Увійти за допомогою {x}"
 signinFailed: "Не вдалося увійти. Введені ім’я користувача або пароль неправильнi."
 tapSecurityKey: "Торкніться ключа безпеки"
 or: "або"

locales/vi-VN.yml

@@ -305,6 +305,9 @@ dayX: "{day}"
 monthX: "{month}"
 yearX: "{year}"
 pages: "Trang"
+integration: "Tương tác"
+connectService: "Kết nối"
+disconnectService: "Ngắt kết nối"
 enableLocalTimeline: "Bật bảng tin máy chủ"
 enableGlobalTimeline: "Bật bảng tin liên hợp"
 disablingTimelinesInfo: "Quản trị viên và Kiểm duyệt viên luôn có quyền truy cập mọi\
@@ -412,6 +415,7 @@ normalPassword: "Mật khẩu tạm được"
 strongPassword: "Mật khẩu mạnh"
 passwordMatched: "Trùng khớp"
 passwordNotMatched: "Không trùng khớp"
+signinWith: "Đăng nhập bằng {x}"
 signinFailed: "Không thể đăng nhập. Vui lòng kiểm tra tên người dùng và mật khẩu của\
   \ bạn."
 tapSecurityKey: "Nhấn mã bảo mật của bạn"

locales/zh-CN.yml

@@ -284,6 +284,9 @@ dayX: "{day}日"
 monthX: "{month}月"
 yearX: "{year}年"
 pages: "页面"
+integration: "关联"
+connectService: "连接"
+disconnectService: "断开连接"
 enableLocalTimeline: "启用本地时间线功能"
 enableGlobalTimeline: "启用全局时间线"
 disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和数据图表也可以继续使用。"
@@ -387,6 +390,7 @@ normalPassword: "密码强度：中等"
 strongPassword: "密码强度：强"
 passwordMatched: "密码一致"
 passwordNotMatched: "密码不一致"
+signinWith: "以{x}登录"
 signinFailed: "无法登录，请检查您的用户名和密码是否正确。"
 tapSecurityKey: "轻触硬件安全密钥"
 or: "或者"

locales/zh-TW.yml

@@ -284,6 +284,9 @@ dayX: "{day}日"
 monthX: "{month}月"
 yearX: "{year}年"
 pages: "頁面"
+integration: "整合"
+connectService: "己連結"
+disconnectService: "己斷開 "
 enableLocalTimeline: "開啟本地時間軸"
 enableGlobalTimeline: "啟用公開時間軸"
 disablingTimelinesInfo: "即使您關閉了時間線功能，管理員和協調人仍可以繼續使用，以方便您。"
@@ -387,6 +390,7 @@ normalPassword: "密碼強度普通"
 strongPassword: "密碼強度高"
 passwordMatched: "密碼一致"
 passwordNotMatched: "密碼不一致"
+signinWith: "以{x}登錄"
 signinFailed: "登入失敗。 請檢查使用者名稱和密碼。"
 tapSecurityKey: "點擊安全密鑰"
 or: "或者"

package.json

@@ -46,11 +46,11 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "^5.46.1",
+		"@typescript-eslint/parser": "^5.44.0",
 		"cross-env": "7.0.3",
 		"cypress": "10.3.0",
 		"start-server-and-test": "1.14.0",
-		"typescript": "^4.9.4"
+		"typescript": "^4.9.3"
 	},
 	"packageManager": "yarn@3.3.0"
 }

packages/backend/migration/1670359028055-removeIntegrations.js

@@ -1,29 +0,0 @@
-export class removeIntegrations1670359028055 {
-	name = 'removeIntegrations1670359028055'
-
-	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableTwitterIntegration"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "twitterConsumerKey"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "twitterConsumerSecret"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGithubIntegration"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "githubClientId"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "githubClientSecret"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableDiscordIntegration"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "discordClientId"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "discordClientSecret"`);
-		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "integrations"`);
-	}
-
-	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "user_profile" ADD "integrations" jsonb NOT NULL DEFAULT '{}'`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "discordClientSecret" character varying(128)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "discordClientId" character varying(128)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "enableDiscordIntegration" boolean NOT NULL DEFAULT false`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "githubClientSecret" character varying(128)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "githubClientId" character varying(128)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "enableGithubIntegration" boolean NOT NULL DEFAULT false`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "twitterConsumerSecret" character varying(128)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "twitterConsumerKey" character varying(128)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "enableTwitterIntegration" boolean NOT NULL DEFAULT false`);
-	}
-}

packages/backend/package.json

@@ -7,7 +7,7 @@
 	"scripts": {
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
-		"lint": "tsc --noEmit && eslint src --ext .ts",
+		"lint": "eslint src --ext .ts",
 		"mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
 		"migrate": "npx typeorm migration:run -d ormconfig.js",
 		"start": "node --experimental-json-modules ./built/index.js",
@@ -29,6 +29,7 @@
 		"ajv": "8.11.0",
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
+		"autwh": "0.1.0",
 		"aws-sdk": "2.1165.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
@@ -91,6 +92,7 @@
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"require-all": "3.0.0",
+		"rndstr": "1.0.0",
 		"rss-parser": "3.12.0",
 		"sanitize-html": "2.7.0",
 		"semver": "7.3.7",
@@ -122,7 +124,6 @@
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.8",
 		"@types/cbor": "6.0.0",
-		"@types/color-convert": "^2.0.0",
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@types/is-url": "1.2.30",
@@ -145,6 +146,7 @@
 		"@types/node": "18.7.16",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.5",
+		"@types/oauth": "^0.9.1",
 		"@types/pg": "^8.6.5",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
@@ -159,21 +161,20 @@
 		"@types/sinon": "^10.0.13",
 		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/speakeasy": "2.0.7",
-		"@types/syslog-pro": "^1.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/tmp": "0.2.3",
 		"@types/uuid": "8.3.4",
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "^5.46.1",
-		"@typescript-eslint/parser": "^5.46.1",
+		"@typescript-eslint/eslint-plugin": "^5.44.0",
+		"@typescript-eslint/parser": "^5.44.0",
 		"cross-env": "7.0.3",
-		"eslint": "^8.29.0",
+		"eslint": "^8.28.0",
 		"eslint-plugin-import": "^2.26.0",
 		"execa": "6.1.0",
 		"form-data": "^4.0.0",
 		"sinon": "^14.0.2",
-		"typescript": "^4.9.4"
+		"typescript": "^4.9.3"
 	}
 }

packages/backend/src/boot/index.ts

@@ -17,7 +17,7 @@ const ev = new Xev();
 /**
  * Init process
  */
-export async function boot(): Promise<void> {
+export default async function(): Promise<void> {
 	process.title = `FoundKey (${cluster.isPrimary ? 'master' : 'worker'})`;
 
 	if (cluster.isPrimary || envOption.disableClustering) {

packages/backend/src/boot/master.ts

@@ -153,7 +153,7 @@ async function spawnWorkers(clusterLimits: Required<Config['clusterLimits']>): P
 
 	bootLogger.info(`Starting ${total} workers...`);
 	await Promise.all(workers.map(mode => spawnWorker(mode)));
-	bootLogger.succ('All workers started');
+	bootLogger.succ(`All workers started`);
 }
 
 function spawnWorker(mode: 'web' | 'queue'): Promise<void> {

packages/backend/src/config/load.ts

@@ -38,12 +38,6 @@ export default function load(): Config {
 
 	config.port = config.port || parseInt(process.env.PORT || '', 10);
 
-	config.images = Object.assign({
-		info: '/twemoji/1f440.svg',
-		notFound: '/twemoji/2049.svg',
-		error: '/twemoji/1f480.svg',
-	}, config.images ?? {});
-
 	if (!config.maxNoteTextLength) config.maxNoteTextLength = 3000;
 
 	mixin.version = meta.version;

packages/backend/src/config/types.ts

@@ -59,7 +59,7 @@ export type Source = {
 	deliverJobMaxAttempts?: number;
 	inboxJobMaxAttempts?: number;
 
-	syslog?: {
+	syslog: {
 		host: string;
 		port: number;
 	};
@@ -67,12 +67,6 @@ export type Source = {
 	mediaProxy?: string;
 	proxyRemoteFiles?: boolean;
 	internalStoragePath?: string;
-
-	images?: {
-		info?: string;
-		notFound?: string;
-		error?: string;
-	};
 };
 
 /**

packages/backend/src/db/postgre.ts

@@ -1,5 +1,6 @@
 // https://github.com/typeorm/typeorm/issues/2400
 import pg from 'pg';
+import { SECOND } from '@/const.js';
 
 pg.types.setTypeParser(20, Number);
 
@@ -7,7 +8,6 @@ import { Logger, DataSource } from 'typeorm';
 import * as highlight from 'cli-highlight';
 import config from '@/config/index.js';
 
-import { SECOND } from '@/const.js';
 import { User } from '@/models/entities/user.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { DriveFolder } from '@/models/entities/drive-folder.js';
@@ -78,33 +78,33 @@ import { redisClient } from './redis.js';
 const sqlLogger = dbLogger.createSubLogger('sql', 'gray', false);
 
 class MyCustomLogger implements Logger {
-	private highlight(sql: string): string {
+	private highlight(sql: string) {
 		return highlight.highlight(sql, {
 			language: 'sql', ignoreIllegals: true,
 		});
 	}
 
-	public logQuery(query: string): void {
+	public logQuery(query: string, parameters?: any[]) {
 		sqlLogger.info(this.highlight(query).substring(0, 100));
 	}
 
-	public logQueryError(error: string, query: string): void {
+	public logQueryError(error: string, query: string, parameters?: any[]) {
 		sqlLogger.error(this.highlight(query));
 	}
 
-	public logQuerySlow(time: number, query: string): void {
+	public logQuerySlow(time: number, query: string, parameters?: any[]) {
 		sqlLogger.warn(this.highlight(query));
 	}
 
-	public logSchemaBuild(message: string): void {
+	public logSchemaBuild(message: string) {
 		sqlLogger.info(message);
 	}
 
-	public log(message: string): void {
+	public log(message: string) {
 		sqlLogger.info(message);
 	}
 
-	public logMigration(message: string): void {
+	public logMigration(message: string) {
 		sqlLogger.info(message);
 	}
 }

packages/backend/src/index.ts

@@ -3,7 +3,7 @@
  */
 
 import { EventEmitter } from 'node:events';
-import { boot } from '@/boot/index.js';
+import boot from '@/boot/index.js';
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 128;

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

@@ -72,7 +72,7 @@ export function fromHtml(html: string, quoteUri?: string | null): string {
 				const href = getAttr(node, 'href');
 
 				// hashtags
-				if (txt.startsWith('#') && href && (attrHas(node, 'rel', 'tag') || attrHas(node, 'class', 'hashtag'))) {
+				if (txt.startsWith('#') && href && (attrHas(node, 'rel', 'tag') || attrHas(node, 'class', 'hashtag')) {
 					text += txt;
 				// mentions
 				} else if (txt.startsWith('@') && !attrHas(node, 'rel', 'me')) {

packages/backend/src/misc/cache.ts

@@ -1,7 +1,7 @@
 export class Cache<T> {
-	public cache: Map<string, { date: number; value: T; }>;
+	public cache: Map<string | null, { date: number; value: T; }>;
 	private lifetime: number;
-	public fetcher: (key: string) => Promise<T | undefined>;
+	public fetcher: (key: string | null) => Promise<T | undefined>;
 
 	constructor(lifetime: number, fetcher: Cache<T>['fetcher']) {
 		this.cache = new Map();
@@ -9,14 +9,14 @@ export class Cache<T> {
 		this.fetcher = fetcher;
 	}
 
-	public set(key: string, value: T): void {
+	public set(key: string | null, value: T): void {
 		this.cache.set(key, {
 			date: Date.now(),
 			value,
 		});
 	}
 
-	public get(key: string): T | undefined {
+	public get(key: string | null): T | undefined {
 		const cached = this.cache.get(key);
 		if (cached == null) return undefined;
 
@@ -29,7 +29,7 @@ export class Cache<T> {
 		return cached.value;
 	}
 
-	public delete(key: string): void {
+	public delete(key: string | null): void {
 		this.cache.delete(key);
 	}
 
@@ -38,7 +38,7 @@ export class Cache<T> {
 	 * run to get the value. If the fetcher returns undefined, it is
 	 * returned but not cached.
 	 */
-	public async fetch(key: string): Promise<T | undefined> {
+	public async fetch(key: string | null): Promise<T | undefined> {
 		const cached = this.get(key);
 		if (cached !== undefined) {
 			return cached;

packages/backend/src/misc/secure-rndstr.ts

@@ -1,9 +1,10 @@
 import * as crypto from 'node:crypto';
 
 const L_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
-const LU_CHARS = L_CHARS + 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+const LU_CHARS = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-export function secureRndstrCustom(length = 32, chars: string): string {
+export function secureRndstr(length = 32, useLU = true): string {
+	const chars = useLU ? LU_CHARS : L_CHARS;
 	const chars_len = chars.length;
 
 	let str = '';
@@ -18,8 +19,3 @@ export function secureRndstrCustom(length = 32, chars: string): string {
 
 	return str;
 }
-
-export function secureRndstr(length = 32, useLU = true): string {
-	const chars = useLU ? LU_CHARS : L_CHARS;
-	return secureRndstrCustom(length, chars);
-}

packages/backend/src/misc/skipped-instances.ts

@@ -35,7 +35,7 @@ export async function skippedInstances(hosts: Array<Instance['host']>): Promise<
 				hosts.filter(host => !skipped.includes(host) && !host.includes(',')).join(','),
 			],
 		)
-		.then((res: Instance[]) => res.map(row => row.host)),
+		.then(res => res.map(row => row.host)),
 	);
 }
 

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

@@ -17,7 +17,7 @@ export class AbuseUserReport {
 	@Column(id())
 	public targetUserId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -27,7 +27,7 @@ export class AbuseUserReport {
 	@Column(id())
 	public reporterId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -39,7 +39,7 @@ export class AbuseUserReport {
 	})
 	public assigneeId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/access-token.ts

@@ -41,7 +41,7 @@ export class AccessToken {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -53,7 +53,7 @@ export class AccessToken {
 	})
 	public appId: App['id'] | null;
 
-	@ManyToOne(() => App, {
+	@ManyToOne(type => App, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/announcement-read.ts

@@ -18,7 +18,7 @@ export class AnnouncementRead {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -28,7 +28,7 @@ export class AnnouncementRead {
 	@Column(id())
 	public announcementId: Announcement['id'];
 
-	@ManyToOne(() => Announcement, {
+	@ManyToOne(type => Announcement, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/antenna-note.ts

@@ -16,7 +16,7 @@ export class AntennaNote {
 	})
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -29,7 +29,7 @@ export class AntennaNote {
 	})
 	public antennaId: Antenna['id'];
 
-	@ManyToOne(() => Antenna, {
+	@ManyToOne(type => Antenna, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -21,7 +21,7 @@ export class Antenna {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -42,7 +42,7 @@ export class Antenna {
 	})
 	public userListId: UserList['id'] | null;
 
-	@ManyToOne(() => UserList, {
+	@ManyToOne(type => UserList, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -54,7 +54,7 @@ export class Antenna {
 	})
 	public userGroupJoiningId: UserGroupJoining['id'] | null;
 
-	@ManyToOne(() => UserGroupJoining, {
+	@ManyToOne(type => UserGroupJoining, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -21,7 +21,7 @@ export class App {
 	})
 	public userId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'SET NULL',
 		nullable: true,
 	})

packages/backend/src/models/entities/attestation-challenge.ts

@@ -11,7 +11,7 @@ export class AttestationChallenge {
 	@PrimaryColumn(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/auth-session.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
+import { Entity, PrimaryColumn, Index, Column, ManyToOne, OneToOne, JoinColumn } from 'typeorm';
 import { id } from '../id.js';
 import { AccessToken } from './access-token.js';
 import { App } from './app.js';
@@ -45,5 +45,5 @@ export class AuthSession {
 		nullable: true,
 		comment: 'PKCE code_challenge value, if provided (OAuth only)',
 	})
-		pkceChallenge: string | null;
+	pkceChallenge: string | null;
 }

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

@@ -21,7 +21,7 @@ export class Blocking {
 	})
 	public blockeeId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -34,7 +34,7 @@ export class Blocking {
 	})
 	public blockerId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/channel-following.ts

@@ -22,7 +22,7 @@ export class ChannelFollowing {
 	})
 	public followeeId: Channel['id'];
 
-	@ManyToOne(() => Channel, {
+	@ManyToOne(type => Channel, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -35,7 +35,7 @@ export class ChannelFollowing {
 	})
 	public followerId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/channel-note-pining.ts

@@ -18,7 +18,7 @@ export class ChannelNotePining {
 	@Column(id())
 	public channelId: Channel['id'];
 
-	@ManyToOne(() => Channel, {
+	@ManyToOne(type => Channel, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -27,7 +27,7 @@ export class ChannelNotePining {
 	@Column(id())
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -28,7 +28,7 @@ export class Channel {
 	})
 	public userId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()
@@ -53,7 +53,7 @@ export class Channel {
 	})
 	public bannerId: DriveFile['id'] | null;
 
-	@ManyToOne(() => DriveFile, {
+	@ManyToOne(type => DriveFile, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/clip-note.ts

@@ -16,7 +16,7 @@ export class ClipNote {
 	})
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -29,7 +29,7 @@ export class ClipNote {
 	})
 	public clipId: Clip['id'];
 
-	@ManyToOne(() => Clip, {
+	@ManyToOne(type => Clip, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -19,7 +19,7 @@ export class Clip {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -23,7 +23,7 @@ export class DriveFile {
 	})
 	public userId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'RESTRICT',
 	})
 	@JoinColumn()
@@ -144,7 +144,7 @@ export class DriveFile {
 	})
 	public folderId: DriveFolder['id'] | null;
 
-	@ManyToOne(() => DriveFolder, {
+	@ManyToOne(type => DriveFolder, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()

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

@@ -27,7 +27,7 @@ export class DriveFolder {
 	})
 	public userId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -41,7 +41,7 @@ export class DriveFolder {
 	})
 	public parentId: DriveFolder['id'] | null;
 
-	@ManyToOne(() => DriveFolder, {
+	@ManyToOne(type => DriveFolder, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/follow-request.ts

@@ -20,7 +20,7 @@ export class FollowRequest {
 	})
 	public followeeId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -33,7 +33,7 @@ export class FollowRequest {
 	})
 	public followerId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -21,7 +21,7 @@ export class Following {
 	})
 	public followeeId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -34,7 +34,7 @@ export class Following {
 	})
 	public followerId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/gallery-like.ts

@@ -16,7 +16,7 @@ export class GalleryLike {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -25,7 +25,7 @@ export class GalleryLike {
 	@Column(id())
 	public postId: GalleryPost['id'];
 
-	@ManyToOne(() => GalleryPost, {
+	@ManyToOne(type => GalleryPost, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -37,7 +37,7 @@ export class GalleryPost {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -22,7 +22,7 @@ export class MessagingMessage {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -35,7 +35,7 @@ export class MessagingMessage {
 	})
 	public recipientId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -48,7 +48,7 @@ export class MessagingMessage {
 	})
 	public groupId: UserGroup['id'] | null;
 
-	@ManyToOne(() => UserGroup, {
+	@ManyToOne(type => UserGroup, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -81,7 +81,7 @@ export class MessagingMessage {
 	})
 	public fileId: DriveFile['id'] | null;
 
-	@ManyToOne(() => DriveFile, {
+	@ManyToOne(type => DriveFile, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -134,7 +134,7 @@ export class Meta {
 	})
 	public proxyAccountId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()
@@ -246,6 +246,57 @@ export class Meta {
 	})
 	public swPrivateKey: string;
 
+	@Column('boolean', {
+		default: false,
+	})
+	public enableTwitterIntegration: boolean;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public twitterConsumerKey: string | null;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public twitterConsumerSecret: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public enableGithubIntegration: boolean;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public githubClientId: string | null;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public githubClientSecret: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public enableDiscordIntegration: boolean;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public discordClientId: string | null;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+	})
+	public discordClientSecret: string | null;
+
 	@Column('enum', {
 		enum: TranslationService,
 		nullable: true,

packages/backend/src/models/entities/moderation-log.ts

@@ -16,7 +16,7 @@ export class ModerationLog {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/muted-note.ts

@@ -17,7 +17,7 @@ export class MutedNote {
 	})
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -30,7 +30,7 @@ export class MutedNote {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -27,7 +27,7 @@ export class Muting {
 	})
 	public muteeId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -40,7 +40,7 @@ export class Muting {
 	})
 	public muterId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -18,7 +18,7 @@ export class NoteFavorite {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -27,7 +27,7 @@ export class NoteFavorite {
 	@Column(id())
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -19,7 +19,7 @@ export class NoteReaction {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -29,7 +29,7 @@ export class NoteReaction {
 	@Column(id())
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/note-thread-muting.ts

@@ -20,7 +20,7 @@ export class NoteThreadMuting {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/note-unread.ts

@@ -14,7 +14,7 @@ export class NoteUnread {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -24,7 +24,7 @@ export class NoteUnread {
 	@Column(id())
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/note-watching.ts

@@ -22,7 +22,7 @@ export class NoteWatching {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -35,7 +35,7 @@ export class NoteWatching {
 	})
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -27,7 +27,7 @@ export class Note {
 	})
 	public replyId: Note['id'] | null;
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -41,7 +41,7 @@ export class Note {
 	})
 	public renoteId: Note['id'] | null;
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -75,7 +75,7 @@ export class Note {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -179,7 +179,7 @@ export class Note {
 	})
 	public channelId: Channel['id'] | null;
 
-	@ManyToOne(() => Channel, {
+	@ManyToOne(type => Channel, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -28,7 +28,7 @@ export class Notification {
 	})
 	public notifieeId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -45,7 +45,7 @@ export class Notification {
 	})
 	public notifierId: User['id'] | null;
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -89,7 +89,7 @@ export class Notification {
 	})
 	public noteId: Note['id'] | null;
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -101,7 +101,7 @@ export class Notification {
 	})
 	public followRequestId: FollowRequest['id'] | null;
 
-	@ManyToOne(() => FollowRequest, {
+	@ManyToOne(type => FollowRequest, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -113,7 +113,7 @@ export class Notification {
 	})
 	public userGroupInvitationId: UserGroupInvitation['id'] | null;
 
-	@ManyToOne(() => UserGroupInvitation, {
+	@ManyToOne(type => UserGroupInvitation, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -165,7 +165,7 @@ export class Notification {
 	})
 	public appAccessTokenId: AccessToken['id'] | null;
 
-	@ManyToOne(() => AccessToken, {
+	@ManyToOne(type => AccessToken, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/page-like.ts

@@ -16,7 +16,7 @@ export class PageLike {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -25,7 +25,7 @@ export class PageLike {
 	@Column(id())
 	public pageId: Page['id'];
 
-	@ManyToOne(() => Page, {
+	@ManyToOne(type => Page, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -57,7 +57,7 @@ export class Page {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -69,7 +69,7 @@ export class Page {
 	})
 	public eyeCatchingImageId: DriveFile['id'] | null;
 
-	@ManyToOne(() => DriveFile, {
+	@ManyToOne(type => DriveFile, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/password-reset-request.ts

@@ -22,7 +22,7 @@ export class PasswordResetRequest {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/poll-vote.ts

@@ -19,7 +19,7 @@ export class PollVote {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -29,7 +29,7 @@ export class PollVote {
 	@Column(id())
 	public noteId: Note['id'];
 
-	@ManyToOne(() => Note, {
+	@ManyToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -9,7 +9,7 @@ export class Poll {
 	@PrimaryColumn(id())
 	public noteId: Note['id'];
 
-	@OneToOne(() => Note, {
+	@OneToOne(type => Note, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/registry-item.ts

@@ -25,7 +25,7 @@ export class RegistryItem {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/renote-muting.ts

@@ -21,7 +21,7 @@ export class RenoteMuting {
 	})
 	public muteeId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -34,7 +34,7 @@ export class RenoteMuting {
 	})
 	public muterId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

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

@@ -16,7 +16,7 @@ export class Signin {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/sw-subscription.ts

@@ -14,7 +14,7 @@ export class SwSubscription {
 	@Column(id())
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/user-group-invitation.ts

@@ -21,7 +21,7 @@ export class UserGroupInvitation {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -34,7 +34,7 @@ export class UserGroupInvitation {
 	})
 	public userGroupId: UserGroup['id'];
 
-	@ManyToOne(() => UserGroup, {
+	@ManyToOne(type => UserGroup, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/entities/user-group-joining.ts

@@ -21,7 +21,7 @@ export class UserGroupJoining {
 	})
 	public userId: User['id'];
 
-	@ManyToOne(() => User, {
+	@ManyToOne(type => User, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -34,7 +34,7 @@ export class UserGroupJoining {
 	})
 	public userGroupId: UserGroup['id'];
 
-	@ManyToOne(() => UserGroup, {
+	@ManyToOne(type => UserGroup, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()