diff --git a/.circleci/v10-node10-redis/default.yml b/.circleci/v10-node10-redis/default.yml index c842431d2..5cdb7330c 100644 --- a/.circleci/v10-node10-redis/default.yml +++ b/.circleci/v10-node10-redis/default.yml @@ -6,8 +6,6 @@ mongodb: db: misskey user: syuilo pass: '' -drive: - storage: 'db' redis: host: localhost port: 6379 diff --git a/.circleci/v10-node11-redis/test.yml b/.circleci/v10-node11-redis/test.yml index 450c5a79d..99ad50876 100644 --- a/.circleci/v10-node11-redis/test.yml +++ b/.circleci/v10-node11-redis/test.yml @@ -6,8 +6,6 @@ mongodb: db: test-misskey user: admin pass: '' -drive: - storage: 'db' # __REDIS__ redis: host: localhost diff --git a/.config/example.yml b/.config/example.yml index db278ecc2..503471d93 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -62,6 +62,10 @@ db: user: example-misskey-user pass: example-misskey-pass + # Extra Connection options + #extra: + # ssl: true + # ┌─────────────────────┐ #───┘ Redis configuration └───────────────────────────────────── @@ -78,61 +82,6 @@ redis: # port: 9200 # pass: null -# ┌────────────────────────────────────┐ -#───┘ File storage (Drive) configuration └────────────────────── - -drive: - storage: 'fs' - -# OR - -#drive: -# storage: 'minio' -# bucket: -# prefix: -# config: -# endPoint: -# port: -# useSSL: -# accessKey: -# secretKey: - -# S3/GCS example -# -# * Replace to -# S3: see https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region -# GCS: use 'storage.googleapis.com' -# -# * Replace to -# S3: see https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region -# GCS: not needed (just delete the region line) -# -#drive: -# storage: 'minio' -# bucket: bucket-name -# prefix: files -# baseUrl: https://bucket-name. -# config: -# endPoint: -# region: -# useSSL: true -# accessKey: XXX -# secretKey: YYY - -# S3/GCS example (with CDN, custom domain) -# -#drive: -# storage: 'minio' -# bucket: drive.example.com -# prefix: files -# baseUrl: https://drive.example.com -# config: -# endPoint: -# region: -# useSSL: true -# accessKey: XXX -# secretKey: YYY - # ┌───────────────┐ #───┘ ID generation └─────────────────────────────────────────── diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..c6b2a1611 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +patreon: syuilo diff --git a/.gitignore b/.gitignore index 255b1ad4d..5d06997f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,23 @@ +# Visual Studio Code +/.vscode + +# Intelij-IDEA +/.idea + +# Node.js +/node_modules + +# yarn +yarn.lock + +# config /.config/* !/.config/example.yml !/.config/mongo_initdb_example.js -/.vscode -/node_modules + +# misskey /build /built -built /data /.cache-loader /db @@ -17,7 +29,6 @@ api-docs.json *.log /redis *.code-workspace -yarn.lock .DS_Store /files ormconfig.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 391329c56..1fdc8cdf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,43 +8,490 @@ If you encounter any problems with updating, please try the following: Migration ------------------------------ #### 1 -`ormconfig.json`という名前で、Misskeyのインストール場所(package.jsonとかがあるディレクトリ)に新たなファイルを作る。中身は次のようにします: -``` json -{ - "type": "postgres", - "host": "PostgreSQLのホスト", - "port": 5432, - "username": "PostgreSQLのユーザー名", - "password": "PostgreSQLのパスワード", - "database": "PostgreSQLのデータベース名", - "entities": ["src/models/entities/*.ts"], - "migrations": ["migration/*.ts"], - "cli": { - "migrationsDir": "migration" - } -} -``` -上記の各種PostgreSQLの設定(ポートも)は、設定ファイルに書いてあるものをコピーしてください。 - -#### 2 ``` npm i -g ts-node ``` -#### 3 +#### 2 ``` -ts-node ./node_modules/typeorm/cli.js migration:run +npm run migrate ``` -How to migrate to v11 from v10 ------------------------------- -### 移行の注意点 +11.20.0 (2019/05/27) +-------------------- +### ✨Improvements +* 管理画面からリモートファイルのキャッシュをすべて削除できるように +* 投稿フォームに投稿のURLをペーストしようとすると引用RNにできるように +* モバイル版の投稿フォームにファイルをドロップできるように +* モバイル版でも投稿の下書き自動保存ができるように +* リモートファイルのキャッシュが期限切れになったときにサムネイルが無くならないように +* ジョブキュー管理画面を強化 + +### 🐛Fixes +* 投稿内のローカルなURLプレビューをクリックしたとき not found になることがある問題を修正 +* デスクトップでユーザーページに遷移するときページが再度読み込みされることがある問題を修正 +* フォロー申請自動承認オプションが常にオフで表示される問題を修正 +* ポートを設定せずに起動したときに適切なエラーメッセージが表示されない問題を修正 +* i18n + +11.19.1 (2019/05/26) +-------------------- +### 🐛Fixes +* タグページを遷移してもタイムラインが変わらない問題を修正 +* インスタンス名を空にしてもMisskeyロゴが表示されない問題を修正 +* 投稿内のローカルなURLをクリックしたとき not found になることがある問題を修正 +* npm run init がプロセス終了しない問題を修正 + +11.19.0 (2019/05/25) +-------------------- +### ✨Improvements +* グループのオーナーを変えられるように +* PagesでURLプレビューを表示するように +* サーバーログを削除できるように +* リンク先が同じインスタンスの投稿内のURLをクリックしたときは新しいタブで開かないように +* PostgreSQLの接続オプションを設定ファイルで設定できるように +* いくつかのAPIでのパフォーマンスを向上 +* ユーザビリティの向上 +* デザインの調整 + +### 🐛Fixes +* デッキでユーザーページを遷移したときに前のユーザーのタイムラインが残り続ける問題を修正 +* デッキでフォロー申請が見れない問題を修正 +* グループ情報が更新できない問題を修正 +* Firefoxでトークの下が隠れてしまう問題を修正 +* トーク履歴がないと履歴が読み込み中のままになる問題を修正 +* 通知で長い名前のユーザーがいると横スクロールが発生する問題を修正 +* iOSでの選択ダイアログの動作を修正 + +11.18.1 (2019/05/21) +-------------------- +### 🐛Fixes +* 11.18.0からフォロー/フォロワーのもっと読み込む機能が作動していない問題を修正 +* iOSで投稿フォームに自動フォーカスしない問題を修正 +* ダークモードでグループ名がみにくい問題を修正 +* ハッシュタグタイムラインを読み込んだ時にプログレスバーが残り続ける問題を修正 +* ユーザビリティの修正 + +11.18.0 (2019/05/21) +-------------------- +### ✨Improvements +* デザインの調整 + +### 🐛Fixes +* 投稿の削除が連合しない問題を修正 + +11.17.1 (2019/05/20) +-------------------- +### 🐛Fixes +* トークの通知インジケーターが点灯し続ける問題を修正 +* ユーザーグループの読み込みでエラーになることがある問題を修正 + +11.17.0 (2019/05/19) +-------------------- +### 注意 +このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください + +### ✨Improvements +* ユーザーグループを招待制に + +### 🐛Fixes +* フォロー申請が表示されない問題を修正 +* トークの通知インジケーターが点灯し続ける問題を修正 +* 自分を自分のグループから削除できる問題を修正 +* 新しいタブでグループトークを開くことができない問題を修正 + +11.16.1 (2019/05/19) +-------------------- +### 🐛Fixes +* Dockerで起動できない問題を修正 + +11.16.0 (2019/05/19) +-------------------- +### 注意 +このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください + +### ✨Improvements +* ユーザーグループ機能を追加 +* ページに「いいね」できるように +* UIの改善 + +### 🐛Fixes +* トークを読み込むときに最大数指定できなかった問題を修正 + +11.15.0 (2019/05/16) +-------------------- +### ✨Improvements +* 管理画面でreCAPTCHAのプレビューを表示するように + +### 🐛Fixes +* オブジェクトストレージのリージョンの設定が反映されない問題を修正 + +11.14.0 (2019/05/16) +-------------------- +### 注意 +このバージョンからオブジェクトストレージの設定は設定ファイルではなく管理画面から行うようになりました。 +オブジェクトストレージを使用している場合、アップデートした後管理画面にアクセスしオブジェクトストレージの設定を再度行ってください。 + +### ✨Improvements +* 特定のユーザーのファイルをすべて削除できるように +* インスタンスの設定画面を整理 + +### 🐛Fixes +* GIF画像のサムネイルが生成されないのを修正 +* 管理画面の「ログ」で複数の除外条件を設定できない問題を修正 + +11.13.0 (2019/05/14) +-------------------- +### 注意 +このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください + +### ✨Improvements +* 利用規約URL、リポジトリURL、フィードバックURLを設定できるように +* 特定のインスタンスのファイルをすべて削除できるように +* _blankで外部リンクされる可能性がある箇所にnoopenerを追加 +* ユーザーや外部インスタンスが生成するリンクにnofollowを追加 +* リモートのユーザーページやノートページにnoindexを追加 +* 自分のユーザーメニューにはミュートなどを表示しないように +* デザインの調整 + +### 🐛Fixes +* インスタンスブロックを設定できない問題を修正 +* ピン留め投稿の表示順がおかしい問題を修正 +* 設定の「アップデートを確認」でメッセージが正しく表示されない問題を修正 +* Firefoxで自分のメニューが開けない問題を修正 +* Welcomeページのタグクラウドが動かない問題を修正 + +11.12.0 (2019/05/10) +-------------------- +### 注意 +このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください + +### ✨ Improvements +* インスタンス運営者がおすすめアカウントを設定できるように +* MisskeyPagesでNAME環境変数がNULLにならないように +* MisskeyPagesにNULL環境変数を追加 +* MisskeyPagesで変数を並べ替えられるように +* MisskeyPagesのテキストのリスト内で変数埋め込みできるように +* 自分の指定した投稿のRenoteを全て解除するAPIを追加 + +### 🐛Fixes +* Noteをpull取得した時にhost名がvalidateされていない問題を修正 +* みつけるで人気のタグが表示されない問題を修正 + +### その他 +* アカウントのisVerifiedフラグを廃止 + +11.11.2 (2019/05/07) +-------------------- +### 🐛Fixes +* IPv4 onlyホストからDualstackホストにAP deliverできない問題を修正 +* ストリーミングに接続するまでラグがある問題を修正 +* 2段階認証のコードが0から始まる時正しく入力できない問題を修正 +* ユーザーの更新日時が新しい順で更新日時がnullのユーザーが先頭に来る問題を修正 +* 値選択時の問題を修正 +* リバーシでマップの変更が反映されない問題を修正 +* リバーシで対局終了直後に盤面を巻き戻してもすぐ最終ターンまでリセットされる問題を修正 + +11.11.1 (2019/05/05) +-------------------- +### 🐛Fixes +* MisskeyPagesのリストから選択関数が使えない問題を修正 + +11.11.0 (2019/05/05) +-------------------- +### ✨ Improvements +* MisskeyPagesにリストから選択関数を追加 +* MisskeyPagesに確率を指定できるテキストランダム選択関数を追加 +* 外部サービス連携ログインリンクにアイコン追加 + +### 🐛Fixes +* MisskeyPagesでifを入れ子にできなくなっていた問題を修正 +* MisskeyPagesで数値入力を作成するとテキスト入力になる問題を修正 +* 外部サービス連携に関する問題を修正 + +11.10.1 (2019/05/04) +-------------------- +### 🐛Fixes +* MisskeyPagesでページブロックを削除できなくなっていた問題を修正 + +### その他 +* Node.js v12対応 + +11.10.0 (2019/05/03) +-------------------- +### 注意 +このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください + +### ✨ Improvements +* MisskeyPagesに割った余りを求める関数を追加 +* Mastodon v2.8.0 のフォローリストをインポートできるように +* エクスポートリクエストに失敗したらエラーを表示するように +* エクスポートファイルでは同一ハッシュチェックをしないように + +### 🐛Fixes +* 2段階認証を設定するとログインできなくなる問題を修正 +* ファイルをアップロードできないことがある問題を修正 +* リモートファイルをキャッシュしない設定だとサムネイル時にオリジナル画像が表示されない問題を修正 +* 外部サービス連携の不具合を修正 + +11.9.0 (2019/05/02) +------------------- +### ✨ Improvements +* MisskeyPagesで編集時にページブロックをドラッグで並べ替えられるように +* MisskeyPagesにカウンターボタンブロックを追加 + +11.8.1 (2019/05/02) +------------------- +### 🐛Fixes +* リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正 + +11.8.0-2 (2019/05/01) +------------------- +* 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正 + +11.8.0 (2019/05/01) +------------------- +### ✨ Improvements +* MisskeyPagesで関数を作成できるように +* MisskeyPagesでソースを表示できるように +* MisskeyPagesにシードを与えるランダム関数を追加 +* MisskeyPagesに複数行テキストをテキストのリストに変換する関数を追加 + +### 🐛Fixes +* APIドキュメントが見れなくなっていたのを修正 +* mention (あなた宛て) streaming にミュートが効かない問題を修正 +* デザインの調整 + +11.7.0 (2019/04/30) +------------------- +### ✨ Improvements +* MisskeyPagesに ifブロック を追加 +* MisskeyPagesに テキストエリア を追加 +* MisskeyPagesに 複数行テキスト入力 を追加 +* MisskeyPagesに 投稿フォーム を追加 +* MisskeyPagesに 変換系関数 を追加 +* MisskeyPagesに 環境変数 URL を追加 +* MisskeyPagesでボタンやスイッチなどのテキストに変数使えるように + +### 🐛Fixes +* OGPのサイト名を修正 +* デザインの調整 + +11.6.0 (2019/04/29) +------------------- +### ✨ Improvements +* AiScriptにいくつかの文字列操作関数を追加 +* ページ編集画面にページへのリンクを表示するように + +### 🐛Fixes +* MisskeyPagesで数値入力が文字列として扱われる問題を修正 +* デザインの調整 + +11.5.1 (2019/04/29) +------------------- +### 🐛Fixes +* MisskeyPagesで環境変数を別の変数内で使えない問題を修正 +* MisskeyPagesで値が0の変数が表示されない問題を修正 + +11.5.0 (2019/04/29) +------------------- +### 注意 +このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](migration)の手順を実行してください + +### New features +#### MisskeyPages +ページ(記事)を作成できるように。 + +* 後から何度でも編集できる +* アイキャッチを設定できる +* フォントを設定できる +* 画像を好きな位置に挿入できる +* URLを決められる +* タイトルを設定できる +* 見出しを設定できる +* ページの要約を設定できる(URLプレビュー時などに便利) +* 変数や式(aka AiScript)を使用して動的なページも作れる +* 目次自動生成(coming soon) + +ページを気に入ったら「いいね」しよう (coming soon) + +### ✨ Improvements +* APIコンソールでパラメータテンプレートを表示するように + +### 🐛Fixes +* おすすめユーザーに自分自身が含まれる問題を修正 +* ユーザーサジェストで表示名が変わらない問題を修正 + +11.4.0 (2019/04/25) +------------------- +### ✨ Improvements +* 検索でローカルの投稿のみに絞れるように +* 検索で特定のインスタンスの投稿のみに絞れるように +* 検索で特定のユーザーの投稿のみに絞れるように + +### 🐛Fixes +* 投稿が増殖する問題を修正 +* ストリームで過去の投稿が流れてくる問題を修正 +* モバイル版のユーザーページで遷移してもユーザー名が変わらない問題を修正 +* お知らせを切り替えても内容が変わらない問題を修正 + +11.3.1 (2019/04/24) +------------------- +### 🐛Fixes +* Webからファイルがアップロードできない問題を修正 + +11.3.0 (2019/04/24) +------------------- +### ✨ Improvements +* お知らせにMFMを使えるように +* お知らせに画像を添付できるように + +### 🐛Fixes +* 投稿のタグ検索APIで大文字小文字が区別されていたのを修正 +* 公開範囲がホームの投稿がグローバルTLに流れる問題を修正 +* モバイルビューの投稿詳細にて acct が長いとアイコンが圧迫面接される問題を修正 + +11.2.2 (2019/04/22) +------------------- +### 🐛Fixes +* 2段階認証を有効にするとログインできない問題を修正 +* リモートユーザーの修復処理が自動的に実行されない問題を修正 +* リモートユーザー情報が更新されない問題を修正 + +11.2.1 (2019/04/21) +------------------- +### 🐛Fixes +* MEIDが25桁になっているのを修正 +* リモートユーザー情報が更新されない問題を修正 + +11.2.0 (2019/04/18) +------------------- +### ✨ Improvements +* 検索で日付(日時)を入力するとタイムラインをその時点まで遡るように +* APIコンソールでエンドポイントをサジェストするように +* モバイル版でドライブのメニューを使いやすく +* サイレンス時に確認を表示するように +* ユーザーメニューでブロックなどの操作を行う時に確認するように + +### 🐛Fixes +* アプリケーション連携画面でパーミッションが表示されない問題を修正 +* アンケートウィジットでもMFMを使用するように +* フォローしてないユーザーのホーム投稿がSTLに流れてくる問題を修正 +* モバイル版でウィジェットを設定できない問題を修正 +* スプラッシュがクリックに反応するように + +11.1.6 (2019/04/18) +------------------- +### 🐛Fixes +* 未認知ユーザーからActivityが飛んできた場合に処理できない問題を修正 +* その投稿を見たのにも関わらずメンションインジケーターが点灯し続ける問題を修正 +* ハッシュタグの判定を改善 +* サーバーのエラーハンドリングを改善 + +11.1.5 (2019/04/17) +------------------- +### 🐛Fixes +* ユーザー名に含まれているカスタム絵文字が表示されないことがある問題を修正 +* 壁紙の設定ができない問題を修正 +* デザインの調整 + +11.1.4 (2019/04/17) +------------------- +### 🐛Fixes +* タイムライン取得時に削除されたファイルを添付している投稿が含まれているとサーバーでエラーになる問題を修正 +* 管理画面のインスタンスメニューで変更前の設定が読み込まれないことがある問題を修正 +* 猫ではないのに猫のままで表示される問題を修正 +* admin/driveのアイコンがずれてる問題を修正 +* チャートで大きな数値を扱えない問題を修正 +* UIの修正 + +11.1.3 (2019/04/16) +------------------- +### 🐛Fixes +* アプリからAPIにリクエストするときにランダムなユーザーがリクエストしたことになる問題を修正 + +11.1.2 (2019/04/15) +------------------- +### 🐛Fixes +* 画像描画の依存関係を変更 +* リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正 +* リアクションしてないのにリアクションしたことになる問題を修正 +* APIドキュメントの修正 + +11.1.1 (2019/04/15) +------------------- +### 🐛Fixes +* Metaタグの application-name を Misskey で固定するように修正 +* トークメッセージが既読にならない問題を修正 +* デフォルトでHTLを表示するように + +11.1.0 (2019/04/15) +------------------- +### ✨ Improvements +* アイコン未設定時にランダムな画像を表示するように +* 管理者やモデレーターはレートリミット無効に + +### 🐛Fixes +* メンションの「あなた」インジケーターが表示されない問題を修正 +* ブロックAPIでエラーが発生する問題を修正 +* プッシュ通知の購読に失敗する問題を修正 + +11.0.3 (2019/04/15) +------------------- +### 🐛Fixes +* ハッシュタグ検索APIが動作しない問題を修正 +* モデレーターなのにアカウントメニューに「管理」が表示されない問題を修正 +* プッシュ通知の購読に失敗する問題を修正 +* ユーザー取得APIでユーザーを指定しない場合エラーになる問題を修正 + +11.0.2 (2019/04/15) +------------------- +### 🐛Fixes +* アプリが作成できない問題を修正 +* 「ハイライト」が表示されない問題を修正 +* リモートの投稿に添付されている画像が小さい問題を修正 +* モバイル版でリストの名前が表示されない問題を修正 +* APIドキュメントにパーミッション一覧を追加 + +11.0.1 (2019/04/15) +------------------- +### ✨ Improvements +* 不要な依存関係を削除 + +11.0.0 daybreak (2019/04/14) +---------------------------- +### ✨ Improvements +* **データベースがMongoDBからPostgreSQLに変更されました** +* **Redisが必須に** +* アカウントを完全に削除できるように +* 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように +* ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように + +### 🐛Fixes +* フォロー申請数が実際より1すくなくなる問題を修正 +* リストからアカウント削除したユーザーを削除できない問題を修正 +* リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正 +* リストTLでダイレクト投稿が流れない問題を修正 +* ミュートしているユーザーの投稿がタイムラインに流れてくることがある問題を修正 + +### APIの破壊的変更 +* v10時点で deprecated だったパラメータなどを削除 +* ユーザーリストの title が name に +* リバーシの対局の`settings`プロパティがなくなり、その中にあったプロパティがすべて上の階層に + * 例えば`game.settings.map`は`game.map`になる + +### 既知の問題 +* ユーザー認証無しでのアプリが作成できない + * 依存ライブラリの問題と思わるため、対応が難しい + +### Migration +#### 移行の注意点 **以下のデータは引き継がれません** * 通知 * リモートの投稿 * リバーシの対局 -### 手順 +#### 手順 1. v11をインストールしたい場所に syuilo/misskey をクローン 2. config を設定する * PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります) @@ -73,332 +520,6 @@ mongodb: 8. master ブランチに戻す 9. enjoy -11.12.0 (2019/05/10) --------------------- -### 注意 -このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください - -### Improvements -* インスタンス運営者がおすすめアカウントを設定できるように -* MisskeyPagesでNAME環境変数がNULLにならないように -* MisskeyPagesにNULL環境変数を追加 -* MisskeyPagesで変数を並べ替えられるように -* MisskeyPagesのテキストのリスト内で変数埋め込みできるように -* 自分の指定した投稿のRenoteを全て解除するAPIを追加 - -### Fixes -* Noteをpull取得した時にhost名がvalidateされていない問題を修正 -* みつけるで人気のタグが表示されない問題を修正 - -### その他 -* アカウントのisVerifiedフラグを廃止 - -11.11.2 (2019/05/07) --------------------- -### Fixes -* IPv4 onlyホストからDualstackホストにAP deliverできない問題を修正 -* ストリーミングに接続するまでラグがある問題を修正 -* 2段階認証のコードが0から始まる時正しく入力できない問題を修正 -* ユーザーの更新日時が新しい順で更新日時がnullのユーザーが先頭に来る問題を修正 -* 値選択時の問題を修正 -* リバーシでマップの変更が反映されない問題を修正 -* リバーシで対局終了直後に盤面を巻き戻してもすぐ最終ターンまでリセットされる問題を修正 - -11.11.1 (2019/05/05) --------------------- -### Fixes -* MisskeyPagesのリストから選択関数が使えない問題を修正 - -11.11.0 (2019/05/05) --------------------- -### Improvements -* MisskeyPagesにリストから選択関数を追加 -* MisskeyPagesに確率を指定できるテキストランダム選択関数を追加 -* 外部サービス連携ログインリンクにアイコン追加 - -### Fixes -* MisskeyPagesでifを入れ子にできなくなっていた問題を修正 -* MisskeyPagesで数値入力を作成するとテキスト入力になる問題を修正 -* 外部サービス連携に関する問題を修正 - -11.10.1 (2019/05/04) --------------------- -### Fixes -* MisskeyPagesでページブロックを削除できなくなっていた問題を修正 - -### その他 -* Node.js v12対応 - -11.10.0 (2019/05/03) --------------------- -### 注意 -このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください - -### Improvements -* MisskeyPagesに割った余りを求める関数を追加 -* Mastodon v2.8.0 のフォローリストをインポートできるように -* エクスポートリクエストに失敗したらエラーを表示するように -* エクスポートファイルでは同一ハッシュチェックをしないように - -### Fixes -* 2段階認証を設定するとログインできなくなる問題を修正 -* ファイルをアップロードできないことがある問題を修正 -* リモートファイルをキャッシュしない設定だとサムネイル時にオリジナル画像が表示されない問題を修正 -* 外部サービス連携の不具合を修正 - -11.9.0 (2019/05/02) -------------------- -### Improvements -* MisskeyPagesで編集時にページブロックをドラッグで並べ替えられるように -* MisskeyPagesにカウンターボタンブロックを追加 - -11.8.1 (2019/05/02) -------------------- -### Fixes -* リモートファイルをキャッシュしないオプション有効時にファイルが作成できない問題を修正 - -11.8.0-2 (2019/05/01) -------------------- -* 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正 - -11.8.0 (2019/05/01) -------------------- -### Improvements -* MisskeyPagesで関数を作成できるように -* MisskeyPagesでソースを表示できるように -* MisskeyPagesにシードを与えるランダム関数を追加 -* MisskeyPagesに複数行テキストをテキストのリストに変換する関数を追加 - -### Fixes -* APIドキュメントが見れなくなっていたのを修正 -* mention (あなた宛て) streaming にミュートが効かない問題を修正 -* デザインの調整 - -11.7.0 (2019/04/30) -------------------- -### Improvements -* MisskeyPagesに ifブロック を追加 -* MisskeyPagesに テキストエリア を追加 -* MisskeyPagesに 複数行テキスト入力 を追加 -* MisskeyPagesに 投稿フォーム を追加 -* MisskeyPagesに 変換系関数 を追加 -* MisskeyPagesに 環境変数 URL を追加 -* MisskeyPagesでボタンやスイッチなどのテキストに変数使えるように - -### Fixes -* OGPのサイト名を修正 -* デザインの調整 - -11.6.0 (2019/04/29) -------------------- -### Improvements -* AiScriptにいくつかの文字列操作関数を追加 -* ページ編集画面にページへのリンクを表示するように - -### Fixes -* MisskeyPagesで数値入力が文字列として扱われる問題を修正 -* デザインの調整 - -11.5.1 (2019/04/29) -------------------- -### Fixes -* MisskeyPagesで環境変数を別の変数内で使えない問題を修正 -* MisskeyPagesで値が0の変数が表示されない問題を修正 - -11.5.0 (2019/04/29) -------------------- -### 注意 -このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](migration)の手順を実行してください - -### New features -#### MisskeyPages -ページ(記事)を作成できるように。 - -* 後から何度でも編集できる -* アイキャッチを設定できる -* フォントを設定できる -* 画像を好きな位置に挿入できる -* URLを決められる -* タイトルを設定できる -* 見出しを設定できる -* ページの要約を設定できる(URLプレビュー時などに便利) -* 変数や式(aka AiScript)を使用して動的なページも作れる -* 目次自動生成(coming soon) - -ページを気に入ったら「いいね」しよう (coming soon) - -### Improvements -* APIコンソールでパラメータテンプレートを表示するように - -### Fixes -* おすすめユーザーに自分自身が含まれる問題を修正 -* ユーザーサジェストで表示名が変わらない問題を修正 - -11.4.0 (2019/04/25) -------------------- -### Improvements -* 検索でローカルの投稿のみに絞れるように -* 検索で特定のインスタンスの投稿のみに絞れるように -* 検索で特定のユーザーの投稿のみに絞れるように - -### Fixes -* 投稿が増殖する問題を修正 -* ストリームで過去の投稿が流れてくる問題を修正 -* モバイル版のユーザーページで遷移してもユーザー名が変わらない問題を修正 -* お知らせを切り替えても内容が変わらない問題を修正 - -11.3.1 (2019/04/24) -------------------- -### Fixes -* Webからファイルがアップロードできない問題を修正 - -11.3.0 (2019/04/24) -------------------- -### Improvements -* お知らせにMFMを使えるように -* お知らせに画像を添付できるように - -### Fixes -* 投稿のタグ検索APIで大文字小文字が区別されていたのを修正 -* 公開範囲がホームの投稿がグローバルTLに流れる問題を修正 -* モバイルビューの投稿詳細にて acct が長いとアイコンが圧迫面接される問題を修正 - -11.2.2 (2019/04/22) -------------------- -### Fixes -* 2段階認証を有効にするとログインできない問題を修正 -* リモートユーザーの修復処理が自動的に実行されない問題を修正 -* リモートユーザー情報が更新されない問題を修正 - -11.2.1 (2019/04/21) -------------------- -### Fixes -* MEIDが25桁になっているのを修正 -* リモートユーザー情報が更新されない問題を修正 - -11.2.0 (2019/04/18) -------------------- -### Improvements -* 検索で日付(日時)を入力するとタイムラインをその時点まで遡るように -* APIコンソールでエンドポイントをサジェストするように -* モバイル版でドライブのメニューを使いやすく -* サイレンス時に確認を表示するように -* ユーザーメニューでブロックなどの操作を行う時に確認するように - -### Fixes -* アプリケーション連携画面でパーミッションが表示されない問題を修正 -* アンケートウィジットでもMFMを使用するように -* フォローしてないユーザーのホーム投稿がSTLに流れてくる問題を修正 -* モバイル版でウィジェットを設定できない問題を修正 -* スプラッシュがクリックに反応するように - -11.1.6 (2019/04/18) -------------------- -### Fixes -* 未認知ユーザーからActivityが飛んできた場合に処理できない問題を修正 -* その投稿を見たのにも関わらずメンションインジケーターが点灯し続ける問題を修正 -* ハッシュタグの判定を改善 -* サーバーのエラーハンドリングを改善 - -11.1.5 (2019/04/17) -------------------- -### Fixes -* ユーザー名に含まれているカスタム絵文字が表示されないことがある問題を修正 -* 壁紙の設定ができない問題を修正 -* デザインの調整 - -11.1.4 (2019/04/17) -------------------- -### Fixes -* タイムライン取得時に削除されたファイルを添付している投稿が含まれているとサーバーでエラーになる問題を修正 -* 管理画面のインスタンスメニューで変更前の設定が読み込まれないことがある問題を修正 -* 猫ではないのに猫のままで表示される問題を修正 -* admin/driveのアイコンがずれてる問題を修正 -* チャートで大きな数値を扱えない問題を修正 -* UIの修正 - -11.1.3 (2019/04/16) -------------------- -### Fixes -* アプリからAPIにリクエストするときにランダムなユーザーがリクエストしたことになる問題を修正 - -11.1.2 (2019/04/15) -------------------- -### Fixes -* 画像描画の依存関係を変更 -* リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正 -* リアクションしてないのにリアクションしたことになる問題を修正 -* APIドキュメントの修正 - -11.1.1 (2019/04/15) -------------------- -### Fixes -* Metaタグの application-name を Misskey で固定するように修正 -* トークメッセージが既読にならない問題を修正 -* デフォルトでHTLを表示するように - -11.1.0 (2019/04/15) -------------------- -### Improvements -* アイコン未設定時にランダムな画像を表示するように -* 管理者やモデレーターはレートリミット無効に - -### Fixes -* メンションの「あなた」インジケーターが表示されない問題を修正 -* ブロックAPIでエラーが発生する問題を修正 -* プッシュ通知の購読に失敗する問題を修正 - -11.0.3 (2019/04/15) -------------------- -### Fixes -* ハッシュタグ検索APIが動作しない問題を修正 -* モデレーターなのにアカウントメニューに「管理」が表示されない問題を修正 -* プッシュ通知の購読に失敗する問題を修正 -* ユーザー取得APIでユーザーを指定しない場合エラーになる問題を修正 - -11.0.2 (2019/04/15) -------------------- -### Fixes -* アプリが作成できない問題を修正 -* 「ハイライト」が表示されない問題を修正 -* リモートの投稿に添付されている画像が小さい問題を修正 -* モバイル版でリストの名前が表示されない問題を修正 -* APIドキュメントにパーミッション一覧を追加 - -11.0.1 (2019/04/15) -------------------- -### Improvements -* 不要な依存関係を削除 - -11.0.0 daybreak (2019/04/14) ----------------------------- -### Improvements -* **データベースがMongoDBからPostgreSQLに変更されました** -* **Redisが必須に** -* アカウントを完全に削除できるように -* 投稿フォームで添付ファイルの閲覧注意を確認/設定できるように -* ミュート/ブロック時にそのユーザーの投稿のウォッチをすべて解除するように - -### Fixes -* フォロー申請数が実際より1すくなくなる問題を修正 -* リストからアカウント削除したユーザーを削除できない問題を修正 -* リストTLでフォローしていないユーザーの非公開投稿が流れる問題を修正 -* リストTLでダイレクト投稿が流れない問題を修正 -* ミュートしているユーザーの投稿がタイムラインに流れてくることがある問題を修正 - -### APIの破壊的変更 -* v10時点で deprecated だったパラメータなどを削除 -* ユーザーリストの title が name に -* リバーシの対局の`settings`プロパティがなくなり、その中にあったプロパティがすべて上の階層に - * 例えば`game.settings.map`は`game.map`になる - -### 既知の問題 -* ユーザー認証無しでのアプリが作成できない - * 依存ライブラリの問題と思わるため、対応が難しい - -### Migration -coming soon... - 10.100.0 ---------- * ユーザーリストでフォローボタンを表示するように diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index edc6244d3..179cf5304 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,11 +3,17 @@ ## Issues Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues . -Before creating a new issue, please search existing issues to avoid duplication. -If you find the existing issue, please add your reaction or comment to the issue. + +* Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one. +* If you have multiple independent issues, please submit them separately. + ## Localization (l10n) -Please use [Crowdin](https://crowdin.com/project/misskey) for localization. +Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management. +You can improve our translations with your Crowdin account. +Changes you make in Crowdin will be merged into develop branch. + +If you can't find the language you want to contribute with, please open an issue. ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg) @@ -15,16 +21,16 @@ Please use [Crowdin](https://crowdin.com/project/misskey) for localization. Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n). ## Documentation -* Documents for contributors are located in `/docs`. -* Documents for instance admins are located in `/docs`. -* Documents for end users are located in `src/docs`. +* Documents for contributors are located in [`/docs`](/docs). +* Documents for instance admins are located in [`/docs`](/docs). +* Documents for end users are located in [`/src/docs`](/src/docs). ## Test -* Test codes are located in `/test`. +* Test codes are located in [`/test`](/test). ## Continuous integration Misskey uses CircleCI for automated test. -Configuration files are located in `/.circleci`. +Configuration files are located in [`/.circleci`](/.circleci). ## Glossary ### AP @@ -128,6 +134,20 @@ query.andWhere(new Brackets(qb => { })); ``` +### Not `null` in TypeORM +```ts +const foo = await Foos.findOne({ + bar: Not(null) +}); +``` +のようなクエリ(`bar`が`null`ではない)は期待通りに動作しない。 +次のようにします: +```ts +const foo = await Foos.findOne({ + bar: Not(IsNull()) +}); +``` + ### `null` in SQL SQLを発行する際、パラメータが`null`になる可能性のある場合はSQL文を出し分けなければならない 例えば @@ -197,3 +217,13 @@ const user = await Users.findOne(userId).then(ensure); // } // の糖衣構文のような扱いです ``` + +### Migration作成方法 +コードの変更をした後、`ormconfig.json`（`npm run ormconfig`で生成）を用意し、 + +``` +npm i -g ts-node +ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前 +``` + +作成されたスクリプトは不必要な変更を含むため除去してください。 diff --git a/Dockerfile b/Dockerfile index 8a6150876..940a22d0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,4 +39,4 @@ COPY --from=builder /misskey/node_modules ./node_modules COPY --from=builder /misskey/built ./built COPY . ./ -CMD ["npm", "start"] +CMD ["npm", "run", "migrateandstart"] diff --git a/README.md b/README.md index b0ef6950a..8d7ca4b54 100644 --- a/README.md +++ b/README.md @@ -106,20 +106,23 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). Hiroshi Seki weepjp kiritan +Denshi +mkatze ne_moni Melilot osapon -見当かなみ Hiroshi Seki weepjp kiritan +Denshi +mkatze ne_moni Melilot osapon -見当かなみ + @@ -130,6 +133,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). + @@ -147,9 +151,10 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). + - + @@ -157,21 +162,24 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). + - +
見当かなみ YuzuRyo61 gutfuckllc mydarkstarSampot sheeta.s
見当かなみ YuzuRyo61 gutfuckllc mydarkstarAtsuko Tominaga natalie Hiratakenoellabo CG HekovicdansupNaoki Hirayama
Satsuki Yanagi takimuraAtsuko Tominaga natalie Hiratakenoellabo CG HekovicdansupNaoki Hirayama
+ +
dansup Gargron Nokotaro Takeda Takashi Shibuya
dansup Gargron Nokotaro Takeda Takashi Shibuya
-**Last updated:** Tue, 07 May 2019 11:55:07 UTC +**Last updated:** Tue, 04 Jun 2019 04:21:06 UTC :four_leaf_clover: Copyright diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index c722eabb7..5fb689e7b 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -249,9 +249,9 @@ common: update-available-title: "Aktualizace k dispozici" update-available: "Je k dispozici nová verze Misskey ({newer},vaše verze je {current}). Pro aplikování nové verze znovunačtěte stránku." my-token-regenerated: "Váš token byl regenerován, proto budete odhlášen/a." - verified-user: "Ověřené účty" hide-password: "Skrýt heslo" show-password: "Zobrazit heslo" + enter-username: "Zadejte uživatelské jméno" do-not-use-in-production: "Tohle je vývojářský build. Nepoužívejte v produkci." user-suspended: "Tomuto uživateli byl pozastaven účet." is-remote-user: "Informace o tomto uživateli nemusí být kompletní." @@ -312,7 +312,6 @@ auth/views/index.vue: error: "Taková relace neexistuje." sign-in: "Prosím přihlaste se." common/views/pages/explore.vue: - verified-users: "Ověřené účty" popular-users: "Populární uživatelé" recently-updated-users: "Nedávno aktívni uživatelé" recently-registered-users: "Nedávno registrovaní uživatelé" @@ -416,14 +415,12 @@ common/views/components/messaging.vue: search-user: "Najít uživatele" you: "Vy" no-history: "Žádná historie" + user: "Uživatel" common/views/components/messaging-room.vue: - empty: "Žádné zprávy" new-message: "Máte novou zprávu" - only-one-file-attached: "Jenom JEDEN soubor může být přiložen ke zprávě." common/views/components/messaging-room.form.vue: send: "Odeslat" attach-from-local: "Přiložit soubory z Vašeho zařízení" - only-one-file-attached: "Jenom JEDEN soubor může být přiložen ke zprávě." common/views/components/messaging-room.message.vue: is-read: "Přečtené" deleted: "Tato zpráva byla odstraněna" @@ -619,8 +616,15 @@ common/views/components/user-list-editor.vue: remove-user: "Odebrat z tohoto seznamu" delete-are-you-sure: "Smazat seznam \"$1\"?" deleted: "Smazáno" + add-user: "Přidat uživatele" +common/views/components/user-group-editor.vue: + deleted: "Smazáno" + invite: "Pozvat" common/views/components/user-lists.vue: + user-lists: "Seznamy" list-name: "Název seznamu" +common/views/components/user-groups.vue: + invites: "Pozvat" common/views/widgets/broadcast.vue: fetching: "Načítám" next: "Další" @@ -855,11 +859,6 @@ desktop/views/components/ui.header.post.vue: post: "Nový příspěvek" desktop/views/components/ui.header.search.vue: placeholder: "Vyhledávání" -desktop/views/components/received-follow-requests-window.vue: - accept: "Přijmout" - reject: "Odmítnout" -desktop/views/components/user-lists-window.vue: - title: "Seznamy uživatelů" desktop/views/components/user-preview.vue: notes: "Příspěvky" desktop/views/components/users-list.vue: @@ -875,7 +874,6 @@ admin/views/index.vue: users: "Uživatelé" federation: "Z fedivesmíru" announcements: "Oznámení" - hashtags: "Hashtagy" queue: "Fronta úloh" logs: "Logy" back-to-misskey: "Zpět na Misskey" @@ -900,12 +898,12 @@ admin/views/instance.vue: maintainer-config: "Informace o administrátorovi" maintainer-name: "Jméno administrátora" maintainer-email: "Kontakt na administrátora" + object-storage-endpoint: "Endpoint" mb: "V megabajtech" recaptcha-config: "nastavení služby reCAPTCHA" recaptcha-info: "reCAPTCHA token je povinný. Můžete jej získat na https://www.google.com/recaptcha/intro/" enable-recaptcha: "povolit reCAPTCHA" - recaptcha-site-key: "reCAPTCHA klíč stránky (site key)" - recaptcha-secret-key: "reCAPTCHA tajný klíč" + recaptcha-preview: "Náhled" twitter-integration-config: "Nastavení spojení s Twitterem" twitter-integration-info: "The callback URL is set on {url}." enable-twitter-integration: "Povolit připojení k Twitteru" @@ -924,7 +922,6 @@ admin/views/instance.vue: invite: "Pozvat" save: "Uložit" saved: "Uloženo" - user-recommendation-config: "Doporučení uživatelé" email: "Emailová adresa" smtp-port: "SMTP Port" smtp-auth: "Provést SMTP autentikaci" @@ -976,12 +973,6 @@ admin/views/users.vue: reset-password: "Resetovat heslo" reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?" password-updated: "Heslo je nyní \"{password}\"" - verify: "Ověřit účet" - verify-confirm: "Chcete aby toto byl ověřený účet?" - verified: "Účet se nyní ověřuje" - unverify: "Zrušit ověření účtu" - unverify-confirm: "Opravdu chcete zrušit designaci \"ověřený účet\"?" - unverified: "Ruší se potvrzení účtu" update-remote-user: "Aktualizovat informace o vzdáleném účtu" users: title: "Uživatel" @@ -989,7 +980,6 @@ admin/views/users.vue: all: "Všechny" moderator: "Moderátor" adminOrModerator: "Admin/Moderátor" - verified: "Ověřený účet" origin: title: "Původ" combined: "Lokální + Vzdálené" @@ -1054,6 +1044,7 @@ admin/views/federation.vue: chart-spans: hour: "za hodinu" day: "za den" + blocked-hosts: "Blokován" desktop/views/pages/welcome.vue: about: "O Misskey" timeline: "Časová osa" @@ -1168,8 +1159,6 @@ mobile/views/pages/drive.vue: contextmenu: upload: "Nahrát soubor" create-folder: "Vytvořit složku" -mobile/views/pages/user-lists.vue: - title: "Seznamy" mobile/views/pages/signup.vue: lets-start: "Váš účet je připraven! 📦" mobile/views/pages/home.vue: @@ -1186,9 +1175,6 @@ mobile/views/pages/widgets/activity.vue: activity: "Aktivita" mobile/views/pages/share.vue: share-with: "Sdílet na {name}" -mobile/views/pages/received-follow-requests.vue: - accept: "Přijmout" - reject: "Odmítnout" mobile/views/pages/note.vue: prev: "Předchozí příspěvěk" next: "Následující příspěvek" @@ -1221,6 +1207,7 @@ deck/deck.user-column.vue: dev/views/new-app.vue: app-name-desc: "Jméno vaší aplikace" pages: + like: "Lajk" title: "Titulek" blocks: post: "Formulář pro psaní" diff --git a/locales/da-DK.yml b/locales/da-DK.yml new file mode 100644 index 000000000..0a9f29969 --- /dev/null +++ b/locales/da-DK.yml @@ -0,0 +1,1896 @@ +--- +meta: + lang: "Dansk" +common: + misskey: "En ⭐ i fediverset" + about-title: "En ⭐ i fediverset." + about: "Tak, fordi du fandt Misskey. Misskey er en decentral mikroblog platform født på Jorden. Den findes i Fediverset (et univers med forskellige sociale medieplatforme). Den er tæt integreret med andre sociale medier platforme. Hvorfor ikke tage en pause fra trængsel og travlhed i storbyen og hoppe ind i en ny type internet?" + intro: + title: "Hvad er Misskey?" + about: "Misskey er en open-source, decentraliseret microblogging platform. Den har en sofistikeret brugerflade, som kan tilpasses fuldstændigt. Den giver mulighed for at udtrykke mange forskellige reaktioner på poster. Desuden tilbyder den gratis opbevaring af filer med et integreret håndteringssystem samt andre avancerede funktioner. Oven i dette er Misskey tilknyttet et netværk ved navn “Fediverse”, som gør os i stand til at kommunikere med brugere på andre SNS'er. For eksempel vil en post, som du har skrevet, ikke kun blive sendt til brugere af Misskey men også til brugere af Mastodon og Pleroma. Det svarer lidt til at sende radio transmissioner mellem planeter for at etablere en kommunikation." + features: "Funktioner" + rich-contents: "Post" + rich-contents-desc: "Bare skriv løs om dine ideer, aktuelle emner eller alt muligt andet, som du gerne vil dele med andre. Det kan være, at du gerne vil udsmykke dine ord, vedhæfte dine yndlingsbilleder, sende filer, tilføje videoer eller oprette en afstemning. Alle de nævnte ting er muligt med Misskey!" + reaction: "Reaktioner" + reaction-desc: "Den nemmeste måde at udtrykke dine reaktioner på. Misskey giver mulighed for at tilføje forskellige reaktioner på andres poster. Reaktionerne vil aldrig blive vist på andre SNS'er, som kun er i stand til at udveksle \"likes\"." + ui: "Brugerflade" + ui-desc: "En enkelt brugerflade vil aldrig passe helt for alle. Derfor er Misskey's brugerflade gennemført justerbar, så den kan ramme dine ønsker helt præcist. Du kan designe dit helt eget personlige udtryk ved at rette layoutet af din tidslinje og tilpasse udvalgte widgets, som desuden kan flyttes frit rundt." + drive: "Drev" + drive-desc: "Vil du poste et billede, som du tidligere har uploadet? Har du brug for at navngive filer og organisere dem i mapper, som du selv har navngivet? Så er Misskey Drev den bedste løsning for dig. Den gør det så let som ingenting at dele dine filer online." + outro: "Tjek Misskey's unikke funktioner ved at se dem med dine egne øjne. Hvis du kommer frem til, at den ene server ikke er noget for dig, så kan du prøve en anden. Misskey er et decentraliseret SNS, så du kan lettere finde frem til brugere, som du klikker med. God fornøjelse!" + adblock: + detected: "Her kan du deaktivere ad blocker." + warning: "Visse funktioner kan forsvinde eller medføre forstyrrelser, hvis ad blocking er aktiveret. Misskey kører ikke annoncer." + application-authorization: "Adgangsstyring" + close: "Luk" + do-not-copy-paste: "Undgå venligst at skrive eller klistre kode ind her. I modsat fald kan din konto blive kompromitteret." + load-more: "Læs mere" + enter-password: "Skriv din adgangskode" + 2fa: "To-faktor adgangsstyring" + customize-home: "Tilpas dit layout" + featured-notes: "Fremhævede poster" + dark-mode: "Nat design" + signin: "Log ind" + signup: "Bliv bruger" + signout: "Log ud" + reload-to-apply-the-setting: "Denne indstilling slår først igennem, når du har genindlæst siden. Vil du genindlæse siden nu?" + fetching-as-ap-object: "Tilladelse til sammenkobling" + got-it: "Det er OK" + customization-tips: + title: "Tips om tilpasning" + paragraph: "

Tilpasning giver mulighed for at tilføje, slette og flytte rundt på widgets med træk-og-slip.

Du kan ændre visningen af visse widgets ved at højre-klikke på dem.

En widget slettes ved at trække den med musen hen til skaldespanden i toppen af siden.

Du afslutter tilpasningen ved at klikke på \"Færdig\" øverst til højre.

" + gotit: "Det er OK" + notification: + file-uploaded: "Filen er overført!" + message-from: "Besked fra {}:" + reversi-invited: "Invitation til spil" + reversi-invited-by: "Inviteret af {}:" + notified-by: "Besked fra {}:" + reply-from: "Svar fra {}:" + quoted-by: "Citeret af {}:" + time: + unknown: "ukendt" + future: "fremtidig" + just_now: "nu" + seconds_ago: "{} sekund(er) siden" + minutes_ago: "{} minut(ter) siden" + hours_ago: "{} time(r) siden" + days_ago: "{} dag(e) siden" + weeks_ago: "{} uge(r) siden" + months_ago: "{} måned(er) siden" + years_ago: "{} år siden" + month-and-day: "{day}-{month}" + trash: "Skraldespand" + drive: "Drev" + pages: "Sider" + messaging: "Konversationer" + home: "Startside" + deck: "Stabel" + timeline: "Tidslinje" + explore: "Udforsk" + following: "Følger" + followers: "Følgere" + favorites: "Favoritter" + permissions: + "read:account": "Se konto indstillinger" + "write:account": "Opdater dine konto informationer" + "read:blocks": "Vis blokke" + "write:blocks": "Rediger blokke" + "read:drive": "Gennemse drevet" + "write:drive": "Rediger drevet" + "read:favorites": "Mine favoritter" + "write:favorites": "Rediger favoritterne" + "read:following": "Vis info om følgere" + "write:following": "Rediger info om følgere" + "read:messaging": "Se meddelelser" + "write:messaging": "Rediger meddelelser" + "read:mutes": "Se annullerede poster" + "write:mutes": "Rediger annullerede poster" + "write:notes": "Opret og slet poster" + "read:notifications": "Vis notifikationer" + "write:notifications": "Rediger notifikationer" + "read:reactions": "Vis reaktioner" + "write:reactions": "Rediger reaktioner" + "write:votes": "Stem" + empty-timeline-info: + follow-users-to-make-your-timeline: "Følgende brugere vil få vist deres poster på tidslinjen." + explore: "Find brugere" + weekday-short: + sunday: "Søn" + monday: "Man" + tuesday: "Tirs" + wednesday: "Ons" + thursday: "Tors" + friday: "Fre" + saturday: "Lør" + weekday: + sunday: "Søndag" + monday: "Mandag" + tuesday: "Tirsdag" + wednesday: "Onsdag" + thursday: "Torsdag" + friday: "Fredag" + saturday: "Lørdag" + reactions: + like: "Synes om" + love: "Elsker" + laugh: "Ler" + hmm: "Hmm...?" + surprise: "Wauw" + congrats: "Tillykke" + angry: "Vred" + confused: "Forvirret" + rip: "Hvil i fred" + pudding: "Budding" + note-visibility: + public: "Offentlig" + home: "Startside" + home-desc: "Post udelukkende til tidslinjen" + followers: "Følgere" + followers-desc: "Skriv kun til dine følgere" + specified: "Direkte" + specified-desc: "Skriv kun til udvalgte brugere" + local-public: "Offentlig (på den lokale server)" + local-home: "Startside (på den lokale server)" + local-followers: "Følgere (på den lokale server)" + note-placeholders: + a: "Hvad laver du?" + b: "Hvad sker der?" + c: "Hvad har du i tankerne?" + d: "Hvad vil du gerne sige?" + e: "Skriv her" + f: "Venter på din indtastning." + settings: "Indstillinger" + _settings: + profile: "Profil" + notification: "Notifikation" + apps: "Apps" + tags: "Hashtag" + mute-and-block: "Sluk / Blokér" + blocking: "Blokér" + security: "Sikkerhed" + signin: "Login historik" + password: "Adgangskode" + other: "Andet" + appearance: "Udseende" + behavior: "Opførsel" + fetch-on-scroll: "Uendeligt scroll" + fetch-on-scroll-desc: "Når du scroller ned ad siden, hentes der automatisk nyt indhold ind" + note-visibility: "Post synlighed" + default-note-visibility: "Standard synlighed" + remember-note-visibility: "Husk post synlighed" + web-search-engine: "Søgemaskine" + web-search-engine-desc: "Eksempel: https://www.google.com/?#q={{query}}" + keep-cw: "Bevar indholdsvarsel" + keep-cw-desc: "Det indholdsvarsel, som står på det oprindelige indlæg, vil som standard blive overført til eventuelle svar på indlægget." + i-like-sushi: "Jeg foretrækker sushi frem for budding" + show-reversi-board-labels: "Vis række- og kolonne-etiketter i Reversi" + use-avatar-reversi-stones: "Anvend avatar som en sten i Reversi" + disable-animated-mfm: "Deaktiver animeret tekst i en post" + disable-showing-animated-images: "Afspil ikke animerede billeder" + suggest-recent-hashtags: "Vis de seneste populære hashtags på post formularen" + always-show-nsfw: "Vis altid indhold, der er markeret som Upassende På Jobbet" + always-mark-nsfw: "Marker altid poster med medie bilag som Upassende På Jobbet" + show-full-acct: "Vis aldrig værtsnavnet på brugernavnet" + show-via: "vis via" + reduce-motion: "Reducer bevægelser" + this-setting-is-this-device-only: "Indstillingen gælder kun for denne enhed" + use-os-default-emojis: "Anvend standard emojis fra operativsystemet" + line-width: "Linjebredde" + line-width-thin: "Tynd linje" + line-width-normal: "Normal" + line-width-thick: "Tyk linje" + font-size: "Tekst størrelse" + font-size-x-small: "Meget lille" + font-size-small: "Lille" + font-size-medium: "Normal" + font-size-large: "Stor" + font-size-x-large: "Meget stor" + deck-column-align: "Justering af kolonner" + deck-column-align-center: "Midten" + deck-column-align-left: "Venstre" + deck-column-align-flexible: "Højre" + deck-column-width: "Kolonne bredde" + deck-column-width-narrow: "Smal" + deck-column-width-narrower: "Smallere" + deck-column-width-normal: "Normal" + deck-column-width-wider: "Lidt bredere" + deck-column-width-wide: "Bred" + use-shadow: "Vis skygger" + rounded-corners: "Vis afrundede hjørner" + circle-icons: "Anvend cykliske ikoner" + contrasted-acct: "Tilføj kontrast til brugerkontoen" + wallpaper: "Baggrundsbillede" + choose-wallpaper: "Vælg en baggrund" + delete-wallpaper: "Fjern baggrund" + post-form-on-timeline: "Vis post formularen oven over tidslinjen" + show-clock-on-header: "Vis uret i øverste højre hjørne" + show-reply-target: "Vis hvad der svares på" + timeline: "Tidslinje" + show-my-renotes: "Vis mine gen-posteringer på tidslinjen" + show-renoted-my-notes: "Vis gen-posteringer af dine egne poster på tidslinjen" + show-local-renotes: "Vis gen-posteringer af lokale poster på tidslinjen" + remain-deleted-note: "Fortsæt med at vise slettede poster" + sound: "Lyd" + enable-sounds: "Aktiver lyd" + enable-sounds-desc: "Afspil en lyd, når du modtager en post/besked. Denne indstilling gemmes i browseren." + volume: "Volumen" + test: "Test" + update: "Misskey opdatering" + version: "Aktuel version:" + latest-version: "Seneste version:" + update-checking: "Kikker efter opdateringer" + do-update: "Kikker efter opdateringer" + update-settings: "Avancerede indstillinger" + no-updates: "Der er ikke kommet nogen opdateringer" + no-updates-desc: "Din Misskey er opdateret" + update-available: "Der er kommet en ny version" + update-available-desc: "Opdateringer vil slå igennem efter genindlæsning af siden." + advanced-settings: "Avancerede indstillinger" + debug-mode: "Aktiver debug" + debug-mode-desc: "Denne indstilling er gemt i browseren" + navbar-position: "Placering af navigationsbaren" + navbar-position-top: "Top" + navbar-position-left: "Venstre" + navbar-position-right: "Højre" + i-am-under-limited-internet: "Mit internet kører med lav hastighed" + post-style: "Stil for visning af poster" + post-style-standard: "Standard" + post-style-smart: "Smart" + notification-position: "Vis notifikationer" + notification-position-bottom: "Bund" + notification-position-top: "Top" + disable-via-mobile: "Marker aldrig posten som \"fra mobil\"" + load-raw-images: "Vis vedhæftede bilag i original kvalitet" + load-remote-media: "Vis medie-materiale fra en ekstern server" + search: "Søg" + delete: "Slet" + loading: "Henter" + ok: "Bekræft" + cancel: "Afbryd" + update-available-title: "Opdatering tilgængelig" + update-available: "En ny version af Misskey er nu tilgængelig ({newer}, den aktuelle version er {current}). Genindlæs siden for at få opdateringerne til at slå igennem." + my-token-regenerated: "Din nøgle er blevet genopbygget, så du bliver logget ud." + hide-password: "Skjul adgangskoden" + show-password: "Vis adgangskoden" + enter-username: "Indtast brugernavn" + do-not-use-in-production: "Dette er en instans til udvikling. Bør ikke benyttes til produktion." + user-suspended: "Denne bruger er blevet udelukket." + is-remote-user: "Oplysningerne om denne bruger er muligvis ikke fyldestgørende" + is-remote-post: "Indholdet af denne post er spejlet fra andetsteds" + view-on-remote: "Se den fulde version eksternt" + renoted-by: "Gen-posteret af {user}" + no-notes: "Uden poster" + turn-on-darkmode: "Skift til mørk baggrund" + turn-off-darkmode: "Lys baggrund" + error: + title: "Noget gik galt :(" + retry: "Prøv igen" + reversi: + drawn: "Tegn" + my-turn: "Din tur" + opponent-turn: "Modstanderens tur" + turn-of: "{name}s tur" + past-turn-of: "{name}s tur forinden" + won: "{name} vandt" + black: "Sort" + white: "Hvid" + total: "I alt" + this-turn: "Runde {count}" + widgets: + analog-clock: "Analogt ur" + profile: "Profil" + calendar: "Kalender" + timemachine: "Kalender (tidsmaskine)" + activity: "Aktivitet" + rss: "RSS læser" + memo: "Selvklæbende noter" + trends: "Tendenser" + photo-stream: "Billedkavalkade" + posts-monitor: "Graf over poster" + slideshow: "Billedkarrusel" + version: "Version" + broadcast: "Offentliggør" + notifications: "Notifikation" + users: "Anbefalede brugere" + polls: "Afstemninger" + post-form: "Post formular" + server: "Server info" + nav: "Navigation" + tips: "Tips og tricks" + hashtags: "Hashtags" + queue: "Kø" + dev: "Fejl under oprettelse af app. Prøv igen." + ai-chan-kawaii: "Ai Chan Kawaii!" + you: "Du" +auth/views/form.vue: + share-access: "Vil du tillade, at {name} får adgang til din konto?" + permission-ask: "Denne app kræver følgende tilladelser:" + cancel: "Annuller" + accept: "Åbn for adgang." +auth/views/index.vue: + loading: "Henter" + denied: "Adgang til app er blevet afvist." + denied-paragraph: "Denne app vil ikke give adgang for din konto." + already-authorized: "Der er allerede adgang til denne app." + allowed: "Der er adgang til app." + callback-url: "Hopper tilbage til app." + please-go-back: "Hop tilbage til app." + error: "Sessionen eksisterer ikke." + sign-in: "Log ind." +common/views/pages/explore.vue: + pinned-users: "Fremhævede brugere" + popular-users: "Populære brugere" + recently-updated-users: "Senest aktive brugere" + recently-registered-users: "Brugere som er kommet til for nyligt" + popular-tags: "Populære tags" + federated: "Fra Fediverset" + explore: "Udforsk {host}" + users-info: "Lige nu er {users} brugere registreret her" +common/views/components/url-preview.vue: + enable-player: "Aktiver afspilning" + disable-player: "Stop afspilning" +common/views/components/user-list.vue: + no-users: "Der er ingen brugere" +common/views/components/games/reversi/reversi.vue: + matching: + waiting-for: "Venter på {}" + cancel: "Annuller" +common/views/components/games/reversi/reversi.game.vue: + surrender: "Giv op" + surrendered: "Af taberen" + is-llotheo: "Den med færrest vinder (Llotheo)" + looped-map: "Vendebrikker" + can-put-everywhere: "Kan placeres hvorsomhelst" +common/views/components/games/reversi/reversi.index.vue: + title: "Misskey Reversi" + sub-title: "Spil Reversi med dine venner!" + invite: "Inviter" + rule: "Spilleregler" + rule-desc: "Reversi er et strategi spil for to deltagere, og det spilles på et bræt med 8 gange 8 felter. På felterne skal placeres 64 ens brikker, som er sorte på den ene side og hvide på den anden. Deltagerne vælger hver sin farve og placerer på skift en brik med deres egen farve opad. Det gælder om at placere brikker med sin egen farve i hver sin ende af en stribe brikker med modstanderens farve, for det giver ret til at vende de mellemliggende brikker rundt, så de får ens egen farve. Vinderen er den, som til sidst har erobret flest felter på brættet." + mode-invite: "Inviter" + mode-invite-desc: "Spil med en udvalgt bruger" + invitations: "Du har fået en invitation!" + my-games: "Mine spil" + all-games: "Alle spil" + enter-username: "Angiv brugernavn" + game-state: + ended: "Slut" + playing: "I gang" +common/views/components/games/reversi/reversi.room.vue: + settings-of-the-game: "Spilleindstillinger" + choose-map: "Vælg en brikfarve" + random: "Tilfældig" + black-or-white: "Sort/hvid" + black-is: "Sort er {}" + rules: "Regler" + is-llotheo: "Den med færrest vinder (Llotheo)" + looped-map: "Vendebrikker" + can-put-everywhere: "Kan placeres hvorsomhelst" + settings-of-the-bot: "Bot indstillinger" + this-game-is-started-soon: "Spillet begynder lige om lidt" + waiting-for-other: "Venter på modstanderen" + waiting-for-me: "Venter på, at du bliver klar" + waiting-for-both: "Venter på, at spillerne er klar" + cancel: "Annuller" + ready: "Klar" + cancel-ready: "Fortryd din klar-melding" +common/views/components/connect-failed.vue: + title: "Ingen kontakt med serveren" + description: "Der er et problem med din internet forbindelse, eller så er serveren nede eller under vedligeholdelse. Tag og {try again} senere." + thanks: "Tak, fordi du bruger Misskey." + troubleshoot: "Fejlfinding" +common/views/components/connect-failed.troubleshooter.vue: + title: "Fejlfinding" + network: "Netværksforbindelse" + checking-network: "Tjekker netværksforbindelsen" + internet: "Internetforbindelse" + checking-internet: "Tjekker internetforbindelse" + server: "Forbindelse til server" + checking-server: "Tjekker forbindelsen til server" + finding: "Prøver at finde problemet" + no-network: "Ingen forbindelse" + no-network-desc: "Tjek en ekstra gang, om du har netværksforbindelse." + no-internet: "Det er ingen internetforbindelse" + no-internet-desc: "Tjek en ekstra gang, at du har forbindelse til internettet" + no-server: "Ude af stand til at skabe forbindelse til Misskey serveren" + no-server-desc: "Netværksforbindelsen på din enhed er normal, men du kunne ikke koble dig på Misskey serveren. Årsagen kan være, at serveren er nede, eller at den er under vedligeholdelse. Prøv igen senere." + success: "Du er nu blevet koblet til Misskey serveren" + success-desc: "Det ser ud til, at der er forbindelse. Genindlæs siden." + flush: "Ryd cachen" + set-version: "Angiv version" +common/views/components/media-banner.vue: + sensitive: "Upassende På Jobbet" + click-to-show: "Klik for at se" +common/views/components/theme.vue: + theme: "Tema" + light-theme: "Tema i tilknytning til lys baggrund" + dark-theme: "Tema i tilknytning til mørk baggrund" + light-themes: "Lyst tema" + dark-themes: "Mørkt tema" + install-a-theme: "Installer et tema" + theme-code: "Tema kode" + install: "Installer" + installed: "\"{}\" er blevet installeret" + create-a-theme: "Opret et tema" + save-created-theme: "Gem tema" + primary-color: "Primær farve" + secondary-color: "Sekundær farve" + text-color: "Tekst farve" + base-theme: "Grundtema" + base-theme-light: "Lyst" + base-theme-dark: "Mørkt" + find-more-theme: "Find flere temaer" + theme-name: "Tema navn" + preview-created-theme: "Før-visning" + invalid-theme: "Temaet er ikke gyldigt" + already-installed: "Teamet er allerede installeret" + saved: "Gemt" + manage-themes: "Administrer temaer" + builtin-themes: "Standard temaer" + my-themes: "Mine temaer" + installed-themes: "Installerede temaer" + select-theme: "Vælg dit tema" + uninstall: "Afinstaller" + uninstalled: "\"{}\" er blevet afinstalleret" + author: "Skribent" + desc: "Beskrivelse" + export: "Eksport" + import: "Import" + import-by-code: "eller indsæt kode" + theme-name-required: "Temaet skal have et navn" +common/views/components/cw-button.vue: + hide: "Skjul" + show: "Se mere" + chars: "{count} tegn" + files: "{count} filer" + poll: "Afstemninger" +common/views/components/messaging.vue: + search-user: "Find en bruger" + you: "Du" + no-history: "Uden historik" + user: "Bruger" + group: "Gruppe" + start-with-user: "Start chat med bruger" + start-with-group: "Start chat med gruppe" + select-group: "Vælg gruppe" +common/views/components/messaging-room.vue: + not-talked-user: "Ingen bruger sessionshistorik" + not-talked-group: "Intet gruppesessions dokument" + no-history: "Der er ingen yderligere historik" + new-message: "Ny besked" + only-one-file-attached: "Kan kun indeholde én vedhæftning" +common/views/components/messaging-room.form.vue: + input-message-here: "Skriv meddelelsen her" + send: "Send" + attach-from-local: "Vedhæft filen fra din enhed" + attach-from-drive: "Vedhæft filen fra dit drev" + only-one-file-attached: "Kan kun indeholde én vedhæftning" +common/views/components/messaging-room.message.vue: + is-read: "Læst" + deleted: "Denne meddelelse er slettet" +common/views/components/nav.vue: + about: "Om" + stats: "Statistik" + status: "Status" + wiki: "Wiki" + donors: "Donatorer" + repository: "Systemets kode-repo" + develop: "Udviklere" + feedback: "Tilbagemeldinger" + tos: "Brugerbetingelser" +common/views/components/note-menu.vue: + mention: "Omtale" + detail: "Detaljer" + copy-content: "Kopier indholdet" + copy-link: "Kopier link" + favorite: "Marker denne post som favorit" + unfavorite: "Fjern favorit-markering" + watch: "Hold øje med" + unwatch: "Hold ikke længere øje med" + pin: "Tilknyt til din profil" + unpin: "Fjern tilknytning til din profil" + delete: "Slet" + delete-confirm: "Er du helt sikker på, at du vil slette denne post?" + remote: "Vis den oprindelige post" +common/views/components/user-menu.vue: + mention: "Omtale" + mute: "Annuller" + unmute: "Ophæv annullering" + mute-confirm: "Er du sikker på, at du vil annullere denne bruger?" + unmute-confirm: "Er du sikker på, at du vil fjerne annulleringen af denne bruger?" + block: "Bloker" + unblock: "Fjern blokering" + block-confirm: "Er du sikker på, at du vil blokere denne bruger?" + unblock-confirm: "Er du sikker på, at du vil fjerne blokeringen af denne bruger?" + push-to-list: "Tilføj til liste" + select-list: "Vælg liste" + report-abuse: "Meld misbrug" + report-abuse-detail: "Hvilken form for misbrug har du været ude for?" + report-abuse-reported: "Denne hændelse er nu videresendt til administratoren. Mange tak for hjælpen." + silence: "Gør tavs" + unsilence: "Fortryd at du har gjort tavs" + silence-confirm: "Er du sikker på, at du vil gøre denne bruger tavs?" + unsilence-confirm: "Er du sikker på, at du har fortrudt, at du har gjort denne bruger tavs?" + suspend: "Udeluk" + unsuspend: "Ophæv udelukkelse" + suspend-confirm: "Er du sikker på, at du vil udelukke denne bruger?" + unsuspend-confirm: "Er du sikker på, at du vil ophæve udelukkelsen af denne bruger?" +common/views/components/poll.vue: + vote-to: "Stem på '{}'" + vote-count: "{} stemmer" + total-votes: "{} stemmer i alt" + vote: "Stem" + show-result: "Vis resultatet" + voted: "Stemt" + closed: "Afsluttet" + remaining-days: "{d} dage og {h} timer tilbage" + remaining-hours: "{h} timer og {m} minutter tilbage" + remaining-minutes: "{m} minutter og {s} sekunder tilbage" + remaining-seconds: "{s} sekunder tilbage" +common/views/components/poll-editor.vue: + no-only-one-choice: "Der skal vælges mindst to muligheder" + choice-n: "Valgmulighed {}" + remove: "Slet valgmulighed" + add: "Tilføj valgmulighed" + destroy: "Drop afstemningen" + multiple: "Mere end et svar er tilladt" + expiration: "Udløber" + infinite: "Uendelig" + at: "Dato- og tidsvælger" + after: "Angivet tid" + no-more: "Du kan ikke tilføje flere svar" + deadline-date: "Slutdato" + deadline-time: "Varighed" + interval: "Varighed" + unit: "Enhed" + second: "Sekunder" + minute: "Minutter" + hour: "Time" + day: "Søn" +common/views/components/reaction-picker.vue: + choose-reaction: "Vælg reaktion" +common/views/components/emoji-picker.vue: + custom-emoji: "Brugerdefineret emoji" + people: "Personer" + animals-and-nature: "Dyr og natur" + food-and-drink: "Mad og drikke" + activity: "Aktivitet" + travel-and-places: "Rejser og steder" + objects: "Objekt" + symbols: "Symboler" + flags: "Flag" +common/views/components/signin.vue: + username: "Brugernavn" + password: "Adgangskode" + token: "Nøgle" + signing-in: "Log ind" + or: "Eller" + signin-with-twitter: "Log ind med Twitter" + signin-with-github: "Log ind med GitHub" + signin-with-discord: "Log ind med Discord" + login-failed: "Fejl ved log ind. Sørg for, at du har skrevet korrekt brugernavn og adgangskode." +common/views/components/signup.vue: + invitation-code: "Invitationskode" + invitation-info: "Kontakt en administrator, hvis du ikke har en invitationskode." + username: "Brugernavn" + checking: "Tjekker" + available: "Tilgængelig" + unavailable: "Ikke tilgængelig" + error: "Netværksfejl" + invalid-format: "bogstaver, tal og \"_\" er tilladt." + too-short: "Må ikke være tom!" + too-long: "Brug højst 20 tegn." + password: "Adgangskode" + password-placeholder: "Det anbefales at skrive mere end otte tegn" + weak-password: "Svag adgangskode" + normal-password: "Rimelig adgangskode" + strong-password: "Stærk adgangskode" + retype: "Skriv igen" + retype-placeholder: "Bekræft din adgangskode" + password-matched: "Godkendt" + password-not-matched: "Ikke godkendt" + recaptcha: "Verificering" + agree-to: "Enig {0}" + tos: "Brugerbetingelser" + create: "Opret en konto" + some-error: "Af en eller anden grund mislykkedes forsøget på at oprette en konto. Prøv igen." +common/views/components/special-message.vue: + new-year: "Godt nytår!" + christmas: "Glædelig jul!" +common/views/components/stream-indicator.vue: + connecting: "Tilslutter" + reconnecting: "Tilslutter igen" + connected: "Tilsluttet" +common/views/components/notification-settings.vue: + title: "Notifikationer" + mark-as-read-all-notifications: "Marker alle notifikationer som læste" + mark-as-read-all-unread-notes: "Marker alle poster som læste" + mark-as-read-all-talk-messages: "Marker alle samtaler som læste" + auto-watch: "Automatisk visning af poster" + auto-watch-desc: "Modtag automatisk notifikationer om poster, som du har reageret eller svaret på." +common/views/components/integration-settings.vue: + title: "Service samarbejde" + connect: "Tilslut" + disconnect: "Frakobl" + connected-to: "Du er tilsluttet næste konto" +common/views/components/github-setting.vue: + description: "Når du tilslutter din GitHub konto til din Misskey konto, bliver du i stand til at se info om din GitHub konto på din profil, og du vil få mulighed for at logge ind via GitHub." + connected-to: "Du er tilsluttet denne GitHub konto" + detail: "Flere detaljer" + reconnect: "Tilslut igen" + connect: "Tilslut til din GitHub konto" + disconnect: "Frakobl" +common/views/components/discord-setting.vue: + description: "Når du tilslutter din Discord konto til din Misskey konto, bliver du i stand til at se info om din Discord konto på din profil, og du vil få mulighed for at logge ind via Discord." + connected-to: "Du er tilsluttet denne Discord konto" + detail: "Detaljer..." + reconnect: "Tilslut igen" + connect: "Tilslut din Discord konto" + disconnect: "Frakobl" +common/views/components/uploader.vue: + waiting: "Venter" +common/views/components/visibility-chooser.vue: + public: "Offentlig" + home: "Startside" + home-desc: "Post kun til startsiden" + followers: "Følgere" + followers-desc: "Post kun til følgere" + specified: "Direkte" + specified-desc: "Post kun til udvalgte brugere" + local-public: "Offentlig (på den lokale server)" + local-public-desc: "Offentliggør ikke til eksterne" + local-home: "Startside (på den lokale server)" + local-followers: "Følgere (på den lokale server)" +common/views/components/trends.vue: + count: "{} brugere nævnt" + empty: "Ingen tendenser" +common/views/components/language-settings.vue: + title: "Vis sprog" + pick-language: "Vælg sprog" + recommended: "Anbefalet" + auto: "Automatisk" + specify-language: "Angiv sprog" + info: "Du er nødt til at genindlæse siden, før ændringerne slår igennem." +common/views/components/profile-editor.vue: + title: "Profil" + name: "Navn" + account: "Konto" + location: "Placering" + description: "Om mig" + you-can-include-hashtags: "Du må gerne bruge hashtags i din profil beskrivelse" + language: "Sprog" + birthday: "Fødselsdag" + avatar: "Ikon" + banner: "Banner" + is-cat: "Denne konto er en Kat" + is-bot: "Denne konto er en Bot" + is-locked: "Anmodning fra følgere kræver godkendelse" + careful-bot: "Følger anmodninger fra bots kræver godkendelse" + auto-accept-followed: "Accepter automatisk følgere af personer, som du selv følger" + advanced: "Avanceret" + privacy: "Privatliv" + save: "Gem" + saved: "Profil er opdateret med succes" + uploading: "Overfører" + upload-failed: "Fejl ved overførsel" + email: "Email indstillinger" + email-address: "Email adresse" + email-verified: "Din email er blevet bekræftet" + email-not-verified: "Email adresse er ikke bekræftet. Tjek indbakken i din mailboks." + export: "Eksport" + import: "Import" + export-and-import: "Eksport og import" + export-targets: + all-notes: "Alle poster" + following-list: "Liste over følgere" + mute-list: "Liste over annullerede konti" + blocking-list: "Liste over blokerede konti" + user-lists: "Lister" + export-requested: "Du har bedt om en eksport. Det kan tage et stykke tid. Når eksporten er gennemført, vil eksport-filen blive lagt på dit drev." + import-requested: "Du har sat en import i gang. Det kan tage et stykke tid." + enter-password: "Angiv din adgangskode" + danger-zone: "Risici" + delete-account: "Slet kontoen" + account-deleted: "Kontoen er slettet. Det kan vare lidt, inden alle data forsvinder." +common/views/components/user-list-editor.vue: + users: "Bruger" + rename: "Omdøb listen" + delete: "Slet liste" + remove-user: "Fjern fra denne liste" + delete-are-you-sure: "Slet liste \"$1\"?" + deleted: "Slettet med succes" + add-user: "Tilføj en bruger" +common/views/components/user-group-editor.vue: + users: "Brugere" + rename: "Omdøb gruppe" + delete: "Slet gruppe" + remove-user: "Fjern bruger fra denne gruppe" + delete-are-you-sure: "Er du sikker på, at du vil slette gruppen \"$ 1\"?" + deleted: "Slettet" + invite: "Inviter" + invited: "Inviterede" +common/views/components/user-lists.vue: + user-lists: "Lister" + create-list: "Opret en liste" + list-name: "Liste navn" +common/views/components/user-groups.vue: + user-groups: "Gruppe" + create-group: "Opret gruppe" + group-name: "Gruppenavn" + owned-groups: "Egne grupper" + joined-groups: "Tilsluttede grupper" + invites: "Inviter" + accept-invite: "Tag imod invitation" + reject-invite: "Afvis" +common/views/widgets/broadcast.vue: + fetching: "Tjekker" + no-broadcasts: "Ingen meddelelser" + have-a-nice-day: "Hav en god dag!" + next: "Næste" +common/views/widgets/calendar.vue: + year: "År {}" + month: "{}," + day: "{}" + today: "I dag:" + this-month: "Måned:" + this-year: "År:" +common/views/widgets/photo-stream.vue: + title: "Billedkavalkade" + no-photos: "Ingen billeder" +common/views/widgets/posts-monitor.vue: + title: "Graf over poster" + toggle: "Skift mellem visninger" +common/views/widgets/hashtags.vue: + title: "Hashtags" +common/views/widgets/server.vue: + title: "Server info" + toggle: "Skift mellem visninger" +common/views/widgets/memo.vue: + title: "Selvklæbende noter" + memo: "Skriv her!" + save: "Gem" +common/views/widgets/slideshow.vue: + folder-customize-mode: "For at kunne angive en mappe er du nødt til at gå ud af tilpasnings indstillingerne" + folder: "Klik og angiv en mappe" + no-image: "Der er ikke noget billede i denne mappe" +common/views/widgets/tips.vue: + tips-line1: "Du kan fokusere på tidslinjen med t" + tips-line2: "Åbn post formularen med p eller n." + tips-line3: "Du kan trække og slippe filer på post formularen" + tips-line4: "Du kan indsætte et billede fra klippebordet på afsendelses formularen" + tips-line5: "Du kan overføre filer ved at trække og slippe dem på dit drev" + tips-line6: "Du kan flytte en mappe ved at trække den inden for dit drev" + tips-line7: "Du kan flytte mapper ved at trække dem inden for dit drev" + tips-line8: "Startsidens layout kan tilpasses fra indstillingerne" + tips-line9: "Misskey er licenseret under AGPLv3." + tips-line10: "Widgeten med tidsmaskinen gør det let at \"spole\" tilbage til den tidligere tidslinje." + tips-line11: "Du kan sende poster til bruger siden ved at klikke på \"...\"" + tips-line13: "Alle filer tilknyttet en post gemmes på dit drev." + tips-line14: "Når du tilpasser layoutet på startsiden, kan du højreklikke på en widget for at ændre dens design." + tips-line17: "Du kan fremhæve en tekstbid ved at omgive den med ** **." + tips-line19: "Flere vinduer kan kobles af og vises uden for browseren." + tips-line20: "Procentdelen af kalender-widgeten viser procentdelen af den tid, der er gået." + tips-line21: "Du kan også bruge Misskey's API til at udvikle bots." + tips-line23: "Ai Chan Kawaii!" + tips-line24: "Misskey har været i drift siden 2014." + tips-line25: "Du kan modtage notifikationer, selv om Misskey ikke er åben, hvis du anvender en browser, der er i stand til at håndtere notifikationer." +common/views/pages/not-found.vue: + page-not-found: "Siden kan ikke findes" +common/views/pages/follow.vue: + signed-in-as: "Logget ind som {}" + following: "Følger" + follow: "Følg" + request-pending: "Ventende anmodninger om at blive følger" + follow-processing: "Anmoder om behandling" + follow-request: "Anmodning om at blive følger" +common/views/pages/follow-requests.vue: + received-follow-requests: "Anmodninger om at blive følgere" + accept: "Accepter" + reject: "Afvis" +desktop: + banner-crop-title: "Beskær den del, der vises som et banner" + banner: "Banner" + uploading-banner: "Overfør et nyt banner" + banner-updated: "Banner er overført med succes" + choose-banner: "Vælg banner" + avatar-crop-title: "Beskær den del, der vises som en avatar" + avatar: "Avatar" + uploading-avatar: "Overfør en ny avatar" + avatar-updated: "Avatar er overført med succes" + choose-avatar: "Vælg et billede til din avatar" + invalid-filetype: "Denne filtype kan ikke benyttes her" +desktop/views/components/activity.chart.vue: + total: "Sort ... Total" + notes: "Blå ... Noter" + replies: "Rød ... Svar" + renotes: "Grøn ... Gen-postering" +desktop/views/components/activity.vue: + title: "Aktivitet" + toggle: "Skift mellem visninger" +desktop/views/components/calendar.vue: + title: "{year} / {month}" + prev: "Forrige måned" + next: "Næste måned" + go: "Klik for at navigere" +desktop/views/components/choose-file-from-drive-window.vue: + chosen-files: "{count} fil(er) er valgt" + upload: "Overfør filer fra din enhed" + cancel: "Annuller" + ok: "OK" + choose-prompt: "Vælg filer" +desktop/views/components/choose-folder-from-drive-window.vue: + cancel: "Annuller" + ok: "OK" + choose-prompt: "Vælg en mappe" +desktop/views/components/crop-window.vue: + skip: "Afbryd beskæring" + cancel: "Annuller" + ok: "OK" +desktop/views/components/drive-window.vue: + used: "I brug" +desktop/views/components/drive.file.vue: + avatar: "Avatar" + banner: "Banner" + nsfw: "Upassende På Jobbet" + contextmenu: + rename: "Omdøb" + mark-as-sensitive: "Marker som 'følsom'" + unmark-as-sensitive: "Fjern markering som 'følsom'" + copy-url: "Kopier webadresse" + download: "Download" + else-files: "Andre" + set-as-avatar: "Vælg som avatar" + set-as-banner: "Vælg som banner" + open-in-app: "Åbn i app" + add-app: "Tilføj app" + rename-file: "Omdøb fil" + input-new-file-name: "Angiv nyt navn" + copied: "Kopieret" + copied-url-to-clipboard: "Webadressen er kopieret til klippebordet" +desktop/views/components/drive.folder.vue: + unable-to-process: "Handlingen kunne ikke gennemføres." + circular-reference-detected: "Destinationsmappen er en undermappe til den mappe, som du forsøger at flytte." + unhandled-error: "Ukendt fejl" + contextmenu: + move-to-this-folder: "Flyt til denne mappe" + show-in-new-window: "Åbn i nyt vindue" + rename: "Omdøb" + rename-folder: "Omdøb mappe" + input-new-folder-name: "Angiv nyt navn" +desktop/views/components/drive.vue: + search: "Søg" + empty-draghover: "Smid det her! Fordi du ved, at jeg er meget sød, ikke?" + empty-drive: "Dit medielager er tomt" + empty-drive-description: "Højreklik for at åbne menuen, eller træk og slip filer her for at overføre." + empty-folder: "Denne mappe er tom" + unable-to-process: "Handlingen kunne ikke gennemføres." + circular-reference-detected: "Destinationsmappen er en undermappe til den mappe, som du forsøger at flytte." + unhandled-error: "Ukendt fejl" + url-upload: "Overfør fra webadresse" + url-of-file: "Webadresse på filen, som du vil overføre" + url-upload-requested: "Der er anmodet om overførsel" + may-take-time: "Det kan tage noget tid at gennemføre overførslen." + create-folder: "Opret en mappe" + folder-name: "Mappenavn" + contextmenu: + create-folder: "Opret en mappe" + upload: "Overfør en fil" + url-upload: "Overfør fra webadresse" +desktop/views/components/media-video.vue: + sensitive: "Indholdet er Upassende På Jobbet" + click-to-show: "Klik for at vise" +desktop/views/components/followers-window.vue: + followers: "{}s følgere" +desktop/views/components/followers.vue: + empty: "Det ser ikke ud til, at du har nogen følgere." +desktop/views/components/following-window.vue: + following: "Følger {}" +desktop/views/components/following.vue: + empty: "Det ser ikke ud til, at du følger brugeren..." +desktop/views/components/game-window.vue: + game: "Reversi" +desktop/views/components/home.vue: + done: "Send" + add-widget: "Tilføj widget:" + add: "Tilføj" +desktop/views/input-dialog.vue: + cancel: "Annuller" + ok: "OK" +desktop/views/components/note-detail.vue: + private: "Posten er privat" + deleted: "Posten er blevet fjernet" + location: "Placering" + renote: "Gen-postering" + add-reaction: "Tilføj en reaktion" + undo-reaction: "Fortryd reaktion" +desktop/views/components/note.vue: + reply: "Svar" + renote: "Gen-postering" + add-reaction: "Tilføj en reaktion" + undo-reaction: "Fortryd reaktion" + detail: "Detaljer" + private: "Posten er privat" + deleted: "Posten er blevet fjernet" +desktop/views/components/notes.vue: + error: "Fejl ved indlæsning" + retry: "Prøv igen" +desktop/views/components/notifications.vue: + empty: "Der er ingen notifikationer!" +desktop/views/components/post-form.vue: + add-visible-user: "+Tilføj bruger" + attach-location-information: "Vedhæft oplysninger om placering" + hide-contents: "Skjul indhold" + reply-placeholder: "Svar på denne post" + quote-placeholder: "Citer denne post" + submit: "Post" + reply: "Svar" + renote: "Gen-postering" + posted: "Afsendt!" + replied: "Besvaret!" + reposted: "Gen-posteret!" + note-failed: "Fejl under afsendelse" + reply-failed: "Fejl under besvarelse" + renote-failed: "Fejl under gen-postering" + posting: "Afsender" + attach-media-from-local: "Vedhæft medie fra din enhed" + attach-media-from-drive: "Vedhæft medie fra dit drev" + insert-a-kao: "v('ω')v" + create-poll: "Opret en afstemning" + text-remain: "Der mangler {} tegn" + recent-tags: "Seneste" + local-only-message: "Denne post vil kun blive offentliggjort lokalt" + click-to-tagging: "Klik for at tagge" + visibility: "Synlighed" + geolocation-alert: "Din enhed giver ikke mulighed for at benytte placeringstjenester" + error: "Fejl" + enter-username: "Angiv brugernavn" + annotations: "Kommentarer til posten (frivillige)" +desktop/views/components/post-form-window.vue: + note: "Ny post" + reply: "Svar" + attaches: "{} medier er vedhæftet" + uploading-media: "Har overført {} medier" +desktop/views/components/progress-dialog.vue: + waiting: "Venter" +desktop/views/components/renote-form.vue: + quote: "Citat" + cancel: "Annuller" + renote: "Gen-postering" + renote-home: "Gen-postering (på startsiden)" + reposting: "Gen-posterer" + success: "Gen-posteret!" + failure: "Fejl under gen-postering" +desktop/views/components/renote-form-window.vue: + title: "Ønsker du at gen-postere den?" +desktop/views/pages/user-following-or-followers.vue: + following: "{user} følger" + followers: "{user}s følger" +desktop/views/components/settings.2fa.vue: + intro: "Du kan forbedre sikkerheden ved at indføre to-faktor godkendelse. I så fald vil du både få brug for en adgangskode til log ind og en fysisk enhed (f.eks. en smartphone), som er registreret på forhånd." + detail: "Mere info..." + url: "https://www.google.com/landing/2step/" + caution: "Hvis du mister adgangen til din registrerede enhed, vil du ikke længere være i stand til at koble dig på Misskey!" + register: "Registrer en enhed" + already-registered: "Denne enhed er allerede registreret" + unregister: "Af-registrer" + unregistered: "To-faktor godkendelse er de-aktiveret." + enter-password: "Angiv adgangskoden" + authenticator: "Allerførst skal du installere Google Authenticator på din enhed:" + howtoinstall: "Sådan installerer du" + token: "Nøgle" + scan: "Og derefter, scan QR koden:" + done: "Angiv den nøgle, som vises på din enhed:" + submit: "Send" + success: "Indstillingerne er gemt!" + failed: "Fejl ved opsætningen. Tjek at din nøgle er korrekt." + info: "Næste gang du logger på Misskey, vil den nøgle og adgangskode, der vises på din enhed, være obligatorisk." +common/views/components/media-image.vue: + sensitive: "Indholdet er Upassende På Jobbet" + click-to-show: "Klik for at vise" +common/views/components/api-settings.vue: + intro: "For at få adgang til API'en skal du sætte denne nøgle til at være søgeordet \"i\" i anmodningsparameteren." + caution: "Indtast ikke denne nøgle i nogen app, og fortæl heller ikke andre om den. I modsat fald kan din konto blive kompromitteret." + regeneration-of-token: "Hvis din nøgle er kompromitteret, kan du genskabe den." + regenerate-token: "Genskab nøgle" + token: "Nøgle:" + enter-password: "Angiv adgangskoden" + console: + title: "API konsol" + endpoint: "Endpoint" + parameter: "Parametre" + credential-info: "Denne konsol kræver ikke parameteren \"i\"." + send: "Send" + sending: "Sender" + response: "Svar" +desktop/views/components/settings.apps.vue: + no-apps: "Der er ingen tilsluttede apps" +common/views/components/drive-settings.vue: + max: "Kapacitet" + in-use: "I brug" + stats: "Statistik" +common/views/components/mute-and-block.vue: + mute-and-block: "Annuller / Bloker" + mute: "Annuller" + block: "Bloker" + no-muted-users: "Ingen annullerede brugere" + no-blocked-users: "Ingen blokerede brugere" + word-mute: "Ordfilter" + muted-words: "Frafiltrerede ord" + muted-words-description: "Mellemrum mellem ord vil blive håndteret, som om der står AND i mellem ordene i søgningen (dvs. alle ord skal være til stede). Linjeskift mellem ord vil føre til, at der søges med OR mellem ordene (dvs. kun det ene af ordene behøver være til stede)." + save: "Gem" +common/views/components/password-settings.vue: + reset: "Skift adgangskode" + enter-current-password: "Angiv den nuværende adgangskode" + enter-new-password: "Angiv den nye adgangskode" + enter-new-password-again: "Skriv den nye adgangskode igen" + not-match: "Du har skrevet den nye adgangskode på to forskellige måder" + changed: "Adgangskoden er ændret" + failed: "Fejl ved ændring af adgangskode" +common/views/components/post-form-attaches.vue: + attach-cancel: "Fjern den vedhæftede fil" + mark-as-sensitive: "Marker som 'følsom'" + unmark-as-sensitive: "Fjern markering som 'følsom'" +desktop/views/components/sub-note-content.vue: + private: "Posten er privat" + deleted: "Posten er blevet fjernet" + media-count: "{} medie(r) er vedhæftet" + poll: "Afstemninger" +desktop/views/components/settings.tags.vue: + title: "Tags" + query: "Søgning (valgfri)" + add: "Tilføj" + save: "Gem" +desktop/views/components/timeline.vue: + home: "Startside" + local: "Lokal" + hybrid: "Social" + global: "Global" + mentions: "Omtaler" + messages: "Direkte poster" + list: "Liste" + hashtag: "Hashtags" + add-tag-timeline: "Tilføj hashtag sky" + add-list: "Tilføj liste" + list-name: "Navn på liste" +desktop/views/components/ui.header.vue: + welcome-back: "Velkommen tilbage!" + adjective: "Hr." +desktop/views/components/ui.header.account.vue: + profile: "Din profil" + lists: "Lister" + groups: "Gruppe" + follow-requests: "Anmodninger om at blive følger" + admin: "Administration" +desktop/views/components/ui.header.nav.vue: + game: "Spil" +desktop/views/components/ui.header.notifications.vue: + title: "Notifikationer" +desktop/views/components/ui.header.post.vue: + post: "Ny post" +desktop/views/components/ui.header.search.vue: + placeholder: "Søg" +desktop/views/components/user-preview.vue: + notes: "Poster" + following: "Følger" + followers: "Følgere" +desktop/views/components/users-list.vue: + all: "Alle" + iknow: "Som du ved" + fetching: "Indlæser..." +desktop/views/components/users-list-item.vue: + followed: "Følger dig" +desktop/views/components/window.vue: + popout: "Pop op vindue" + close: "Luk" +admin/views/index.vue: + dashboard: "Kontrolpanel" + instance: "Instans" + emoji: "Emoji" + moderators: "Redaktører" + users: "Brugere" + federation: "Forening" + announcements: "Annonceringer" + abuse: "Misbrug" + queue: "Job kø" + logs: "Logs" + back-to-misskey: "Tilbage til Misskey" +admin/views/dashboard.vue: + dashboard: "Kontrolpanel" + accounts: "Konto" + notes: "Poster" + drive: "Drev" + instances: "Instans" + this-instance: "Denne instans" + federated: "Forenede" +admin/views/queue.vue: + title: "Kø" + remove-all-jobs: "Ryd alle job køer" +admin/views/abuse.vue: + title: "Misbrug" + target: "Mål" + reporter: "Kilde" + details: "Detaljer" + remove-report: "Slet" +admin/views/instance.vue: + instance: "Instans" + instance-name: "Instans navn" + instance-description: "Beskrivelse af instans" + host: "Vært" + icon-url: "Ikonets webadresse" + logo-url: "Logoets webadresse" + banner-url: "Banner billedets webadresse" + error-image-url: "Fejl billedets webadresse" + languages: "Sproget på denne instans" + languages-desc: "Du kan angive flere ved at adskille med mellemrum" + tos-url: "Webadresse for brugerbetingelser" + repository-url: "Webadresse for systemets kode-repo" + feedback-url: "Webadresse for tilbagemeldinger om systemet" + maintainer-config: "Administrator info" + maintainer-name: "Administrator navn" + maintainer-email: "Kontakt administrator" + advanced-config: "Andre indstillinger" + note-and-tl: "Poster og tidslinje" + drive-config: "Indstillinger for drev" + use-object-storage: "Brug af eksternt lager" + object-storage-base-url: "Webadresse" + object-storage-bucket: "Navn på eksternt lager" + object-storage-prefix: "Præfiks" + object-storage-endpoint: "Endpoint" + object-storage-region: "Region" + object-storage-port: "Port" + object-storage-access-key: "Genvejstast" + object-storage-secret-key: "Nøgle" + object-storage-use-ssl: "Brug SSL" + object-storage-s3-info: "Når du bruger Amazon S3 som eksternt lager, skal du bekræfte indstillingerne for {0} samt den dertil hørende \"Terminal\" og \"Region\"." + object-storage-s3-info-here: "Her" + object-storage-gcs-info: "Når du bruger Google Cloud Storage som eksternt lager, skal du indstille \"Terminal\" til storage.googleapis.com og forlade feltet \"Region\"." + cache-remote-files: "Cache eksterne filer" + cache-remote-files-desc: "Hvis du deaktiverer denne indstilling, kan du linke direkte uden at gemme eksterne filer her. Dermed sparer du plads på din egen server. Til gengæld bliver linksene til de eksterne filer usynlige for brugere, som har deaktiveret direkte links, fordi der ikke vises miniature-billeder. Alt i alt anbefales det at aktivere denne indstilling." + local-drive-capacity-mb: "Kapacitet på hver lokal brugers drev" + remote-drive-capacity-mb: "Kapacitet på hver ekstern brugers drev" + mb: "I megabytes (MB)" + recaptcha-config: "Indstillinger for verificering" + recaptcha-info: "Du skal bruge en verificeringsnøgle for at aktivere verificering. Nøglen fås på https://www.google.com/recaptcha/intro/" + enable-recaptcha: "Aktiver verificering" + recaptcha-site-key: "Nøgle for webstedet" + recaptcha-secret-key: "Verificeringsnøgle" + recaptcha-preview: "Før-visning" + hidden-tags: "Skjulte hashtags" + hidden-tags-info: "Brug linjeskift til at adskille de hashtags, som du vil skjule." + external-service-integration-config: "Opret forbindelse til eksterne tjenester" + twitter-integration-config: "Indstillinger for forbindelse til Twitter" + twitter-integration-info: "Webadressen for callback er sat til {url}." + enable-twitter-integration: "Aktiver forbindelsen til Twitter" + twitter-integration-consumer-key: "Brugernøgle" + twitter-integration-consumer-secret: "Brugerhemmelighed" + github-integration-config: "Indstillinger for forbindelse til GitHub" + github-integration-info: "Webadressen for callback er sat til {url}." + enable-github-integration: "Aktiver forbindelsen til GitHub" + github-integration-client-id: "Bruger ID" + github-integration-client-secret: "Brugerhemmelighed" + discord-integration-config: "Indstillinger for forbindelse til Discord" + discord-integration-info: "Webadressen for callback er sat til {url}." + enable-discord-integration: "Aktiver forbindelsen til Discord" + discord-integration-client-id: "Bruger ID" + discord-integration-client-secret: "Brugerhemmelighed" + proxy-account-config: "Indstillinger for proxy-konto" + proxy-account-info: "En proxy-konto kan følge en ekstern brugers aktivitet og hente data fra vedkommende. Når du tilføjer en ekstern bruger, som ikke følges af nogen på denne instans, til din liste, vil proxy-kontoen følge ham eller hende i stedet for dine følgere." + proxy-account-username: "Brugernavn for proxy konto" + proxy-account-username-desc: "Angiv brugernavnet på den konto, der bliver brugt som proxy." + proxy-account-warn: "Du er nødt til at oprette en konto med dette brugernavn først." + max-note-text-length: "Det højeste antal tegn pr. post" + disable-registration: "Deaktiver oprettelse af nye brugere" + disable-local-timeline: "Deaktiver den lokale tidslinje" + disable-global-timeline: "Deaktiver den globale tidslinje" + disabling-timelines-info: "Administratorer og redaktører kan stadig bruge en tidslinje, selv om den er deaktiveret." + enable-emoji-reaction: "Aktiver piktogram med reaktioner" + use-star-for-reaction-fallback: "Fald tilbage på en stjerne, hvis der kommer en ukendt reaktion." + invite: "Inviter" + save: "Gem" + saved: "Gemt" + pinned-users: "Fremhæv bruger" + pinned-users-info: "Angiv brugere, du vil fremhæve, adskilt af linjeskift." + email-config: "Indstillinger for email server" + email-config-info: "Bruges til bekræftelse af email adresse og nulstilling af adgangskode." + enable-email: "Aktiver levering af emails" + email: "Email adresse" + smtp-secure: "Brug implicit SSL / TLS til SMTP-forbindelsen" + smtp-secure-info: "Sluk STARTTLS, når du bruger den." + smtp-host: "SMTP vært" + smtp-port: "SMTP port" + smtp-auth: "Udfør autentifikation af SMTP" + smtp-user: "SMTP bruger" + smtp-pass: "SMTP adgangskode" + serviceworker-config: "ServiceWorker" + enable-serviceworker: "Aktiver ServiceWorker" + serviceworker-info: "Skal være aktiveret for at give push notifikationer." + vapid-publickey: "Offentlig nøgle til VAPID" + vapid-privatekey: "Privat nøgle til VAPID" + vapid-info: "Hvis du vil aktivere ServiceWorker, skal du generere en VAPID-nøgle. Medmindre du har angivet den globale node_modules placering andetsteds, skal du køre den som root:" +admin/views/charts.vue: + title: "Graf" + per-day: "pr. dag" + per-hour: "pr. time" + federation: "Forening" + notes: "Poster" + users: "Brugere" + drive: "Drev" + network: "Netværk" + charts: + federation-instances: "Sæt antallet af instanser op eller ned" + federation-instances-total: "Antal instanser i alt" + notes: "Fremgang eller tilbagegang i antal poster (lokale + eksterne)" + local-notes: "Fremgang eller tilbagegang i antal poster (lokale)" + remote-notes: "Fremgang eller tilbagegang i antal poster (eksterne)" + notes-total: "Antal poster i alt" + users: "Fremgang eller tilbagegang i antal brugere" + users-total: "Antal brugere i alt" + active-users: "Aktive brugere" + drive: "Fremgang eller tilbagegang i brugen af drevet" + drive-total: "Forbrugt plads på drevet i alt" + drive-files: "Fremgang eller tilbagegang i antal filer på drevet" + drive-files-total: "Antal filer i alt på drevet" + network-requests: "Netværkskald" + network-time: "Svartid" + network-usage: "Trafik" +admin/views/drive.vue: + operation: "Drift" + fileid-or-url: "Fil ID eller webadresse" + file-not-found: "Filen kunne ikke findes" + lookup: "Forespørgsel" + sort: + title: "Sorter efter" + createdAtAsc: "Alder - ældste først" + createdAtDesc: "Alder - seneste først" + sizeAsc: "Størrelse - mindste først" + sizeDesc: "Størrelse - største først" + origin: + title: "Oprindelse" + combined: "Lokal + ekstern" + local: "Lokal" + remote: "Ekstern" + delete: "Slet" + deleted: "Slettet" + mark-as-sensitive: "Marker som 'følsom'" + unmark-as-sensitive: "Fjern markering som 'følsom'" + marked-as-sensitive: "Marker som 'følsom'" + unmarked-as-sensitive: "Fjern markering som 'følsom'" +admin/views/users.vue: + operation: "Drift" + username-or-userid: "Brugernavn eller bruger ID" + user-not-found: "Bruger kunne ikke findes" + lookup: "Opslag" + reset-password: "Nulstil adgangskode" + reset-password-confirm: "Er du sikker på, at du vil nulstille din adgangskode?" + password-updated: "Adgangskoden er nu \"{password}\"" + suspend: "Udeluk" + suspend-confirm: "Er du sikker på, at du vil udelukke denne konto?" + suspended: "Udelukket med succes" + unsuspend: "Annuller udelukkelse" + unsuspend-confirm: "Er du sikker på, at du vil annullere udelukkelsen på denne konto?" + unsuspended: "Brugerens udelukkelse er annulleret med succes" + make-silence: "Gør tavs" + silence-confirm: "Vil du gøre brugeren tavs?" + unmake-silence: "Vil du annullere, at brugeren er gjort tavs?" + unsilence-confirm: "Er du sikker på, at du vil omgøre, at brugeren er gjort tavs?" + update-remote-user: "Opdater informationen om den eksterne bruger" + remote-user-updated: "Informationen om den eksterne bruger er nu blevet opdateret." + delete-all-files: "Slet alle filer" + delete-all-files-confirm: "Er du sikker på, at alle filerne skal slettes?" + users: + title: "Bruger" + sort: + title: "Sorter efter" + createdAtAsc: "Tidspunkt for oprettelse (ældste først)" + createdAtDesc: "Tidspunkt for oprettelse (seneste først)" + updatedAtAsc: "Tidspunkt for seneste opdatering (ældste først)" + updatedAtDesc: "Tidspunkt for seneste opdatering (seneste først)" + state: + title: "Sorter efter" + all: "Alle" + admin: "Administrator" + moderator: "Redaktører" + adminOrModerator: "Administrator/Redaktør" + silenced: "Brugeren er i forvejen gjort tavs" + suspended: "Udelukket" + origin: + title: "Oprindelse" + combined: "Lokal + Ekstern" + local: "Lokal" + remote: "Ekstern" + createdAt: "Oprettet den" + updatedAt: "Opdateret den" +admin/views/moderators.vue: + add-moderator: + title: "Opret redaktør" + add: "Opret" + added: "Redaktør er oprettet" + remove: "Fjern" + removed: "Redaktøren er nu fjernet" +admin/views/emoji.vue: + add-emoji: + title: "Tilføj emoji" + name: "Navn på emoji" + name-desc: "Du kan bruge tegnene fra a til z, 0 til 9 og \"_\"" + aliases: "Aliasser" + aliases-desc: "Du kan tilføje flere med mellemrum imellem" + url: "Webadresse for billede" + add: "Tilføj" + info: "Vi anbefaler PNG billeder under 50 KB." + added: "Emoji er tilføjet" + emojis: + title: "Emojis" + update: "Opdatering" + remove: "Slet" + updated: "Opdateret" + remove-emoji: + are-you-sure: "Er du sikker på, at du vil slette \"$1\"?" + removed: "Slettet" +admin/views/announcements.vue: + announcements: "Annonceringer" + save: "Gem" + remove: "Slet" + add: "Tilføj" + title: "Titel" + text: "Indhold" + saved: "Gemt" + _remove: + are-you-sure: "Er du sikker på, at du vil slette \"$1\"?" + removed: "Slettet" +admin/views/hashtags.vue: + hided-tags: "Skjulte tags" +admin/views/federation.vue: + instance: "Instans" + host: "Vært" + notes: "Poster" + users: "Brugere" + following: "Følger" + followers: "Følgere" + caught-at: "Oprettet den" + status: "Status" + latest-request-sent-at: "Tidspunkt for afsendelse af seneste forespørgsel" + latest-request-received-at: "Seneste forespørgsel blev modtaget den" + remove-all-following: "Annuller alle følgere" + remove-all-following-info: "Annuller alle konti fra værten {host}. Udføres når værten ikke længere eksisterer." + delete-all-files: "Slet alle filer" + block: "Bloker" + marked-as-closed: "Marker som lukket" + lookup: "Opslag" + instances: "Forenede" + instance-not-registered: "Instansen kan ikke findes" + sort: "Sorter efter" + sorts: + caughtAtAsc: "Tidspunkt for oprettelse (ældste først)" + caughtAtDesc: "Tidspunkt for oprettelse (seneste først)" + lastCommunicatedAtAsc: "Tidspunktet for den tidligere interaktion" + lastCommunicatedAtDesc: "Tidspunktet for den senere interaktion" + notesAsc: "Poster (mindste først)" + notesDesc: "Poster (største først)" + usersAsc: "Antal brugere (færrest først)" + usersDesc: "Antal brugere (flest først)" + followingAsc: "Antal følgere (færrest først)" + followingDesc: "Antal følgere (flest først)" + followersAsc: "Antal følgere (færrest først)" + followersDesc: "Antal følgere (flest først)" + driveUsageAsc: "Diskforbrug (mindst først)" + driveUsageDesc: "Diskforbrug (størst først)" + driveFilesAsc: "Antal filer på drev (færrest først)" + driveFilesDesc: "Antal filer på drev (flest først)" + state: "Sorter efter" + states: + all: "Alle" + blocked: "Bloker" + not-responding: "Uden svar" + marked-as-closed: "Markeret som lukkede" + result-is-truncated: "Vis de øverste {n} elementer." + charts: "Graf" + chart-srcs: + requests: "Netværkskald" + users: "Fremgang eller tilbagegang i antal brugere" + users-total: "Antal brugere i alt" + notes: "Sæt antallet af poster op eller ned" + notes-total: "Antal poster i alt" + ff: "Stigning i antal følgere" + ff-total: "Det samlede antal følgere" + drive-usage: "Fremgang eller tilbagegang i brugen af drevet" + drive-usage-total: "Forbrugt plads på drevet i alt" + drive-files: "Sæt antallet af filer på drevet op eller ned" + drive-files-total: "Samlet antal filer på drev" + chart-spans: + hour: "pr. time" + day: "pr. dag" + blocked-hosts: "Bloker" + blocked-hosts-info: "Beskrivelse af værterne du vil blokere, adskilt af linjeskift." +desktop/views/pages/welcome.vue: + about: "Mere info..." + timeline: "Tidslinje" + announcements: "Annonceringer" + photos: "Seneste billeder" + powered-by-misskey: "Leveret af Misskey." + info: "Information" +desktop/views/pages/drive.vue: + title: "Misskey drev" +desktop/views/pages/note.vue: + prev: "Forrige post" + next: "Næste post" +desktop/views/pages/selectdrive.vue: + title: "Vælg fil(er)" + ok: "OK" + cancel: "Annuller" + upload: "Overfør filer fra din enhed" +desktop/views/pages/search.vue: + not-available: "Søgefunktionen er deaktiverede i indstillingerne for denne instans." + not-found: "Ingen poster fundet for \"{q}\"" +desktop/views/pages/tag.vue: + no-posts-found: "Ingen poster fundet med \"{q}\"." +desktop/views/pages/user-list.users.vue: + users: "Bruger" + add-user: "Tilføj en bruger" + username: "Brugernavn" +desktop/views/pages/user/user.followers-you-know.vue: + title: "Følgere som du måske kender" + loading: "Henter" + no-users: "Ingen følgere du kender" +desktop/views/pages/user/user.friends.vue: + title: "Hyppige omtaler" + loading: "Henter" + no-users: "Ingen hyppige omtaler" +desktop/views/pages/user/user.photos.vue: + title: "Billeder" + loading: "Henter" + no-photos: "Ingen billeder" +desktop/views/pages/user/user.header.vue: + posts: "Poster" + following: "Følger" + followers: "Følgere" + is-bot: "Denne konto er en bot" + no-description: "Ingen brugerbeskrivelse" + years-old: "{age} år" + year: "-" + month: "Man" + day: "Søn" + follows-you: "Følger dig" +desktop/views/pages/user/user.timeline.vue: + default: "Poster" + with-replies: "Poster og svar" + with-media: "Medier" + my-posts: "Mine poster" +desktop/views/widgets/notifications.vue: + title: "Notifikationer" +desktop/views/widgets/polls.vue: + title: "Afstemninger" + refresh: "Genopfrisk" + nothing: "Der er ingen notifikationer!" +desktop/views/widgets/post-form.vue: + title: "Post" + note: "Post" + something-happened: "Kunne af uvisse årsager ikke postes" +desktop/views/widgets/profile.vue: + update-banner: "Klik for at redigere dit banner" + update-avatar: "Klik for at redigere din avatar" +desktop/views/widgets/trends.vue: + title: "Tendenser" + refresh: "Genopfrisk" + nothing: "Der er ingen notifikationer!" +desktop/views/widgets/users.vue: + title: "Anbefalede brugere" + refresh: "Genopfrisk" + no-one: "Hvad synes du?" +mobile/views/components/drive.vue: + used: "I brug" + folder-count: "Mappe(r)" + count-separator: "," + file-count: "Fil(er)" + nothing-in-drive: "Der er ikke gemt noget" + folder-is-empty: "Denne mappe er tom" + folder-name: "Mappenavn" + here-is-root: "Lige nu befinder du dig i bunden - ikke i en mappe." + url-prompt: "Webadresse på filen, som du vil overføre" + uploading: "Overførslen er sat i gang. Det kan tage et stykke tid." + folder-name-cannot-empty: "Et mappe er nødt til at have et navn" +mobile/views/components/drive-file-chooser.vue: + select-file: "Vælg fil" +mobile/views/components/drive-folder-chooser.vue: + select-folder: "Vælg mappe" +mobile/views/components/drive.file.vue: + nsfw: "Indholdet er Upassende På Jobbet" +mobile/views/components/drive.file-detail.vue: + download: "Download" + rename: "Omdøb" + move: "Flyt" + hash: "Hashtag (md5)" + exif: "EXIF" + nsfw: "Indholdet er Upassende På Jobbet" + mark-as-sensitive: "Marker som 'følsom'" + unmark-as-sensitive: "Fjern markering som 'følsom'" +mobile/views/components/media-video.vue: + sensitive: "Indholdet er Upassende På Jobbet" + click-to-show: "Klik for at vise" +common/views/components/follow-button.vue: + following: "Følger" + follow: "Følger" + request-pending: "Ventende anmodninger om at blive følger" + follow-processing: "Anmoder om behandling" + follow-request: "Anmodninger om at blive følger" +mobile/views/components/note.vue: + private: "Posten er privat" + deleted: "Posten er blevet fjernet" + location: "Placering" +mobile/views/components/note-detail.vue: + reply: "Svar" + reaction: "Reaktion" + private: "Posten er privat" + deleted: "Posten er blevet fjernet" + location: "Placering" +mobile/views/components/note-preview.vue: + admin: "admin" + bot: "bot" + cat: "cat" +mobile/views/components/note-sub.vue: + admin: "admin" + bot: "bot" + cat: "cat" +mobile/views/components/notifications.vue: + empty: "Der er ingen notifikationer!" +mobile/views/components/post-form.vue: + add-visible-user: "Tilføj en bruger" + submit: "Post" + reply: "Svar" + renote: "Gen-postering" + quote-placeholder: "Citer denne post... (valgfrit)" + reply-placeholder: "Svar på denne post" + cw-placeholder: "Kommentar til indholdet (valgfrit)" + geolocation-alert: "Din enhed giver ikke mulighed for at benytte placeringstjenester" + error: "Fejl" + username-prompt: "Angiv brugernavn" +mobile/views/components/sub-note-content.vue: + private: "Posten er privat" + deleted: "Posten er blevet fjernet" + media-count: "{} medie(r) er vedhæftet" + poll: "Afstemninger" +mobile/views/components/ui.header.vue: + welcome-back: "Velkommen tilbage!" + adjective: "Hr." +mobile/views/components/ui.nav.vue: + timeline: "Tidslinje" + notifications: "Notifikationer" + follow-requests: "Anmodninger om at blive følger" + search: "Søg" + user-lists: "Lister" + user-groups: "Gruppe" + widgets: "Widgets" + game: "Spil" + admin: "Administration" + about: "Om" +mobile/views/pages/drive.vue: + contextmenu: + upload: "Overfør en fil" + url-upload: "Overfør fil fra webadresse" + create-folder: "Opret en mappe" + rename-folder: "Omdøb mappe" + move-folder: "Flyt denne mappe" + delete-folder: "Slet denne mappe" +mobile/views/pages/signup.vue: + lets-start: "Din konto er nu klar! 📦" +mobile/views/pages/followers.vue: + followers-of: "{name}s følgere" +mobile/views/pages/following.vue: + following-of: "{name}s følger" +mobile/views/pages/home.vue: + home: "Startside" + local: "Lokal" + hybrid: "Social" + global: "Global" + mentions: "Omtaler" + messages: "Direkte poster" +mobile/views/pages/tag.vue: + no-posts-found: "Ingen poster fundet med \"{q}\"." +mobile/views/pages/widgets.vue: + dashboard: "Kontrolpanel" + widgets-hints: "Du kan tilføje / slette / flytte rundt på widgets. For at flytte widgeten skal du trække “三”. Klik på \"×\" for at slette widgeten. Nogle widgets kan tilpasses direkte ved at klikke på dem." + add-widget: "Tilføj" + customization-tips: "Tips om tilpasning" +mobile/views/pages/widgets/activity.vue: + activity: "Aktivitet" +mobile/views/pages/share.vue: + share-with: "Del med {name}" +mobile/views/pages/note.vue: + title: "Post" + prev: "Forrige post" + next: "Næste post" +mobile/views/pages/games/reversi.vue: + reversi: "Reversi" +mobile/views/pages/search.vue: + search: "Søg" + not-found: "Ingen poster fundet for \"{q}\"" +mobile/views/pages/selectdrive.vue: + select-file: "Vælg fil(er)" +mobile/views/pages/settings.vue: + signed-in-as: "Logget ind som {}" +mobile/views/pages/user.vue: + follows-you: "Følger dig" + following: "Følger" + followers: "Følgere" + notes: "Poster" + overview: "Oversigt" + timeline: "Tidslinje" + media: "Medier" + years-old: "{age} år" +mobile/views/pages/user/home.vue: + recent-notes: "Seneste poster" + images: "Billeder" + activity: "Aktivitet" + keywords: "Nøgleord" + domains: "Domæner" + frequently-replied-users: "Hyppige omtaler" + followers-you-know: "Følgere som du måske kender" + last-used-at: "Senest aktiv:" +mobile/views/pages/user/home.photos.vue: + no-photos: "Ingen billeder" +deck: + widgets: "Widgets" + home: "Startside" + local: "Lokal" + hybrid: "Social" + hashtag: "Hashtags" + global: "Global" + mentions: "Omtaler" + direct: "Direkte poster" + notifications: "Notifikationer" + list: "Lister" + select-list: "Vælg liste" + swap-left: "Flyt til venstre" + swap-right: "Flyt til højre" + swap-up: "Flyt op" + swap-down: "Flyt ned" + remove: "Fjern" + add-column: "Tilføj en kolonne" + rename: "Omdøb" + stack-left: "Fold sammen til venstre" + pop-right: "Parker til højre" + disabled-timeline: + title: "Tidslinjen er deaktiveret" + description: "Tidslinjen er deaktiveret af serverens administrator" +deck/deck.tl-column.vue: + is-media-only: "Poster med medieindhold" + edit: "Valgmuligheder" +deck/deck.user-column.vue: + follows-you: "Følger dig" + posts: "Poster" + following: "Følger" + followers: "Følgere" + images: "Billeder" + activity: "Aktivitet" + timeline: "Tidslinje" + pinned-notes: "Fremhævede poster" +docs: + edit-this-page-on-github: "Har du fundet en fejl, eller ønsker at bidrage til dokumentationen?" + edit-this-page-on-github-link: "Rediger denne side på GitHub" +dev/views/index.vue: + manage-apps: "Administrer apps" +dev/views/apps.vue: + manage-apps: "Administrer apps" + create-app: "Opret app" + app-missing: "Ingen apps" +dev/views/new-app.vue: + new-app: "Ny app" + new-app-info: "Du kan også oprette en app fra API'en. (app / opret)" + create-app: "Opretter app" + app-name: "Navn på app" + app-name-placeholder: "F.eks. Misskey for iOS" +pages: + like: "Synes om" + title: "Titel" + blocks: + section: "Sektion" + image: "Billeder" + button: "Knap" + if: "Hvis" + _if: + variable: "Variabel" + post: "Post formular" + _post: + text: "Indhold" + textInput: "Indtastet tekst" + _textInput: + name: "Variabel navn" + text: "Titel" + default: "Standard værdi" + textareaInput: "Tekst med flere linjer" + _textareaInput: + name: "Variabel navn" + text: "Titel" + default: "Standard værdi" + numberInput: "Indtastet tal" + _numberInput: + name: "Variabel navn" + text: "Titel" + default: "Standard værdi" + switch: "Kontakt" + _switch: + name: "Variabel navn" + text: "Titel" + default: "Standard værdi" + counter: "Tæller" + _counter: + name: "Variabel navn" + text: "Titel" + inc: "Forhøj tallet med en" + _button: + text: "Titel" + action: "Handling når der trykkes på knappen" + _action: + dialog: "Vis dialogboks" + _dialog: + content: "Indhold" + resetRandom: "Nulstil tilfældigt tal" + script: + categories: + flow: "Kontrol" + logical: "Logisk handling" + operation: "Eksekver" + comparison: "Sammenlign" + random: "Tilfældig" + value: "Værdi" + fn: "Funktion" + text: "Tekstmanipulation" + convert: "Konverter" + list: "Lister" + blocks: + text: "Text" + multiLineText: "Tekst med linjeskift" + textList: "Punktliste" + _textList: + info: "Brug linjeskift til at adskille linjerne" + strLen: "Længde af tekststrengen" + _strLen: + arg1: "Tekst" + strPick: "Udtræk et tegn" + _strPick: + arg1: "Text" + arg2: "Tegnets position" + strReplace: "Erstat tekststreng(e)" + _strReplace: + arg1: "Tekst" + arg2: "Før søg-og-erstat" + arg3: "Efter søg-og-erstat" + strReverse: "Vend teksten rundt" + _strReverse: + arg1: "Tekst" + join: "Sammenflet tekst" + _join: + arg1: "Lister" + arg2: "Skilletegn" + add: "+ Plus" + _add: + arg1: "A" + arg2: "B" + subtract: "- Minus" + _subtract: + arg1: "A" + arg2: "B" + multiply: "× Multiplicer" + _multiply: + arg1: "A" + arg2: "B" + divide: "÷ Divider" + _divide: + arg1: "A" + arg2: "B" + remind: "÷ Tomo" + _remind: + arg1: "A" + arg2: "B" + eq: "A og B er ens" + _eq: + arg1: "A" + arg2: "B" + notEq: "A og B er forskellige" + _notEq: + arg1: "A" + arg2: "B" + and: "A og B" + _and: + arg1: "A" + arg2: "B" + or: "A eller B" + _or: + arg1: "A" + arg2: "B" + lt: "A er mindre end B" + _lt: + arg1: "A" + arg2: "B" + gt: "A er større end B" + _gt: + arg1: "A" + arg2: "B" + ltEq: "A er mindre end eller lig med B" + _ltEq: + arg1: "A" + arg2: "B" + gtEq: "A er større end eller lig med B" + _gtEq: + arg1: "A" + arg2: "B" + if: "Branch" + _if: + arg1: "Hvis" + arg2: "så" + arg3: "ellers" + not: "negation" + _not: + arg1: "negation" + random: "Tilfældig" + _random: + arg1: "Sandsynlighed" + rannum: "Tilfældigt tal" + _rannum: + arg1: "Minimum" + arg2: "Maximum" + randomPick: "Vælg tilfældig fra listen" + _randomPick: + arg1: "Lister" + dailyRandom: "Tilfældigt (pr. bruger pr. dag)" + _dailyRandom: + arg1: "Sandsynlighed" + dailyRannum: "Tilfældigt antal (pr. bruger pr. dag)" + _dailyRannum: + arg1: "Minimum" + arg2: "Maximum" + dailyRandomPick: "Tilfældigt valgt fra listen (pr. bruger pr. dag)" + _dailyRandomPick: + arg1: "Lister" + seedRandom: "Tilfældig (frø)" + _seedRandom: + arg1: "Frø" + arg2: "Sandsynlighed" + seedRannum: "Tilfældigt antal (frø)" + _seedRannum: + arg1: "Frø" + arg2: "Minimum" + arg3: "Maximum" + seedRandomPick: "Vælg tilfældigt (frø) fra listen" + _seedRandomPick: + arg1: "Frø" + arg2: "Lister" + DRPWPM: "Tilfældigt valgt fra sandsynlighedslisten (pr. bruger pr. dag)" + _DRPWPM: + arg1: "Punktliste" + pick: "Vælg fra listen" + _pick: + arg1: "Lister" + arg2: "Position" + number: "Tal" + stringToNumber: "Tekst til tal" + _stringToNumber: + arg1: "Tekst" + numberToString: "Tal til tekst" + _numberToString: + arg1: "Tal" + splitStrByLine: "Del teksten op i linjer" + _splitStrByLine: + arg1: "Tekst" + ref: "Variabel" + fn: "Funktion" + _fn: + slots: "Slot-funktion" + slots-info: "Brug linjeskift til at adskille slot-funktionerne" + arg1: "Output" + for: "Gentag" + _for: + arg1: "Antal gange" + arg2: "Proces" + typeError: "Slot-funktionen {slot} skal gennemløbe i \"{expect}\", men den faktiske indtastning er \"{actual}\"!" + thereIsEmptySlot: "Slot-funktionen {slot} er tom!" + types: + string: "Tekst" + number: "Tal" + boolean: "Sand/falsk" + array: "Lister" + stringArray: "Punktliste" + emptySlot: "Tomt slot" + enviromentVariables: "Miljø variabel" + pageVariables: "Side element" + argVariables: "Input slot" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 53a3fc79f..1d5a99f16 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -10,26 +10,35 @@ common: about: "Misskey ist eine Quelloffene, dezentralisierte microblogging Software. Es bietet eine erweiterbare Benutzeroberfläche, verschiedenste Möglichkeiten auf Beiträge zu reagieren, kostenlosen Datenspeicher, und andere fortschrittliche Funktionen. Zusätzlich ist Misskey dazu in der Lage, sich mittels des Fediverse mit beliebig vielen anderen ActivityPub-kompatiblen Diensten zu verbinden. Wenn du zum Beispiel einen Betrag mit Misskey abschickst, wird dieser auch für Nutzer von Mastodon oder Pleroma sichtbar sein. So ähnlich wie eine Radioübertragung zwischen Planeten." features: "Funktionen" rich-contents: "Notizen" + rich-contents-desc: "Poste einfach deine Ideen, Interessen und alles, was du teilen möchtest. Gestalte deine Nachrichten, teile deine Lieblingsbilder, sende Dateien und Videos und erstelle Umfragen – das und mehr kann Misskey!" reaction: "Reaktionen" + reaction-desc: "Der einfachste Weg, deine Gefühle mit anderen zu teilen. Mit Misskey kannst du auf verschiedenste Arten auf Beiträge reagieren, statt nur zu „liken“." ui: "Benutzeroberfläche" + ui-desc: "Geschmäcker sind verschieden. Deswegen ist Misskeys Oberfläche hochanpassbar und modular. Mache die Startseite zu deiner Startseite, indem du das Layout deiner Timeline änderst und mit Widgets staffierst." drive: "Drive" + drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!" + outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!" adblock: detected: "Bitte deaktiviere den Werbeblocker." + warning: "Misskey hat keine Werbung. Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen." application-authorization: "Autorisierte Anwendungen" close: "Schließen" + do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden." load-more: "Mehr laden" enter-password: "Bitte Passwort eingeben" 2fa: "Zwei-Faktor-Authentifizierung" customize-home: "Layout Anpassen" - featured-notes: "Hervorgehobene Beiträge" + featured-notes: "Beliebt" dark-mode: "Dunkler Modus" signin: "Einloggen" signup: "Registrieren" signout: "Ausloggen" reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?" + fetching-as-ap-object: "Hole Daten…" got-it: "Verstanden!" customization-tips: title: "Anpassung-Tipps" + paragraph: "

Du kannst deine Startseite anpassen, indem du Widgets hinzufügst und verschiebst.

Klicke rechts auf ein Widget, um dessen Aussehen zu verändern.

Um ein Widget zu löschen, klicke und ziehe es auf den Papierkorb am Kopfende der Seite.

Wenn du fertig bist, drücke auf den Beenden-Knopf oben rechts.

" gotit: "Verstanden!" notification: file-uploaded: "Datei hochgeladen!" @@ -56,21 +65,32 @@ common: pages: "Seite" messaging: "Unterhaltungen" home: "Home" - deck: "Stapel" + deck: "Deck" timeline: "Zeitleiste" explore: "Entdecken" following: "Folgt" followers: "Folgende" - favorites: "Diesen Beitrag favorisieren" + favorites: "Favoriten" permissions: "read:account": "Accountinformationen anzeigen." "write:account": "Accountinformationen bearbeiten." "read:blocks": "Blöcke anzeigen" + "write:blocks": "Auf Sperrungen zugreifen" "read:drive": "Dateien anzeigen" "write:drive": "Dateien bearbeiten" "read:favorites": "Favoriten anzeigen" + "write:favorites": "Auf Favoriten zugreifen" + "read:following": "Follower-Daten lesen" + "write:following": "Folgestatus bearbeiten" "read:messaging": "Unterhaltung anzeigen" "write:messaging": "Unterhaltung bearbeiten" + "read:mutes": "Stummschaltungen lesen" + "write:mutes": "Stummschaltungen bearbeiten" + "write:notes": "Beiträge löschen und verfassen" + "read:notifications": "Benachrichtigungen lesen" + "write:notifications": "Benachrichtigungen bearbeiten" + "read:reactions": "Reaktionen sehen" + "write:reactions": "Reaktionen hinzufügen und bearbeiten" "write:votes": "Abstimmen" empty-timeline-info: follow-users-to-make-your-timeline: "Beiträge von Benutzern, denen du folgst, werden in der Zeitleiste angezeigt." @@ -147,23 +167,116 @@ common: show-reversi-board-labels: "Zeige Reihen- und Spaltenbeschreibungen in Reversi an" use-avatar-reversi-stones: "Avatar als Stein in Reversi anzeigen" disable-animated-mfm: "Animierten Text in Beiträgen deaktivieren" + disable-showing-animated-images: "Animierte Grafiken deaktivieren" + suggest-recent-hashtags: "Beim Verfassen von Beiträgen letzte Hashtags anzeigen" + always-show-nsfw: "Sensible Inhalte (NSFW) immer anzeigen" + always-mark-nsfw: "Meine Anhänge immer als NSFW markieren" + show-full-acct: "Servername bei Benutzernamen immer anzeigen" + show-via: "„via“ anzeigen" + reduce-motion: "Animationen der Benutzeroberfläche reduzieren" + this-setting-is-this-device-only: "Nur auf diesem Gerät" + use-os-default-emojis: "Betriebssystem-Emojis nutzen" + line-width: "Linienstärke" + line-width-thin: "Dünn" + line-width-normal: "Normal" + line-width-thick: "Dick" + font-size: "Schriftgröße" + font-size-x-small: "Sehr klein" + font-size-small: "Klein" + font-size-medium: "Normal" + font-size-large: "Groß" + font-size-x-large: "Sehr groß" + deck-column-align: "Spaltenaufteilung der Deck-Ansicht" + deck-column-align-center: "Mitte" + deck-column-align-left: "Links" + deck-column-align-flexible: "Flexibel" + deck-column-width: "Spaltenbreite des Decks" + deck-column-width-narrow: "Sehr eng" + deck-column-width-narrower: "Eng" + deck-column-width-normal: "Normal" + deck-column-width-wider: "Breit" + deck-column-width-wide: "Sehr breit" + use-shadow: "Nutze Schatten" + rounded-corners: "Abgerundete Ecken" + circle-icons: "Kreisförmige Icons" + contrasted-acct: "Nutzernamen kontrastreicher darstellen" + wallpaper: "Hintergrund" + choose-wallpaper: "Hintergrund auswählen" + delete-wallpaper: "Hintergrund entfernen" + post-form-on-timeline: "Beitragsformular über Timeline anzeigen" + show-clock-on-header: "Uhr am oberen rechten Rand anzeigen" + show-reply-target: "Zeige bei einer Antwort die ursprüngliche Nachricht" + timeline: "Timeline" + show-my-renotes: "Zeige eigene Renotes in der Timeline" + show-renoted-my-notes: "Zeige Renotes deiner Posts in der Timeline" + show-local-renotes: "Zeige Renotes lokaler Posts in der Timeline" + remain-deleted-note: "Gelöschte Beiträge weiterhin anzeigen" + sound: "Töne" + enable-sounds: "Töne aktivieren" + enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert." + volume: "Lautstärke" + test: "Test" + update: "Misskey-Update" + version: "Version:" + latest-version: "Neuste Version:" + update-checking: "Suche nach Updates" + do-update: "Nach Updates suchen" + update-settings: "Erweiterte Einstellungen" + no-updates: "Kein Update verfügbar" + no-updates-desc: "Misskey ist aktuell." + update-available: "Eine neue Version ist verfügbar!" + update-available-desc: "Änderungen werden beim Neuladen der Seite angewendet." + advanced-settings: "Erweiterte Einstellungen" + debug-mode: "Debug-Modus einschalten" + debug-mode-desc: "Diese Einstellung wird im Browser gespeichert." + navbar-position: "Postion der Navigationsleiste" + navbar-position-top: "Oben" + navbar-position-left: "Links" + navbar-position-right: "Rechts" + i-am-under-limited-internet: "Ich möchte Datenvolumen sparen" + post-style: "Beitrags-Anzeigestil" + post-style-standard: "Standard" + post-style-smart: "Smart" + notification-position: "Benachrichtigungen anzeigen" + notification-position-bottom: "Unten" + notification-position-top: "Oben" + disable-via-mobile: "Beitrag nicht als „vom Handy“ markieren" + load-raw-images: "Anhänge in voller Größe laden" + load-remote-media: "Zeige Inhalte von fremden Servern" search: "Suche" delete: "Löschen" loading: "Laden" + ok: "Okay" + cancel: "Abbrechen" update-available-title: "Aktualisierung verfügbar" update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden" my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet." - verified-user: "Verifizierter Benutzer" + hide-password: "Passwort verbergen" + show-password: "Passwort zeigen" + enter-username: "Kontonamen eingeben" do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktivumgebung verwenden." + user-suspended: "Dieser Nutzer wurde gesperrt." + is-remote-user: "Diese Nutzerinformationen können unvollständig sein." + is-remote-post: "Dies ist ein entfernter Post." + view-on-remote: "Vollständige Infos auf Ursprungsserver anzeigen" + renoted-by: "Renote von {user}" + no-notes: "Keine Beiträge" + turn-on-darkmode: "Dunkles Design" + turn-off-darkmode: "Helles Design" error: + title: "Allgemeiner Fehler" retry: "Erneut versuchen" reversi: drawn: "Unentschieden" my-turn: "Du bist am Zug" opponent-turn: "Dein Gegner ist an der Reihe" + turn-of: "{name}s Zug" + past-turn-of: "Zug von {name}" + won: "{name} hat gewonnen" black: "Schwarz" white: "Weiß" total: "Gesamt" + this-turn: "{count}. Zug" widgets: analog-clock: "Analoge Uhr" profile: "Profil" @@ -174,8 +287,10 @@ common: memo: "Notizen" trends: "Trends" photo-stream: "Bilder" + posts-monitor: "Beitrags-Aktivität" slideshow: "Diashow" version: "Version" + broadcast: "Ankündigungen" notifications: "Benachrichtigungen" users: "Empfohlene Benutzer" polls: "Umfrage" @@ -184,7 +299,9 @@ common: nav: "Navigation" tips: "Tipps" hashtags: "Hashtags" + queue: "Warteschlange" dev: "Fehler beim Erstellen der Applikation. Bitte versuche es erneut." + ai-chan-kawaii: "Ai-chan kawaii!" you: "Du" auth/views/form.vue: share-access: "Erlaubst Du {name} auf deinen Account zuzugreifen?" @@ -194,19 +311,37 @@ auth/views/form.vue: auth/views/index.vue: loading: "Lädt" denied: "Autorisierung der Anwendung wurde verweigert." + denied-paragraph: "Diese App kann nicht auf deinen Account zugreifen." already-authorized: "Diese Anwendung ist bereits autorisiert." allowed: "Autorisierung der Anwendung wurde erlaubt." + callback-url: "Zur App zurückkehren" please-go-back: "Bitte gehe zurück zur Anwendung." error: "Sitzung ist nicht vorhanden." sign-in: "Bitte melde dich an." common/views/pages/explore.vue: - verified-users: "Verifizierter Benutzer" + pinned-users: "Vorgeschlagen" + popular-users: "Beliebt" + recently-updated-users: "Kürzlich aktiv" + recently-registered-users: "Neue Benutzer" + popular-tags: "Beliebte Tags" + federated: "Aus dem Fediverse" + explore: "{host} erkunden" + users-info: "Momentan sind {users} Nutzer hier registriert" +common/views/components/url-preview.vue: + enable-player: "Player öffnen" + disable-player: "Player schließen" +common/views/components/user-list.vue: + no-users: "Keine Benutzer" common/views/components/games/reversi/reversi.vue: matching: waiting-for: "Warten auf {}" cancel: "Abbrechen" common/views/components/games/reversi/reversi.game.vue: surrender: "Aufgeben" + surrendered: "durch Aufgabe" + is-llotheo: "Der niedrigere gewinnt (Llotheo)" + looped-map: "Spielbrettenden verbinden" + can-put-everywhere: "Setzen ist überall erlaubt" common/views/components/games/reversi/reversi.index.vue: title: "Misskey Reversi" sub-title: "Spiele Reversi mit deinen Freunden!" @@ -224,7 +359,14 @@ common/views/components/games/reversi/reversi.room.vue: black-or-white: "Schwarz/Weiß" black-is: "Schwarz ist {}" rules: "Regeln" + is-llotheo: "Der niedrigere gewinnt (Llotheo)" + looped-map: "Spielbrettenden verbinden" + can-put-everywhere: "Setzen ist überall erlaubt" + settings-of-the-bot: "Bot-Einstellungen" + this-game-is-started-soon: "Spiel beginnt gleich" waiting-for-other: "Warte auf den Gegner" + waiting-for-me: "Warten, bis du bereit bist" + waiting-for-both: "Vorbereiten…" cancel: "Abbrechen" ready: "Bereit" common/views/components/connect-failed.vue: @@ -255,10 +397,13 @@ common/views/components/media-banner.vue: sensitive: "Dieser Inhalt ist NSFW" click-to-show: "Klicke zum den Inhalt anzusehen" common/views/components/theme.vue: + theme: "Design" light-theme: "Thema" dark-theme: "Thema während des Nachtmodus" light-themes: "Helles Thema" dark-themes: "Dunkles Thema" + install-a-theme: "Design wird installiert" + theme-code: "Design-Quelltext" install: "Anwenden" installed: "\"{}\" wurde installiert" create-a-theme: "Thema erstellen" @@ -269,24 +414,39 @@ common/views/components/theme.vue: base-theme: "Basisthema" base-theme-light: "Hell" base-theme-dark: "Dunkel" + find-more-theme: "Mehr Designs finden" theme-name: "Name des Themas" preview-created-theme: "Vorschau" invalid-theme: "Thema ist ungültig" already-installed: "Thema ist bereits installiert" + saved: "Gespeichert" + manage-themes: "Designs verwalten" + builtin-themes: "Standard-Designs" + my-themes: "Meine Designs" + installed-themes: "Installierte Designs" + select-theme: "Design wählen" + uninstall: "Deinstallieren" + uninstalled: "„{}“ wurde deinstalliert" author: "Autor" desc: "Beschreibung" export: "Exportieren" import: "Importieren" + import-by-code: "oder Quelltext einfügen" + theme-name-required: "Design-Name ist erforderlich" common/views/components/cw-button.vue: + hide: "Ausblenden" + show: "Mehr" + chars: "{count} Zeichen" + files: "{count} Dateien" poll: "Umfrage" common/views/components/messaging.vue: search-user: "Einen Nutzer suchen" you: "Du" no-history: "Keine Chronik" + user: "Benutzer" + group: "Gruppen" common/views/components/messaging-room.vue: - empty: "Keine Unterhaltungen" no-history: "Keine weitere Chronik vorhanden" - resize-form: "Ziehen um die Größe zu verändern" new-message: "Neue Nachricht" common/views/components/messaging-room.form.vue: input-message-here: "Nachricht hier eingeben" @@ -306,12 +466,28 @@ common/views/components/nav.vue: develop: "Entwickler" feedback: "Feedback" common/views/components/note-menu.vue: + mention: "Erwähnungen" + detail: "Details" + copy-content: "Inhalt kopieren" + copy-link: "Link kopieren" favorite: "Diesen Beitrag favorisieren" unfavorite: "Aus Favoriten entfernen" + watch: "Beobachten" + unwatch: "Nicht mehr beobachten" pin: "An die Profilseite pinnen" + unpin: "Lösen" delete: "Löschen" delete-confirm: "Diesen Beitrag löschen?" remote: "Auf Quelle anzeigen" +common/views/components/user-menu.vue: + mention: "Erwähnungen" + mute: "Stummschalten" + unmute: "Stummschaltung aufheben" + mute-confirm: "Bist du sicher, dass du diesen Nutzer stummschalten möchtest?" + unmute-confirm: "Stummschaltung für diesen Nutzer aufheben?" + block: "Sperren" + unblock: "Sperrung aufheben" + block-confirm: "Diesen Nutzer wirklich sperren?" common/views/components/poll.vue: vote-to: "Stimme für '{}'" vote-count: "{} Stimmen" @@ -389,6 +565,14 @@ common/views/components/profile-editor.vue: export-targets: user-lists: "Listen" enter-password: "Bitte Passwort eingeben" +common/views/components/user-group-editor.vue: + invite: "Einladen" +common/views/components/user-lists.vue: + user-lists: "Listen" +common/views/components/user-groups.vue: + user-groups: "Gruppen" + owned-groups: "Meine Gruppen" + invites: "Einladen" common/views/widgets/broadcast.vue: fetching: "Laden" no-broadcasts: "Keine Broadcasts" @@ -398,6 +582,7 @@ common/views/widgets/photo-stream.vue: title: "Fotostream" no-photos: "Keine Fotos" common/views/widgets/posts-monitor.vue: + title: "Beitrags-Aktivität" toggle: "Sicht umschalten" common/views/widgets/server.vue: title: "Serverinformationen" @@ -485,7 +670,7 @@ desktop/views/components/followers.vue: desktop/views/components/following.vue: empty: "Du folgst niemanden" desktop/views/components/home.vue: - done: "Verbunden" + done: "Beenden" add-widget: "Widget hinzufügen:" add: "Hinzufügen" desktop/views/input-dialog.vue: @@ -500,6 +685,7 @@ desktop/views/components/note-detail.vue: desktop/views/components/note.vue: reply: "Antworten" renote: "Anmerken" + detail: "Details" private: "Dieser Beitrag ist privat" deleted: "Dieser Beitrag wurde entfernt" desktop/views/components/notes.vue: @@ -578,6 +764,7 @@ desktop/views/components/timeline.vue: desktop/views/components/ui.header.account.vue: profile: "Dein Profil" lists: "Listen" + groups: "Gruppen" desktop/views/components/ui.header.nav.vue: game: "Spielen" desktop/views/components/ui.header.notifications.vue: @@ -586,17 +773,18 @@ desktop/views/components/ui.header.post.vue: post: "Einen neuen Post erstellen" desktop/views/components/ui.header.search.vue: placeholder: "Suchen" -desktop/views/components/user-lists-window.vue: - title: "Listen" desktop/views/components/users-list.vue: fetching: "Lade…" admin/views/dashboard.vue: drive: "Drive" admin/views/abuse.vue: + details: "Details" remove-report: "Löschen" admin/views/instance.vue: + recaptcha-preview: "Vorschau" invite: "Einladen" save: "Speichern" + saved: "Gespeichert" admin/views/charts.vue: drive: "Drive" admin/views/drive.vue: @@ -605,8 +793,6 @@ admin/views/drive.vue: delete: "Löschen" admin/views/users.vue: users: - state: - verified: "Verifizierter Benutzer" origin: local: "Lokal" admin/views/emoji.vue: @@ -618,6 +804,7 @@ admin/views/announcements.vue: save: "Speichern" remove: "Löschen" add: "Hinzufügen" + saved: "Gespeichert" admin/views/federation.vue: status: "Status" desktop/views/pages/note.vue: @@ -676,14 +863,13 @@ mobile/views/components/ui.nav.vue: notifications: "Benachrichtigungen" search: "Suchen" user-lists: "Listen" + user-groups: "Gruppen" game: "Spielen" about: "Über" mobile/views/pages/drive.vue: contextmenu: upload: "Eine Datei hochladen" create-folder: "Ein Verzeichnis erstellen" -mobile/views/pages/user-lists.vue: - title: "Listen" mobile/views/pages/home.vue: home: "Home" local: "Lokal" @@ -737,6 +923,7 @@ dev/views/new-app.vue: authority-desc: "Nur die hier eingetragenen Berechtigungen, werden per API zur Verfügung stehen." authority-warning: "Dies kann auch nach dem erstellen der Anwendung geändert werden, allerdings werden dann alle bisher generierten Token ungültig." pages: + like: "Gefällt mir" blocks: post: "\"Neuer Beitrag\"-Formular" script: diff --git a/locales/en-US.yml b/locales/en-US.yml index 4293b81d0..c36550b8c 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -251,9 +251,9 @@ common: update-available-title: "Update available" update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates." my-token-regenerated: "Your token has been regenerated, so you will be signed out." - verified-user: "Verified account" hide-password: "Hide Password" show-password: "Show Password" + enter-username: "Enter user name" do-not-use-in-production: "This is a development build. Do not use in production." user-suspended: "This user has been suspended." is-remote-user: "The information about this user may not be entirely complete." @@ -319,7 +319,7 @@ auth/views/index.vue: error: "Session does not exist." sign-in: "Please sign in." common/views/pages/explore.vue: - verified-users: "Official accounts" + pinned-users: "Higlighted users" popular-users: "Popular users" recently-updated-users: "Recently active users" recently-registered-users: "Users who joined recently" @@ -449,18 +449,23 @@ common/views/components/messaging.vue: search-user: "Find a user" you: "You" no-history: "Without history" + user: "User" + group: "Group" + start-with-user: "Start chatting with a user" + start-with-group: "Start a group and chat" + select-group: "Select a group" common/views/components/messaging-room.vue: - empty: "No conversations" + not-talked-user: "You have not talked to this user yet" + not-talked-group: "There is no conversation in this group" no-history: "There is no further history" - resize-form: "Drag to resize" new-message: "New message" - only-one-file-attached: "Only ONE file can be attached to a message." + only-one-file-attached: "You can only attach one file to a message" common/views/components/messaging-room.form.vue: input-message-here: "Enter message here" send: "Send" attach-from-local: "Attach files from your device" attach-from-drive: "Attach files from your Drive" - only-one-file-attached: "Only one file can be attached to the message." + only-one-file-attached: "You can only attach one file to a message" common/views/components/messaging-room.message.vue: is-read: "Read" deleted: "This message has been deleted" @@ -473,6 +478,7 @@ common/views/components/nav.vue: repository: "Repository" develop: "Developers" feedback: "Feedback" + tos: "Terms Of Service" common/views/components/note-menu.vue: mention: "Mention" detail: "Details" @@ -544,6 +550,7 @@ common/views/components/poll-editor.vue: day: "S" common/views/components/reaction-picker.vue: choose-reaction: "Send a reaction" + input-reaction-placeholder: "or input Emoji" common/views/components/emoji-picker.vue: custom-emoji: "Custom Emoji" people: "People" @@ -585,6 +592,8 @@ common/views/components/signup.vue: password-matched: "OK" password-not-matched: "Doesn't match" recaptcha: "Verification" + agree-to: "Accept {0}." + tos: "Terms Of Service" create: "Create an Account" some-error: "An attempt at account creation has failed for some reason. Please try again." common/views/components/special-message.vue: @@ -692,9 +701,30 @@ common/views/components/user-list-editor.vue: remove-user: "Remove from this list" delete-are-you-sure: "Delete list \"$1\"?" deleted: "Deleted successfully" + add-user: "Add a user" +common/views/components/user-group-editor.vue: + users: "Members" + rename: "Rename group" + delete: "Delete group" + transfer: "transfer group" + transfer-are-you-sure: "Are you sure you want to add @$2 to the group $1?" + remove-user: "Remove a user from this group" + deleted: "Deleted" + invite: "Invite" + invited: "The invitation was successfully sent" common/views/components/user-lists.vue: + user-lists: "Lists" create-list: "Create a list" list-name: "List name" +common/views/components/user-groups.vue: + user-groups: "Group" + create-group: "Create a group" + group-name: "Group name" + owned-groups: "My groups" + joined-groups: "Membership in groups" + invites: "Invite" + accept-invite: "Join" + reject-invite: "Decline" common/views/widgets/broadcast.vue: fetching: "Checking" no-broadcasts: "No announcements" @@ -756,6 +786,10 @@ common/views/pages/follow.vue: request-pending: "Pending follow request" follow-processing: "Processing follow" follow-request: "Follow request" +common/views/pages/follow-requests.vue: + received-follow-requests: "Follow requests" + accept: "Accept" + reject: "Reject" desktop: banner-crop-title: "Crop the part that appears as a banner" banner: "Banner" @@ -772,7 +806,7 @@ desktop/views/components/activity.chart.vue: total: "Black ... Total" notes: "Blue ... Notes" replies: "Red ... Replies" - renotes: "Green ... Repost" + renotes: "Green ... Renotes" desktop/views/components/activity.vue: title: "Activity" toggle: "Toggle views" @@ -869,7 +903,7 @@ desktop/views/components/note-detail.vue: private: "Post is private" deleted: "Post has been removed" location: "Location" - renote: "Repost" + renote: "Renote" add-reaction: "Add a reaction" undo-reaction: "Reverse reaction" desktop/views/components/note.vue: @@ -893,10 +927,10 @@ desktop/views/components/post-form.vue: quote-placeholder: "Quote this Post..." submit: "Post" reply: "Reply" - renote: "Repost" + renote: "Renote" posted: "Posted!" replied: "Replied!" - reposted: "Reposted!" + reposted: "Renoted!" note-failed: "Failed to post" reply-failed: "Failed to reply" renote-failed: "Failed to Renote" @@ -924,13 +958,13 @@ desktop/views/components/progress-dialog.vue: desktop/views/components/renote-form.vue: quote: "Quote..." cancel: "Cancel" - renote: "Repost" + renote: "Renote" renote-home: "Renote (Home)" reposting: "Renoting..." - success: "Reposted!" - failure: "Failed to Repost" + success: "Renoted!" + failure: "Failed to Renote" desktop/views/components/renote-form-window.vue: - title: "Do you want to Renote it?" + title: "Do you want to renote it?" desktop/views/pages/user-following-or-followers.vue: following: "{user}'s following" followers: "{user}'s follower" @@ -1027,6 +1061,7 @@ desktop/views/components/ui.header.vue: desktop/views/components/ui.header.account.vue: profile: "Your profile" lists: "Lists" + groups: "Group" follow-requests: "Follow requests" admin: "Admin" desktop/views/components/ui.header.nav.vue: @@ -1037,12 +1072,6 @@ desktop/views/components/ui.header.post.vue: post: "Compose new Post" desktop/views/components/ui.header.search.vue: placeholder: "Search" -desktop/views/components/received-follow-requests-window.vue: - title: "Follow requests" - accept: "Accept" - reject: "Reject" -desktop/views/components/user-lists-window.vue: - title: "User lists" desktop/views/components/user-preview.vue: notes: "Posts" following: "Following" @@ -1064,7 +1093,6 @@ admin/views/index.vue: users: "Users" federation: "Federation" announcements: "Announcements" - hashtags: "Hashtags" abuse: "Abuse" queue: "Job Queue" logs: "Logs" @@ -1091,14 +1119,26 @@ admin/views/instance.vue: instance-name: "Instance name" instance-description: "Instance description" host: "Host" + icon-url: "URL of the icon" + logo-url: "URL of the logo" banner-url: "Banner image URL" error-image-url: "Error image URL" languages: "Language of this instance" languages-desc: "You can add more than one, separated by spaces." + tos-url: "Terms of Service URL" + repository-url: "Repository URL" + feedback-url: "URL for feedback" maintainer-config: "Administrator information" maintainer-name: "Administrator name" maintainer-email: "Contact Administrator" + advanced-config: "Other settings" drive-config: "Drive settings" + object-storage-base-url: "URL" + object-storage-endpoint: "Endpoint" + object-storage-port: "Port" + object-storage-access-key: "Access Key" + object-storage-secret-key: "Secret Key" + object-storage-use-ssl: "Use SSL" cache-remote-files: "Cache remote files" cache-remote-files-desc: "Without this parameter, all remote files are linked to their host server directly. This will be an effective solution to save your server storage, however make remote files invisible to users who set direct-link disabled, since no thumbnail will be generated, increase traffic. It is recommended that this parameter set enabled." local-drive-capacity-mb: "Volume of Drive per user" @@ -1107,8 +1147,8 @@ admin/views/instance.vue: recaptcha-config: "the reCAPTCHA settings" recaptcha-info: "reCAPTCHA token is required. Please get it on https://www.google.com/recaptcha/intro/" enable-recaptcha: "enable reCAPTCHA" - recaptcha-site-key: "reCAPTCHA site key" - recaptcha-secret-key: "reCAPTCHA secret key" + recaptcha-secret-key: "Secret Key" + recaptcha-preview: "Preview" twitter-integration-config: "Settings of connecting to Twitter" twitter-integration-info: "The callback URL is set on {url}." enable-twitter-integration: "Enable connection to Twitter" @@ -1139,7 +1179,7 @@ admin/views/instance.vue: invite: "Invite" save: "Save" saved: "Saved" - user-recommendation-config: "Recommended users" + pinned-users: "Higlighted user" email-config: "Email server settings" email-config-info: "Used to confirm email and password reset etc." enable-email: "Enable email delivery" @@ -1223,14 +1263,10 @@ admin/views/users.vue: silence-confirm: "Silence user?" unmake-silence: "Unsilence" unsilence-confirm: "Are you certain that you want to stop silencing this user?" - verify: "Verify account" - verify-confirm: "Do you want this to be a verified account?" - verified: "The account is now being verified" - unverify: "Unverify account" - unverify-confirm: "Do you want to remove the 'verified account' designation?" - unverified: "The account is now being unverified" update-remote-user: "Update information about remote user" remote-user-updated: "The information regarding the remote user has been updated." + delete-all-files: "Delete all files" + delete-all-files-confirm: "Are you sure that you want to delete all files?" users: title: "Users" sort: @@ -1245,7 +1281,6 @@ admin/views/users.vue: admin: "Administrator" moderator: "Moderator" adminOrModerator: "Admin/Moderator" - verified: "Verified account" silenced: "Already silenced" suspended: "Suspended" origin: @@ -1307,6 +1342,7 @@ admin/views/federation.vue: latest-request-received-at: "Last request received at" remove-all-following: "Withold all followers" remove-all-following-info: "Unfollow all accounts from {host}. Please run this if the instance no longer exists." + delete-all-files: "Remove all files" block: "Block" marked-as-closed: "Marked as closed" lookup: "Look up" @@ -1353,6 +1389,7 @@ admin/views/federation.vue: chart-spans: hour: "Hourly" day: "Daily" + blocked-hosts: "Blocking" desktop/views/pages/welcome.vue: about: "More details..." timeline: "Timeline" @@ -1509,6 +1546,7 @@ mobile/views/components/ui.nav.vue: follow-requests: "Follow requests" search: "Search" user-lists: "Lists" + user-groups: "Group" widgets: "Widgets" game: "Games" admin: "Admin" @@ -1521,8 +1559,6 @@ mobile/views/pages/drive.vue: rename-folder: "Rename folder" move-folder: "Move this folder" delete-folder: "Delete this folder" -mobile/views/pages/user-lists.vue: - title: "Lists" mobile/views/pages/signup.vue: lets-start: "Your account is now ready! 📦" mobile/views/pages/followers.vue: @@ -1547,10 +1583,6 @@ mobile/views/pages/widgets/activity.vue: activity: "Activity" mobile/views/pages/share.vue: share-with: "Share on {name}" -mobile/views/pages/received-follow-requests.vue: - title: "Follow requests" - accept: "Accept" - reject: "Reject" mobile/views/pages/note.vue: title: "Post" prev: "Previous note" @@ -1656,6 +1688,10 @@ pages: edit-this-page: "Edit this page" view-source: "View Source" view-page: "View page" + like: "Like" + unlike: "Unlike" + liked-pages: "Favorite pages" + my-pages: "My pages" inspector: "Inspector" content: "Page block" variables: "Variables" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 5d7d1214f..1938d10e8 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -12,7 +12,9 @@ common: rich-contents: "Posts" rich-contents-desc: "Escribe sobre tus pensamientos, eventos, todo lo que quieras compartir. Si es necesario, puedes usar varias sintaxis, decorar tus posts y añadir tus imágenes favoritas, archivos de viddeo y encuestas." reaction: "Reacciones" + reaction-desc: "La forma mas facil de expresar tus emociones. Misskey te permite añadir varios tipos de reacciones a los posts de otros usuarios. La emperiencia emocional en Misskey nunca será igual que en otra red social, donde solo puedes poner \"likes\"." ui: "Interfaz" + ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio." drive: "Drive" adblock: detected: "Por favor, desactive el bloqueador de publicidad." @@ -55,6 +57,7 @@ common: month-and-day: "{day} de {month}" trash: "Papelera" drive: "Drive" + pages: "Páginas" messaging: "Conversación" home: "Inicio" deck: "Deck" @@ -70,8 +73,12 @@ common: "write:blocks": "Editar bloques" "read:favorites": "Ver favoritos" "write:favorites": "Editar favoritos" + "read:following": "Ver información de seguidor" "read:messaging": "Ver conversación" + "read:mutes": "Ver silenciados" + "write:notes": "Crear y eliminar articulos" "read:notifications": "Ver notificaciones" + "read:reactions": "Ver reacciones" "write:votes": "Vota" weekday-short: sunday: "domingo" @@ -136,8 +143,11 @@ common: default-note-visibility: "Rango de publicación predeterminado" web-search-engine: "Buscador web" web-search-engine-desc: "Ejemplo: https://www.google.com/?#q={{query}}" + this-setting-is-this-device-only: "Solo para este dispositivo" use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo" line-width: "Grosor de línea" + line-width-thin: "Fino" + line-width-normal: "Normal" line-width-thick: "Grosor" font-size: "Tamaño del texto" font-size-x-small: "Muy pequeño" @@ -162,13 +172,20 @@ common: wallpaper: "Fondo de pantalla" choose-wallpaper: "Escoge un fondo de pantalla" delete-wallpaper: "Quitar fondo de pantalla" + post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo" show-clock-on-header: "Muestra el reloj en la parte superior derecha" + show-reply-target: "Mostrar destinatario de la mención" timeline: "Timeline" + show-my-renotes: "Mostrar mis renotes en la timeline" + show-renoted-my-notes: "Mostrar renotes de mis posts en la timeline" sound: "Sonido" enable-sounds: "Habilitar sonido" volume: "Volúmen" test: "Prueba" + update: "Actualizar Misskey" version: "Versión" + latest-version: "Última versión" + update-checking: "Buscando actualizaciones" no-updates: "No hay actualizaciones disponibles" no-updates-desc: "Tu Misskey está actualizado" update-available: "¡Una nueva versión está disponible!" @@ -178,18 +195,36 @@ common: search: "Buscar" delete: "eliminar" loading: "cargando" + ok: "Confirmar" + cancel: "Cancelar" update-available-title: "Actualización disponible" update-available: "Hay disponible una nueva versión de Misskey ({newer}, la versión actual es {current}). Refresca la página para aplicar las actualizaciones." my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado." - verified-user: "Cuenta verificada" + hide-password: "Ocultar contraseña" + show-password: "Mostrar contraseña" do-not-use-in-production: "Esto está en desarrollo, no usarlo para producción." + user-suspended: "Este usuario ha sido suspendido" + is-remote-user: "La información sobre este usuario puede no estar completa" + is-remote-post: "Es una publicación remota" + view-on-remote: "Consultar el perfil completo" + renoted-by: "Renotado por {user}" + no-notes: "No hay publicaciones" + turn-on-darkmode: "Cambiar a modo oscuro" + turn-off-darkmode: "Modo claro" + error: + title: "Se ha producido un problema :(" + retry: "Inténtalo otra vez" reversi: drawn: "Empatado" my-turn: "Mi turno" opponent-turn: "Turno del oponente" + turn-of: "Turno de {name}" + past-turn-of: "Turno de {name}" + won: "{name} ha ganado" black: "Negro" white: "Blanco" total: "Total" + this-turn: "Turno {count}" widgets: analog-clock: "Reloj analógico" profile: "Perfil" @@ -212,8 +247,12 @@ common: nav: "Navegación" tips: "Consejos" hashtags: "Etiquetas" + queue: "En cola" + dev: "Se ha producido un error creando la aplicación. Intentelo de nuevo." + ai-chan-kawaii: "Ai-chan es muy mona!" you: "Tú" auth/views/form.vue: + share-access: "¿Deseas permitir a {name} acceder a tu cuenta?" permission-ask: "La aplicación requiere los siguientes permisos:" cancel: "Cancelar" accept: "Garantizar acceso." @@ -228,7 +267,18 @@ auth/views/index.vue: error: "Esta sesión no existe." sign-in: "Por favor inicia sesión." common/views/pages/explore.vue: - verified-users: "Cuenta verificada" + popular-users: "Usuarios populares" + recently-updated-users: "Usuarios activos recientemente" + recently-registered-users: "Usuarios que se han unido recientemente" + popular-tags: "Etiquetas populares" + federated: "Desde el fediverso" + explore: "Explorar {host}" + users-info: "Actualmente hay {users} registrados aquí" +common/views/components/url-preview.vue: + enable-player: "Activar reproducción" + disable-player: "Cerrar el reproductor" +common/views/components/user-list.vue: + no-users: "No hay usuarios." common/views/components/games/reversi/reversi.vue: matching: waiting-for: "Esperando por {}" @@ -244,6 +294,7 @@ common/views/components/games/reversi/reversi.index.vue: sub-title: "¡Juega Reversi con tus amigos!" invite: "Invitar" rule: "Cómo jugar" + rule-desc: "Reversi es un juego de estrategia para dos jugadores, el cual se juega en un tablero de 8x8. Hay 64 fichas llamadas discos, las cuales son claras de un lado y oscuras del otro. Los jugadores toman turnos colocando fichas en el tablero con su color asignado mirando hacia arriba. Durante una jugada, cualquier disco del color del oponente que esté en fila entre un disco del oponente y otro del mismo color, será volteado para tener el color del jugador que haya hecho la movida. El objetivo del juego es tener la mayoría de los discos de tu color cuando el último cuadro es llenado." mode-invite: "Invitar" mode-invite-desc: "Invitar un usuario al juego." invitations: "¡Has recibido una invitación!" @@ -300,23 +351,40 @@ common/views/components/media-banner.vue: click-to-show: "Click para mostrar" common/views/components/theme.vue: theme: "Tema" + light-theme: "Tema a usar en Light mode" + dark-theme: "Tema a usar en dark mode" light-themes: "Tema claro" dark-themes: "Tema oscuro" install-a-theme: "Instalar tema" theme-code: "Código del tema" install: "Instalación" + installed: "\"{}\" se ha instalado" + create-a-theme: "Crear tema" + save-created-theme: "Guardar tema" primary-color: "Color primario" secondary-color: "Color secundario" + text-color: "Color del texto" base-theme: "Tema base" base-theme-light: "Claro" base-theme-dark: "Oscuro" + find-more-theme: "Obtener más temas" theme-name: "Nombre del tema" preview-created-theme: "Vista previa" + invalid-theme: "No es un tema válido" + already-installed: "Este tema ya está instalado." + saved: "Guardado" + manage-themes: "Gestor de temas" + builtin-themes: "Temas estandar" my-themes: "Mis temas" installed-themes: "Temas instalados" + select-theme: "Elegir tema" uninstall: "Desinstalar" + uninstalled: "\"{}\" ha sido desinstalado" + author: "Autor" + desc: "Descripción" export: "Exportar" import: "Importar" + import-by-code: "o pega el código" common/views/components/cw-button.vue: show: "Mostrar" chars: "{count} letras" @@ -327,17 +395,13 @@ common/views/components/messaging.vue: you: "Tu" no-history: "Sin historial" common/views/components/messaging-room.vue: - empty: "Sin conversaciones" no-history: "El historial se ha acabado" - resize-form: "Arrastra para redimensionar" new-message: "Nuevo mensaje" - only-one-file-attached: "Un único archivo se puede conectar al mensaje" common/views/components/messaging-room.form.vue: input-message-here: "Escribe el mensaje aquí" send: "Enviar" attach-from-local: "Adjunta ficheros desde tu PC" attach-from-drive: "Adjunta ficheros desde tu disco" - only-one-file-attached: "Un único archivo se puede conectar al mensaje" common/views/components/messaging-room.message.vue: is-read: "Leer" deleted: "El mensaje se ha borrado" @@ -430,10 +494,25 @@ common/views/components/stream-indicator.vue: connected: "Conectado" common/views/components/notification-settings.vue: title: "Notificaciones" +common/views/components/integration-settings.vue: + title: "Integraciones" + connect: "Conectar" + disconnect: "Desconectarse" + connected-to: "Estas conectado a la siguiente cuenta" common/views/components/github-setting.vue: + description: "Una vez conectada tu cuenta de GitHub a Misskey podrás ver la información sobre tu perfil de GitHub y además podrás registrarte mediante tu cuenta de GitHub." + connected-to: "Estas conectado a esta cuenta de GitHub" detail: "Ver detalles..." + reconnect: "Reconectar" + connect: "Vincular tu cuenta de GitHub" + disconnect: "Desconectarse" common/views/components/discord-setting.vue: + description: "Una vez conectada tu cuenta de Discord a Misskey podrás ver la información sobre tu perfil de Discord y además podrás registrarte mediante tu cuenta de Discord." + connected-to: "Estas conectado a esta cuenta de Discord" detail: "Ver detalles..." + reconnect: "Reconectar" + connect: "Vincular tu cuenta de Discord" + disconnect: "Desconectarse" common/views/components/uploader.vue: waiting: "Un momento" common/views/components/visibility-chooser.vue: @@ -445,29 +524,72 @@ common/views/components/visibility-chooser.vue: specified: "Directo" specified-desc: "Publica solo para los seguidores que quieras" local-public: "Público (sólo local)" + local-public-desc: "No publicar para remoto" local-home: "Inicio (sólo local)" local-followers: "Seguidores (sólo local)" +common/views/components/trends.vue: + count: "{} usuarios mencionados" + empty: "Ninguna tendencia popular ahora" +common/views/components/language-settings.vue: + title: "Mostrar idioma" + pick-language: "Selecciona un idioma" + recommended: "Recomendado" + auto: "Automático" + specify-language: "Especifica el idioma" + info: "Necesitas recargar la página para que los cambios tengan efecto." common/views/components/profile-editor.vue: title: "Perfil" name: "Nombre" account: "Cuenta" + location: "Localización" + description: "Acerca de mí" + you-can-include-hashtags: "También puedes incluir hashtags en la descripción de tu perfil." + language: "Idioma" + birthday: "Fecha de nacimiento" avatar: "Avatar" banner: "Banner" is-cat: "Esta cuenta es un gato" is-bot: "Esta cuenta es un bot" + is-locked: "Las peticiones de seguimiento necesitan aprobación" + careful-bot: "Las peticiones de seguimiento de bots necesitan aprobación" + auto-accept-followed: "Aprobar automaticamente las peticiones de follow de gente a la que sigues" + advanced: "Otros" + privacy: "Privacidad" save: "Guardar" + saved: "Perfil actualizado con exito" + uploading: "Subiendo" + upload-failed: "Error al subir" + email: "Preferencias de correo" email-address: "Correo electrónico" + email-verified: "Tu cuenta de correo ha sido verificada." + email-not-verified: "Tu cuenta de correo no está verificada. Por favor comprueba tu bandeja de entrada." export: "Exportar" import: "Importar" + export-and-import: "Exportar/Importar" export-targets: + all-notes: "Todas las notas publicadas" + following-list: "Seguidores" mute-list: "Silenciar" blocking-list: "Bloquear" user-lists: "Listas" + export-requested: "Has solicitado una exportación. Esto puede tardar un rato. Después de que termine la exportación el archivo se añadirá al drive." + import-requested: "Has empezado una importación. Esto puede tardar un rato." enter-password: "Escribe una contraseña" + danger-zone: "Zona de peligro" + delete-account: "Eliminar cuenta" + account-deleted: "Esta cuenta ha sido eliminada. Puede tardar un rato hasta que toda la información desaparazca." common/views/components/user-list-editor.vue: users: "Usuarios" + rename: "Cambiar el nombre de la lista" + delete: "Eliminar lista" + remove-user: "Eliminar de la lista" +common/views/components/user-group-editor.vue: + invite: "Invitar" common/views/components/user-lists.vue: + user-lists: "Listas" list-name: "Nombre de lista" +common/views/components/user-groups.vue: + invites: "Invitar" common/views/widgets/broadcast.vue: fetching: "Recuperando" no-broadcasts: "Sin emisión" @@ -526,6 +648,8 @@ common/views/pages/follow.vue: request-pending: "Solicitud pendiente" follow-processing: "Solicitud en proceso" follow-request: "Solicitar suscripción" +common/views/pages/follow-requests.vue: + received-follow-requests: "Solicitudes de seguimiento" desktop: banner-crop-title: "Corta la parte que aparece como un banner" banner: "Banner" @@ -769,12 +893,6 @@ desktop/views/components/ui.header.post.vue: post: "Crear una publicación" desktop/views/components/ui.header.search.vue: placeholder: "Buscar" -desktop/views/components/received-follow-requests-window.vue: - title: "Solicitudes de seguidores" - accept: "Aceptar" - reject: "Rechazar" -desktop/views/components/user-lists-window.vue: - title: "Listas de usuario" desktop/views/components/user-preview.vue: notes: "Publicaciones" following: "Sigue" @@ -788,24 +906,45 @@ admin/views/index.vue: instance: "Instancia" moderators: "Moderadores" users: "Usuarios" - hashtags: "Hashtags" + federation: "Federado" + queue: "Cola de trabajos" + logs: "Registros" back-to-misskey: "Volver a Misskey" admin/views/dashboard.vue: dashboard: "Panel de Control" accounts: "Cuenta" + notes: "Publicaciones" drive: "Drive" instances: "Instancias" this-instance: "Esta instancia" + federated: "Federado" +admin/views/queue.vue: + title: "Cola" + remove-all-jobs: "Limpiar todos los trabajos pendientes" admin/views/abuse.vue: + title: "Abuso" + target: "Destinatario" + reporter: "Informador" details: "Detalles" remove-report: "eliminar" admin/views/instance.vue: instance: "Instancia" instance-name: "Nombre de la instancia" + instance-description: "Descripción de la instancia" host: "Host" - recaptcha-secret-key: "clave secreta reCAPTCHA" + banner-url: "URL de la imagen de banner" + error-image-url: "Error en la URL de la imagen" + languages: "Idioma de esta instancia" + languages-desc: "Puedes añadir mas de uno, separado por espacios." + maintainer-config: "Información del administrador" + maintainer-name: "Nombre del administrador" + maintainer-email: "Contactar con el administrador" + drive-config: "Ajustes del Drive" + cache-remote-files: "Mantener en cache los archivos remotos" + recaptcha-preview: "Vista previa" invite: "Invitar" save: "Guardar" + saved: "Guardado" email: "Correo electrónico" smtp-host: "Host SMTP" smtp-port: "Puerto SMTP" @@ -834,7 +973,6 @@ admin/views/users.vue: state: all: "Todo" moderator: "Moderadores" - verified: "Cuenta verificada" origin: local: "Local" admin/views/emoji.vue: @@ -846,12 +984,14 @@ admin/views/announcements.vue: save: "Guardar" remove: "eliminar" add: "Agregar" + saved: "Guardado" admin/views/federation.vue: instance: "Instancia" host: "Host" following: "Siguiendo" status: "Estado" block: "Bloquear" + instances: "Federado" states: all: "Todo" blocked: "Bloquear" @@ -859,6 +999,7 @@ admin/views/federation.vue: chart-spans: hour: "Por hora" day: "Por día" + blocked-hosts: "Bloquear" desktop/views/pages/selectdrive.vue: cancel: "Cancelar" desktop/views/pages/user-list.users.vue: @@ -935,8 +1076,6 @@ mobile/views/pages/drive.vue: contextmenu: upload: "Subir fichero" create-folder: "Crear una carpeta" -mobile/views/pages/user-lists.vue: - title: "Listas" mobile/views/pages/home.vue: home: "Inicio" local: "Local" @@ -947,10 +1086,6 @@ mobile/views/pages/widgets.vue: customization-tips: "Consejos de personalización" mobile/views/pages/widgets/activity.vue: activity: "Actividad" -mobile/views/pages/received-follow-requests.vue: - title: "Solicitudes de seguimiento" - accept: "Aceptar" - reject: "Rechazar" mobile/views/pages/games/reversi.vue: reversi: "Reversi" mobile/views/pages/search.vue: @@ -970,6 +1105,7 @@ deck: deck/deck.user-column.vue: activity: "Actividad" pages: + like: "Me gusta" blocks: post: "Formulario" script: diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index ae414d1ce..934f8ba4c 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -68,16 +68,23 @@ common: explore: "Découvrir" following: "Suit" followers: "Abonné·e·s" - favorites: "Mettre cette note en favoris" + favorites: "Favorites" permissions: "read:account": "Afficher les informations du compte" "write:account": "Mettre à jour les informations de votre compte" + "read:blocks": "Voir les blocs" + "write:blocks": "Écrire des blocs" "read:drive": "Parcourir le Drive" "write:drive": "Écrire sur le Drive" "read:favorites": "Afficher les favoris" + "write:favorites": "Écrire des favoris" + "read:messaging": "Lire les conversations" + "write:messaging": "Utiliser la messagerie" "write:notes": "Créer ou supprimer des publications" "read:notifications": "Afficher les notifications" + "write:notifications": "Gérer vos notifications" "read:reactions": "Lire les réactions" + "write:reactions": "Gérer vos réactions" "write:votes": "Vote" empty-timeline-info: follow-users-to-make-your-timeline: "Les utilisateurs suivants afficheront leurs publications sur votre fil." @@ -133,7 +140,7 @@ common: notification: "Notifications" apps: "Applications" tags: "Hashtags" - mute-and-block: "Silencer / Bloquer" + mute-and-block: "Silencés / Bloqués" blocking: "En cours blocage" security: "Sécurité" signin: "Historique des connexions" @@ -193,6 +200,7 @@ common: show-clock-on-header: "Afficher l'horloge sur le coté supérieur droit" timeline: "Fil d’actualité" show-my-renotes: "Afficher mes republications dans le fil" + show-renoted-my-notes: "Afficher les partages de mes propres notes sur le fil" remain-deleted-note: "Continuer à afficher les notes supprimées" sound: "Son" enable-sounds: "Activer les sons" @@ -234,9 +242,9 @@ common: update-available-title: "Mise à jour disponible" update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour." my-token-regenerated: "Votre jeton vient d’être généré, vous allez maintenant être déconnecté." - verified-user: "Compte vérifié" hide-password: "Masquer le mot de passe" show-password: "Afficher le mot de passe" + enter-username: "Saisir un nom d'utilisateur" do-not-use-in-production: "Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production." user-suspended: "Cet·te utilisateur·trice a été suspendu·e" is-remote-user: "Les informations à propos de ce compte peuvent être incomplètes." @@ -302,7 +310,6 @@ auth/views/index.vue: error: "La session n’existe pas." sign-in: "Veuillez vous connecter" common/views/pages/explore.vue: - verified-users: "Comptes vérifiés" popular-users: "Utilisateurs populaires" recently-updated-users: "Utilisateurs actifs récemment" recently-registered-users: "Les nouveaux inscrits" @@ -431,18 +438,22 @@ common/views/components/messaging.vue: search-user: "Trouver un utilisateur" you: "Vous" no-history: "Pas d'historique" + user: "Utilisateur·rice·s" + group: "Groupe" + start-with-user: "Initier une discussion avec un·e utilisateur·rice" + select-group: "Sélectionner un groupe" common/views/components/messaging-room.vue: - empty: "Pas de conversations" + not-talked-user: "Vous n'avez pas encore discuté avec cet·te utilisateur·rice" + not-talked-group: "Il n y a aucune conversation dans ce groupe" no-history: "Aucun historique" - resize-form: "Faites glisser pour redimensionner" new-message: "Nouveau message" - only-one-file-attached: "Un seul fichier peut être joint au message" + only-one-file-attached: "Vous ne pouvez joindre qu'un seul fichier au message" common/views/components/messaging-room.form.vue: input-message-here: "Tapez ici votre message" send: "Envoyer" attach-from-local: "Joindre un fichier depuis votre ordinateur" attach-from-drive: "Joindre un fichier depuis votre Drive" - only-one-file-attached: "Un seul fichier uniquement peut être joint au message" + only-one-file-attached: "Vous ne pouvez joindre qu'un seul fichier au message" common/views/components/messaging-room.message.vue: is-read: "Lu" deleted: "Ce message a été supprimé" @@ -455,6 +466,7 @@ common/views/components/nav.vue: repository: "Dépôt" develop: "Développeurs" feedback: "Suggestions" + tos: "Conditions d'utilisation" common/views/components/note-menu.vue: mention: "Mention" detail: "Détails" @@ -473,8 +485,12 @@ common/views/components/user-menu.vue: mention: "Mention" mute: "Silencier" unmute: "Enlever la sourdine" + mute-confirm: "Rendre muet cet utilisateur ?" + unmute-confirm: "Ne plus masquer cet utilisateur ?" block: "Bloquer" unblock: "Débloquer" + block-confirm: "Bloquer cet utilisateur ?" + unblock-confirm: "Débloquer cet utilisateur ?" push-to-list: "Ajouter à une liste" select-list: "Sélectionnez une liste" report-abuse: "Signaler un abus" @@ -557,6 +573,7 @@ common/views/components/signup.vue: password-matched: "OK" password-not-matched: "Les mots de passe ne correspondent pas." recaptcha: "Vérifier" + tos: "Conditions d'utilisation" create: "Créer un compte" some-error: "La création du compte a échoué. Veuillez réessayer." common/views/components/special-message.vue: @@ -664,9 +681,26 @@ common/views/components/user-list-editor.vue: remove-user: "Retirer de cette liste" delete-are-you-sure: "Voulez-vous vraiment supprimer la liste « $1 » ?" deleted: "Supprimé" + add-user: "Ajouter un utilisateur" +common/views/components/user-group-editor.vue: + rename: "Renommer le groupe" + delete: "Supprimer le groupe" + deleted: "Supprimé" + invite: "Inviter" + invited: "Invitation envoyée avec succès" common/views/components/user-lists.vue: + user-lists: "Listes" create-list: "Créer une liste" list-name: "Nom de la liste" +common/views/components/user-groups.vue: + user-groups: "Groupe" + create-group: "Créer un groupe" + group-name: "Nom du groupe" + owned-groups: "Mes groupes" + joined-groups: "Membre dans les groupes" + invites: "Inviter" + accept-invite: "Participer" + reject-invite: "Refuser" common/views/widgets/broadcast.vue: fetching: "Récupération" no-broadcasts: "Aucune annonce" @@ -727,6 +761,10 @@ common/views/pages/follow.vue: request-pending: "Demande d’abonnement en attente" follow-processing: "Demande en attente" follow-request: "Demande d’abonnement" +common/views/pages/follow-requests.vue: + received-follow-requests: "Demandes d’abonnement" + accept: "Accepter" + reject: "Refuser" desktop: banner-crop-title: "Découpez la partie qui apparaîtra comme bannière" banner: "Bannière" @@ -998,6 +1036,7 @@ desktop/views/components/ui.header.vue: desktop/views/components/ui.header.account.vue: profile: "Votre profil" lists: "Listes" + groups: "Groupes" follow-requests: "Demandes d’abonnement" admin: "Admin" desktop/views/components/ui.header.nav.vue: @@ -1008,12 +1047,6 @@ desktop/views/components/ui.header.post.vue: post: "Rédiger une nouvelle publication" desktop/views/components/ui.header.search.vue: placeholder: "Chercher" -desktop/views/components/received-follow-requests-window.vue: - title: "Demandes d’abonnement" - accept: "Accepter" - reject: "Refuser" -desktop/views/components/user-lists-window.vue: - title: "Listes de l'utilisateur" desktop/views/components/user-preview.vue: notes: "Publications" following: "Abonné à" @@ -1032,10 +1065,9 @@ admin/views/index.vue: instance: "Instance" emoji: "Émoji" moderators: "Modérateurs" - users: "Utilisateurs" + users: "Utilisateur·rice·s" federation: "Fédération" announcements: "Annonces" - hashtags: "Hashtags" abuse: "Abus" queue: "File d’attente" logs: "Journaux" @@ -1062,14 +1094,26 @@ admin/views/instance.vue: instance-name: "Nom de l’instance" instance-description: "Description de l’instance" host: "Hôte" + icon-url: "URL de l'icône" + logo-url: "URL do logo" banner-url: "URL de l’image de la bannière" error-image-url: "URL de l’image d’erreur" languages: "Langue de l’instance" languages-desc: "Vous pouvez en définir plus d’une, séparées par des espaces." + tos-url: "URL des conditions d'utilisation" + repository-url: "URL du dépôt" maintainer-config: "Informations de l’administrateur" maintainer-name: "Nom de l’administrateur" maintainer-email: "Contact administratif" + advanced-config: "Autres réglages" drive-config: "Paramètres du lecteur" + object-storage-base-url: "URL" + object-storage-endpoint: "Point de terminaison" + object-storage-port: "Port" + object-storage-access-key: "Clé d'accès" + object-storage-secret-key: "Clé secrète" + object-storage-use-ssl: "Utiliser SSL" + object-storage-s3-info-here: "ici" cache-remote-files: "Mettre en cache des fichiers distants" local-drive-capacity-mb: "Volume du lecteur par utilisateur" remote-drive-capacity-mb: "Volume du lecteur par utilisateur distant" @@ -1077,8 +1121,9 @@ admin/views/instance.vue: recaptcha-config: "Paramètres de reCAPTCHA" recaptcha-info: "Si activé, un jeton reCAPTCHA est requis. Vous pouvez en obtenir un sur https://www.google.com/recaptcha/intro/" enable-recaptcha: "Activation de reCAPTCHA" - recaptcha-site-key: "Clé reCAPTCHA du site" - recaptcha-secret-key: "Clé secrète reCAPTCHA" + recaptcha-secret-key: "Clé secrète" + recaptcha-preview: "Prévisualisation" + hidden-tags: "Tags cachés" twitter-integration-config: "Paramètres de connexion à Twitter" twitter-integration-info: "L'URL de callback est {url}." enable-twitter-integration: "Activer la connexion à Twitter" @@ -1106,7 +1151,6 @@ admin/views/instance.vue: invite: "Inviter" save: "Sauvegarder" saved: "Enregistré" - user-recommendation-config: "Utilisateurs" email-config: "Paramètres du serveur de messagerie" email-config-info: "Utilisé pour confirmer votre adresse de courrier électronique et la réinitialisation de votre mot de passe." enable-email: "Activation de la distribution du courrier" @@ -1187,17 +1231,12 @@ admin/views/users.vue: unsuspend-confirm: "Souhaiteriez-vous ne plus suspendre ce compte ?" unsuspended: "La suspension de l’utilisateur a été levée avec succès" make-silence: "Mettre en sourdine" + silence-confirm: "Mettre l'utilisateur sous silence ?" unmake-silence: "Enlever la sourdine" - verify: "Vérification du compte" - verify-confirm: "Souhaiteriez-vous rendre votre compte comme étant un compte vérifié ?" - verified: "Le compte a été vérifié" - unverify: "Enlever la vérification du compte" - unverify-confirm: "Désirez-vous considérer ce compte comme étant non-vérifié ?" - unverified: "Ce compte n'est plus vérifié" update-remote-user: "Mettre à jour les informations de l’utilisateur·rice distant·e" remote-user-updated: "Les informations de l’utilisateur·rice distant·e ont étés mis à jour" users: - title: "Utilisateurs" + title: "Utilisateur·rice·s" sort: title: "Trier par" createdAtAsc: "Date d’inscription (Ascendant)" @@ -1210,7 +1249,6 @@ admin/views/users.vue: admin: "Admin" moderator: "Modérateur" adminOrModerator: "Administrateur/Modérateur" - verified: "Compte vérifié" silenced: "Déjà mis en sourdine" suspended: "Suspendu" origin: @@ -1309,6 +1347,7 @@ admin/views/federation.vue: chart-spans: hour: "Par heure" day: "Par jour" + blocked-hosts: "En cours blocage" desktop/views/pages/welcome.vue: about: "à propos" timeline: "Fil d’actualité" @@ -1412,7 +1451,7 @@ mobile/views/components/media-video.vue: sensitive: "Le contenu est NSFW" click-to-show: "Cliquer pour afficher" common/views/components/follow-button.vue: - following: "Abonné" + following: "Abonné·e" follow: " Suivre" request-pending: "Demande en attente" follow-processing: "En cours d’abonnement" @@ -1462,6 +1501,7 @@ mobile/views/components/ui.nav.vue: follow-requests: "Demandes d’abonnement" search: "Rechercher" user-lists: "Listes" + user-groups: "Groupe" widgets: "Modules" game: "Jeux" admin: "Admin" @@ -1469,16 +1509,17 @@ mobile/views/components/ui.nav.vue: mobile/views/pages/drive.vue: contextmenu: upload: "Téléverser un fichier" + url-upload: "Transférer un fichier depuis une URL" create-folder: "Créer un dossier" rename-folder: "Renommer le dossier" -mobile/views/pages/user-lists.vue: - title: "Listes" + move-folder: "Déplacer ce dossier" + delete-folder: "Supprimer ce dossier" mobile/views/pages/signup.vue: lets-start: "Votre compte est prêt ! 📦" mobile/views/pages/followers.vue: - followers-of: "Abonnés de {name}" + followers-of: "Abonné·e·s de {name}" mobile/views/pages/following.vue: - following-of: "Abonnés de {name}" + following-of: "Abonné·e·s de {name}" mobile/views/pages/home.vue: home: "Accueil" local: "Local" @@ -1496,10 +1537,6 @@ mobile/views/pages/widgets/activity.vue: activity: "Activité" mobile/views/pages/share.vue: share-with: "Partager avec {name}" -mobile/views/pages/received-follow-requests.vue: - title: "Demandes d’abonnement" - accept: "Accepter" - reject: "Refuser" mobile/views/pages/note.vue: title: "Publication" prev: "Note précédente" @@ -1579,6 +1616,7 @@ dev/views/apps.vue: create-app: "Créer une app" app-missing: "Aucune application" dev/views/new-app.vue: + new-app: "Nouvelle application" create-app: "Création d’une application" app-name: "Nom de l’application" app-name-desc: "Le nom de votre application" @@ -1589,7 +1627,33 @@ dev/views/new-app.vue: authority-desc: "Sont accessibles via l’API, uniquement les fonctionnalités demandées ici." authority-warning: "Vous pouvez le changer même après avoir créé l'application, mais si vous attribuez une nouvelle permission, toutes les clés utilisateur associées seront dès lors invalides." pages: + page-created: "Page a été créée !" + are-you-sure-delete: "Confirmez-vous la suppression de cette page ?" + page-deleted: "La page a bien été supprimée." + edit-this-page: "Éditer cette page" + view-source: "Afficher la source" + view-page: "Afficher la page" + like: "Bien" + inspector: "Inspecteur" + content: "Bloc de page" + variables: "Variables" + more-details: "Description" title: "Titre" + url: "URL de page" + summary: "Résumé de page" + align-center: "Centrée" + font: "Police de caractères" + fontSerif: "Serif" + fontSansSerif: "Sans Serif" + choose-block: "Ajouter un bloc" + select-type: "Choisir un type" + enter-variable-name: "Veuillez choisir un nom de variable" + the-variable-name-is-already-used: "Cette variable est déjà utilisée" + content-blocks: "Contenu du cadre" + input-blocks: "Entrée" + special-blocks: "Spécial" + post-from-post-form: "Publier ce contenu" + posted-from-post-form: "Publié !" blocks: text: "Texte" textarea: "Zone de texte" @@ -1602,6 +1666,7 @@ pages: post: "Champs de publication" _post: text: "Contenu" + textInput: "Entrée textuelle" _textInput: name: "Nom de la variable" text: "Titre" @@ -1610,6 +1675,7 @@ pages: name: "Nom de la variable" text: "Titre" default: "Valeur par défaut" + numberInput: "Entrée numérique" _numberInput: name: "Nom de la variable" text: "Titre" @@ -1623,11 +1689,15 @@ pages: _counter: name: "Nom de la variable" text: "Titre" + inc: "Augmenter le chiffre" _button: text: "Titre" + action: "L'opération lorsque le bouton sera pressé" _action: + dialog: "Afficher une fenêtre de dialogue" _dialog: content: "Contenu" + resetRandom: "Réinitialiser le nombre aléatoire" script: categories: flow: "Contrôle" @@ -1701,29 +1771,57 @@ pages: _gtEq: arg1: "A" arg2: "B" + _if: + arg1: "Si" + arg2: "donc" + arg3: "sinon" + not: "négation" + _not: + arg1: "négation" random: "Aléatoire" _randomPick: arg1: "Listes" + _dailyRandom: + arg1: "Probabilité" + _dailyRannum: + arg1: "Minimum" + arg2: "Maximum" _dailyRandomPick: arg1: "Listes" + _seedRandom: + arg2: "Probabilité" + _seedRannum: + arg2: "Min" + arg3: "Max" _seedRandomPick: arg2: "Listes" + _DRPWPM: + arg1: "Liste de texte" + pick: "Sélectionner dans la liste" _pick: arg1: "Listes" + arg2: "Position" number: "Numérique" + stringToNumber: "Chaîne en chiffres" _stringToNumber: arg1: "Texte" + numberToString: "Chiffres en chaîne" _numberToString: arg1: "Numérique" _splitStrByLine: arg1: "Texte" + ref: "Variables" fn: "Fonction" _fn: + slots: "Emplacement" arg1: "Sortie" for: "Répéter" + thereIsEmptySlot: "Slot {slot} est vide !" types: string: "Texte" number: "Numérique" array: "Listes" stringArray: "Liste de texte" + emptySlot: "Slot vide" enviromentVariables: "Variables d'environnement" + pageVariables: "Élément de page" diff --git a/locales/index.js b/locales/index.js index ceb90236a..b71625dbc 100644 --- a/locales/index.js +++ b/locales/index.js @@ -15,6 +15,7 @@ const merge = (...args) => args.reduce((a, c) => ({ const languages = [ 'cs-CZ', + 'da-DK', 'de-DE', 'en-US', 'es-ES', diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 14b8daad4..52f1e2901 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -101,6 +101,34 @@ common: follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。" explore: "ユーザーを探索する" + post-form: + attach-location-information: "位置情報を添付する" + hide-contents: "内容を隠す" + reply-placeholder: "この投稿への返信..." + quote-placeholder: "この投稿を引用..." + option-quote-placeholder: "この投稿を引用... (オプション)" + quote-attached: "引用付き" + quote-question: "引用として添付しますか？" + submit: "投稿" + reply: "返信" + renote: "Renote" + posting: "投稿中" + attach-media-from-local: "PCからメディアを添付" + attach-media-from-drive: "ドライブからメディアを添付" + insert-a-kao: "v('ω')v" + create-poll: "アンケートを作成" + text-remain: "残り{}文字" + recent-tags: "最近" + local-only-message: "この投稿はローカルにのみ公開されます" + click-to-tagging: "クリックでタグ付け" + visibility: "公開範囲" + geolocation-alert: "お使いの端末は位置情報に対応していません" + error: "エラー" + enter-username: "ユーザー名を入力してください" + add-visible-user: "ユーザーを追加" + cw-placeholder: "内容への注釈 (オプション)" + username-prompt: "ユーザー名を入力してください" + weekday-short: sunday: "日" monday: "月" @@ -265,6 +293,7 @@ common: my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" hide-password: "パスワードを隠す" show-password: "パスワードを表示する" + enter-username: "ユーザー名を入力してください" do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。" user-suspended: "このユーザーは凍結されています。" @@ -480,20 +509,25 @@ common/views/components/messaging.vue: search-user: "ユーザーを探す" you: "あなた" no-history: "履歴はありません" + user: "ユーザー" + group: "グループ" + start-with-user: "ユーザーとトークを開始" + start-with-group: "グループとトークを開始" + select-group: "グループを選択してください" common/views/components/messaging-room.vue: - empty: "このユーザーと話したことはありません" + not-talked-user: "このユーザーとの会話はありません" + not-talked-group: "このグループでの会話はありません" no-history: "これより過去の履歴はありません" - resize-form: "ドラッグしてフォームの広さを調整" new-message: "新しいメッセージがあります" - only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです" + only-one-file-attached: "メッセージに添付できるファイルはひとつです" common/views/components/messaging-room.form.vue: input-message-here: "ここにメッセージを入力" send: "送信" attach-from-local: "PCからファイルを添付する" attach-from-drive: "ドライブからファイルを添付する" - only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです" + only-one-file-attached: "メッセージに添付できるファイルはひとつです" common/views/components/messaging-room.message.vue: is-read: "既読" @@ -508,6 +542,7 @@ common/views/components/nav.vue: repository: "リポジトリ" develop: "開発者" feedback: "フィードバック" + tos: "利用規約" common/views/components/note-menu.vue: mention: "メンション" @@ -584,6 +619,7 @@ common/views/components/poll-editor.vue: common/views/components/reaction-picker.vue: choose-reaction: "リアクションを選択" + input-reaction-placeholder: "または絵文字を入力" common/views/components/emoji-picker.vue: custom-emoji: "カスタム絵文字" @@ -628,6 +664,8 @@ common/views/components/signup.vue: password-matched: "確認されました" password-not-matched: "一致していません" recaptcha: "認証" + agree-to: "{0}に同意します。" + tos: "利用規約" create: "アカウント作成" some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。" @@ -747,11 +785,36 @@ common/views/components/user-list-editor.vue: remove-user: "このリストから削除" delete-are-you-sure: "リスト「$1」を削除しますか？" deleted: "削除しました" + add-user: "ユーザーを追加" + +common/views/components/user-group-editor.vue: + users: "メンバー" + rename: "グループ名を変更" + delete: "グループを削除" + transfer: "グループを譲渡" + transfer-are-you-sure: "グループ「$1」を「@$2」さんに譲渡しますか？" + transferred: "グループを譲渡しました" + remove-user: "このグループから削除" + delete-are-you-sure: "グループ「$1」を削除しますか？" + deleted: "削除しました" + invite: "招待" + invited: "招待を送信しました" common/views/components/user-lists.vue: + user-lists: "リスト" create-list: "リストを作成" list-name: "リスト名" +common/views/components/user-groups.vue: + user-groups: "グループ" + create-group: "グループを作成" + group-name: "グループ名" + owned-groups: "自分のグループ" + joined-groups: "参加しているグループ" + invites: "招待" + accept-invite: "参加" + reject-invite: "拒否" + common/views/widgets/broadcast.vue: fetching: "確認中" no-broadcasts: "お知らせはありません" @@ -824,6 +887,11 @@ common/views/pages/follow.vue: follow-processing: "フォロー処理中" follow-request: "フォロー申請" +common/views/pages/follow-requests.vue: + received-follow-requests: "フォロー申請" + accept: "承認" + reject: "拒否" + desktop: banner-crop-title: "バナーとして表示する部分を選択" banner: "バナー" @@ -977,34 +1045,12 @@ desktop/views/components/notifications.vue: empty: "ありません！" desktop/views/components/post-form.vue: - add-visible-user: "+ユーザーを追加" - attach-location-information: "位置情報を添付する" - hide-contents: "内容を隠す" - reply-placeholder: "この投稿への返信..." - quote-placeholder: "この投稿を引用..." - submit: "投稿" - reply: "返信" - renote: "Renote" posted: "投稿しました！" replied: "返信しました！" reposted: "Renoteしました！" note-failed: "投稿に失敗しました" reply-failed: "返信に失敗しました" renote-failed: "Renoteに失敗しました" - posting: "投稿中" - attach-media-from-local: "PCからメディアを添付" - attach-media-from-drive: "ドライブからメディアを添付" - insert-a-kao: "v('ω')v" - create-poll: "アンケートを作成" - text-remain: "残り{}文字" - recent-tags: "最近" - local-only-message: "この投稿はローカルにのみ公開されます" - click-to-tagging: "クリックでタグ付け" - visibility: "公開範囲" - geolocation-alert: "お使いの端末は位置情報に対応していません" - error: "エラー" - enter-username: "ユーザー名を入力してください" - annotations: "内容への注釈 (オプション)" desktop/views/components/post-form-window.vue: note: "新規投稿" @@ -1136,6 +1182,7 @@ desktop/views/components/ui.header.vue: desktop/views/components/ui.header.account.vue: profile: "プロフィール" lists: "リスト" + groups: "グループ" follow-requests: "フォロー申請" admin: "管理" @@ -1151,14 +1198,6 @@ desktop/views/components/ui.header.post.vue: desktop/views/components/ui.header.search.vue: placeholder: "検索" -desktop/views/components/received-follow-requests-window.vue: - title: "フォロー申請" - accept: "承認" - reject: "拒否" - -desktop/views/components/user-lists-window.vue: - title: "リスト" - desktop/views/components/user-preview.vue: notes: "投稿" following: "フォロー" @@ -1184,7 +1223,6 @@ admin/views/index.vue: users: "ユーザー" federation: "連合" announcements: "お知らせ" - hashtags: "ハッシュタグ" abuse: "スパム報告" queue: "ジョブキュー" logs: "ログ" @@ -1202,6 +1240,33 @@ admin/views/dashboard.vue: admin/views/queue.vue: title: "キュー" remove-all-jobs: "すべてのジョブをクリア" + jobs: "ジョブ" + queue: "キュー" + domains: + deliver: "配送" + inbox: "受信" + db: "データベース" + objectStorage: "オブジェクトストレージ" + state: "状態" + states: + active: "処理中" + delayed: "予約済み" + waiting: "順番待ち" + result-is-truncated: "結果は省略されています" + other-queues: "その他のキュー" + +admin/views/logs.vue: + logs: "ログ" + domain: "ドメイン" + level: "レベル" + levels: + all: "全て" + info: "情報" + success: "成功" + warning: "警告" + error: "エラー" + debug: "デバッグ" + delete-all: "全て削除" admin/views/abuse.vue: title: "スパム報告" @@ -1215,14 +1280,34 @@ admin/views/instance.vue: instance-name: "インスタンス名" instance-description: "インスタンスの紹介" host: "ホスト" + icon-url: "アイコンURL" + logo-url: "ロゴURL" banner-url: "バナー画像URL" error-image-url: "エラー画像URL" languages: "インスタンスの対象言語" languages-desc: "スペースで区切って複数設定できます。" + tos-url: "利用規約URL" + repository-url: "リポジトリURL" + feedback-url: "フィードバックURL" maintainer-config: "管理者情報" maintainer-name: "管理者名" maintainer-email: "管理者の連絡先" + advanced-config: "その他の設定" + note-and-tl: "投稿とタイムライン" drive-config: "ドライブの設定" + use-object-storage: "オブジェクトストレージを使用する" + object-storage-base-url: "URL" + object-storage-bucket: "バケット名" + object-storage-prefix: "プレフィックス" + object-storage-endpoint: "エンドポイント" + object-storage-region: "リージョン" + object-storage-port: "ポート" + object-storage-access-key: "アクセスキー" + object-storage-secret-key: "シークレットキー" + object-storage-use-ssl: "SSLを使用" + object-storage-s3-info: "Amazon S3をオブジェクトストレージとして使用する場合の「エンドポイント」と「リージョン」の設定については{0}をご確認ください。" + object-storage-s3-info-here: "こちら" + object-storage-gcs-info: "Google Cloud Storageをオブジェクトストレージとして使用する場合、「エンドポイント」は storage.googleapis.com に設定し、「リージョン」は空欄にします。" cache-remote-files: "リモートのファイルをキャッシュする" cache-remote-files-desc: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。そのためサーバーのストレージを節約できますが、プライバシー設定で直リンクを無効にしているユーザーにはファイルが見えなくなったり、サムネイルが生成されないので通信量が増加します。通常はこの設定をオンにしておくことをおすすめします。" local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量" @@ -1230,9 +1315,14 @@ admin/views/instance.vue: mb: "メガバイト単位" recaptcha-config: "reCAPTCHAの設定" recaptcha-info: "reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。" + recaptcha-info2: "v3は非対応です。v2を使用してください。" enable-recaptcha: "reCAPTCHAを有効にする" - recaptcha-site-key: "reCAPTCHA site key" - recaptcha-secret-key: "reCAPTCHA secret key" + recaptcha-site-key: "サイトキー" + recaptcha-secret-key: "シークレットキー" + recaptcha-preview: "プレビュー" + hidden-tags: "非表示ハッシュタグ" + hidden-tags-info: "集計から除外するハッシュタグを改行で区切って記述します。" + external-service-integration-config: "外部サービス連携" twitter-integration-config: "Twitter連携の設定" twitter-integration-info: "コールバックURLは {url} に設定します。" enable-twitter-integration: "Twitter連携を有効にする" @@ -1264,6 +1354,7 @@ admin/views/instance.vue: save: "保存" saved: "保存しました" pinned-users: "ピン留めユーザー" + pinned-users-info: "ピン留めしたいユーザーを改行で区切って記述します。" email-config: "メールサーバーの設定" email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。" enable-email: "メール配信を有効にする" @@ -1331,6 +1422,9 @@ admin/views/drive.vue: unmark-as-sensitive: "閲覧注意を解除" marked-as-sensitive: "閲覧注意に設定しました" unmarked-as-sensitive: "閲覧注意を解除しました" + clean-remote-files: "リモートファイルのキャッシュを削除" + clean-remote-files-are-you-sure: "すべてのリモートファイルのキャッシュを削除してもよろしいですか？" + clean-up: "クリーンアップ" admin/views/users.vue: operation: "操作" @@ -1352,6 +1446,8 @@ admin/views/users.vue: unsilence-confirm: "サイレンスを解除しますか？" update-remote-user: "リモートユーザー情報の更新" remote-user-updated: "リモートユーザー情報を更新しました" + delete-all-files: "すべてのファイルを削除" + delete-all-files-confirm: "すべてのファイルを削除しますか？" users: title: "ユーザー" sort: @@ -1432,6 +1528,7 @@ admin/views/federation.vue: latest-request-received-at: "直近のリクエスト受信" remove-all-following: "フォローを全解除" remove-all-following-info: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。" + delete-all-files: "ファイルをすべて削除" block: "ブロック" marked-as-closed: "閉鎖されているとマーク" lookup: "照会" @@ -1478,6 +1575,9 @@ admin/views/federation.vue: chart-spans: hour: "1時間ごと" day: "1日ごと" + blocked-hosts: "ブロック" + blocked-hosts-info: "ブロックしたいホストを改行で区切って記述します。" + save: "保存" desktop/views/pages/welcome.vue: about: "詳しく..." @@ -1640,18 +1740,6 @@ mobile/views/components/note-sub.vue: mobile/views/components/notifications.vue: empty: "ありません！" -mobile/views/components/post-form.vue: - add-visible-user: "ユーザーを追加" - submit: "投稿" - reply: "返信" - renote: "Renote" - quote-placeholder: "この投稿を引用... (オプション)" - reply-placeholder: "この投稿への返信..." - cw-placeholder: "内容への注釈 (オプション)" - geolocation-alert: "お使いの端末は位置情報に対応していません" - error: "エラー" - username-prompt: "ユーザー名を入力してください" - mobile/views/components/sub-note-content.vue: private: "この投稿は非公開です" deleted: "この投稿は削除されました" @@ -1668,6 +1756,7 @@ mobile/views/components/ui.nav.vue: follow-requests: "フォロー申請" search: "検索" user-lists: "リスト" + user-groups: "グループ" widgets: "ウィジェット" game: "ゲーム" admin: "管理" @@ -1682,9 +1771,6 @@ mobile/views/pages/drive.vue: move-folder: "このフォルダを移動" delete-folder: "このフォルダを削除" -mobile/views/pages/user-lists.vue: - title: "リスト" - mobile/views/pages/signup.vue: lets-start: "📦 始めましょう" @@ -1717,11 +1803,6 @@ mobile/views/pages/widgets/activity.vue: mobile/views/pages/share.vue: share-with: "{name}で共有" -mobile/views/pages/received-follow-requests.vue: - title: "フォロー申請" - accept: "承認" - reject: "拒否" - mobile/views/pages/note.vue: title: "投稿" prev: "前の投稿" @@ -1842,6 +1923,10 @@ pages: edit-this-page: "このページを編集" view-source: "ソースを表示" view-page: "ページを見る" + like: "いいね" + unlike: "いいね解除" + liked-pages: "いいねしたページ" + my-pages: "自分のページ" inspector: "インスペクター" content: "ページブロック" variables: "変数" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index f3ea9bc4f..8c322fe52 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -121,7 +121,7 @@ common: update-available-title: "更新があんで" update-available: "Misskeyの新しいバージョンがあんで({newer}。現在{current}をつこてるわ)。ページを再度読み込みしたると更新が適用されるわ。" my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。" - verified-user: "アメちゃん付きアカウント" + enter-username: "ユーザー名を入力してや" do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！" is-remote-post: "この投稿情報はコピーです。" view-on-remote: "ちゃんとした情報見せてや！" @@ -181,7 +181,6 @@ auth/views/index.vue: error: "セッションが存在してへん。" sign-in: "サインインしてや" common/views/pages/explore.vue: - verified-users: "アメちゃん付きアカウント" federated: "連合" common/views/components/games/reversi/reversi.vue: matching: @@ -296,18 +295,15 @@ common/views/components/messaging.vue: search-user: "ユーザーを探す" you: "あんさん" no-history: "履歴はあらへんで" + user: "ユーザー" common/views/components/messaging-room.vue: - empty: "このユーザーと話したことはあらへんで" no-history: "これより過去の履歴はあらへんで" - resize-form: "ドラッグしてフォームの広さを調整" new-message: "新しいメッセージがあるで" - only-one-file-attached: "メッセージに添付できんのはひとつのファイルのみやで" common/views/components/messaging-room.form.vue: input-message-here: "ここにメッセージ書いてや" send: "送信" attach-from-local: "PCからファイルを添付する" attach-from-drive: "ドライブからファイルを添付する" - only-one-file-attached: "メッセージに添付できんのはひとつのファイルのみやで" common/views/components/messaging-room.message.vue: is-read: "既読" deleted: "このメッセージは削除されたわ" @@ -478,8 +474,14 @@ common/views/components/profile-editor.vue: enter-password: "パスワードを入れてや" common/views/components/user-list-editor.vue: users: "ユーザー" + add-user: "ユーザー増やす" +common/views/components/user-group-editor.vue: + invite: "招待" common/views/components/user-lists.vue: + user-lists: "リスト" list-name: "リスト名" +common/views/components/user-groups.vue: + invites: "招待" common/views/widgets/broadcast.vue: fetching: "見てみるわ…" no-broadcasts: "お知らせはあらへんで" @@ -538,6 +540,8 @@ common/views/pages/follow.vue: request-pending: "フォローの許し待っとる" follow-processing: "今フォロー処理やっとる‥" follow-request: "フォロー許してくれや！言うてみる" +common/views/pages/follow-requests.vue: + received-follow-requests: "フォロー許してくれや！言うてみる" desktop: banner-crop-title: "どこバナーとして出す？" banner: "バナー" @@ -811,12 +815,6 @@ desktop/views/components/ui.header.post.vue: post: "新規投稿" desktop/views/components/ui.header.search.vue: placeholder: "検索" -desktop/views/components/received-follow-requests-window.vue: - title: "フォロー許してくれや！言うてみる" - accept: "許す" - reject: "許さん" -desktop/views/components/user-lists-window.vue: - title: "リスト" desktop/views/components/user-preview.vue: notes: "投稿" following: "フォロー" @@ -838,7 +836,6 @@ admin/views/index.vue: users: "ユーザー" federation: "連合" announcements: "知っといてや" - hashtags: "ハッシュタグ" back-to-misskey: "Misskeyに戻る" admin/views/dashboard.vue: dashboard: "ダッシュボード" @@ -863,6 +860,7 @@ admin/views/instance.vue: maintainer-name: "管理者名" maintainer-email: "管理者の連絡先" drive-config: "ドライブの設定" + object-storage-endpoint: "エンドポイント" cache-remote-files: "リモートのファイルをキャッシュする" cache-remote-files-desc: "この設定を無効にすると、リモートファイルをこっちで保管せずに直接リンク張るようになるで。サーバーのストレージは軽くやろうけど、プライバシー設定で直リンクを向こうにしとるユーザーはファイルが見れへんし、サムネイルが無いから通信量が増えたりするから、普通はオンにしといてな。" local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量" @@ -871,8 +869,7 @@ admin/views/instance.vue: recaptcha-config: "reCAPTCHAの設定" recaptcha-info: "reCAPTCHAを有効にするにはreCAPTCHAトークンが要るで。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してな。" enable-recaptcha: "reCAPTCHAを有効にする" - recaptcha-site-key: "reCAPTCHA site key" - recaptcha-secret-key: "reCAPTCHA secret key" + recaptcha-preview: "試してみる" twitter-integration-config: "Twitter連携の設定" twitter-integration-info: "コールバックURLは {url} に設定してや。" enable-twitter-integration: "Twitter連携を有効にする" @@ -899,7 +896,6 @@ admin/views/instance.vue: invite: "来てや" save: "保存" saved: "保存したで！" - user-recommendation-config: "このユーザーええで" email-config: "メールサーバーの設定" email-config-info: "メールアドレス確認やパスワードリセットの際に使うで。" enable-email: "メール配信を有効にする" @@ -956,7 +952,6 @@ admin/views/users.vue: state: all: "すべて" moderator: "モデレーター" - verified: "アメちゃん付きアカウント" origin: local: "ローカル" admin/views/emoji.vue: @@ -995,6 +990,7 @@ admin/views/federation.vue: chart-spans: hour: "1時間ごと" day: "1日ごと" + blocked-hosts: "ブロック" desktop/views/pages/welcome.vue: about: "もうちょい……" timeline: "タイムライン" @@ -1151,8 +1147,6 @@ mobile/views/pages/drive.vue: contextmenu: upload: "ファイル上げる" create-folder: "フォルダー作る" -mobile/views/pages/user-lists.vue: - title: "リスト" mobile/views/pages/signup.vue: lets-start: "📦 始めようや" mobile/views/pages/followers.vue: @@ -1175,10 +1169,6 @@ mobile/views/pages/widgets/activity.vue: activity: "やっとること" mobile/views/pages/share.vue: share-with: "{name}で共有" -mobile/views/pages/received-follow-requests.vue: - title: "フォロー許してくれや！" - accept: "許す" - reject: "許さん" mobile/views/pages/note.vue: title: "投稿" prev: "前のやつ" @@ -1263,6 +1253,7 @@ dev/views/new-app.vue: authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな" authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。" pages: + like: "ええやん" blocks: image: "画像" post: "投稿フォーム" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index aec632d84..47e16d5d4 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -20,7 +20,7 @@ common: outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!" adblock: detected: "광고 차단기를 해제하십시오" - warning: "Misskey는 광고를 게재하지 않습니다. 그러나 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없게 될 가능성이나 결함이 발생하는 경우가 있습니다." + warning: "Misskey는 광고를 게재하지 않습니다. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다." application-authorization: "앱 연계" close: "닫기" do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다." @@ -42,7 +42,7 @@ common: gotit: "Got it!" notification: file-uploaded: "파일이 업로드되었습니다" - message-from: "{}님으로부터 메시지:" + message-from: "{}님의 메시지:" reversi-invited: "게임 초대가 있습니다" reversi-invited-by: "{}님으로부터" notified-by: "{}님으로부터" @@ -51,7 +51,7 @@ common: time: unknown: "알 수 없는 시간" future: "미래" - just_now: "방금" + just_now: "방금 전" seconds_ago: "{}초 전" minutes_ago: "{}분 전" hours_ago: "{}시간 전" @@ -67,19 +67,19 @@ common: home: "홈" deck: "덱" timeline: "타임라인" - explore: "발견" + explore: "발견하기" following: "팔로우 중" followers: "팔로워" favorites: "즐겨찾기" permissions: - "read:account": "계정 정보 보기" - "write:account": "계정 정보 변경" - "read:blocks": "차단 보기" - "write:blocks": "차단 수정" - "read:drive": "드라이브 보기" - "write:drive": "드라이브 수정" - "read:favorites": "즐겨찾기 보기" - "write:favorites": "즐겨찾기 수정" + "read:account": "계정의 정보를 볼 수 있습니다." + "write:account": "계정의 정보를 변경할 수 있습니다." + "read:blocks": "차단 목록을 볼 수 있습니다." + "write:blocks": "차단 목록을 조작할 수 있습니다." + "read:drive": "드라이브의 파일들을 볼 수 있습니다." + "write:drive": "드라이브의 파일들을 조작할 수 있습니다." + "read:favorites": "즐겨찾기 목록을 볼 수 있습니다." + "write:favorites": "즐겨찾기 목록을 조작할 수 있습니다." "read:following": "팔로우 정보 보기" "write:following": "팔로잉, 팔로우 수정" "read:messaging": "대화 보기" @@ -251,9 +251,9 @@ common: update-available-title: "업데이트가 있습니다" update-available: "Misskey의 새로운 버전이 있습니다 ({newer}. 현재 {current}을 사용 중). 페이지를 다시 로드하면 업데이트가 적용됩니다." my-token-regenerated: "당신의 토큰이 업데이트되었으므로 로그아웃합니다." - verified-user: "공식 계정" hide-password: "비밀번호 숨기기" show-password: "비밀번호 표시" + enter-username: "사용자명을 입력하여 주십시오" do-not-use-in-production: "이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오." user-suspended: "이 사용자는 정지된 상태입니다." is-remote-user: "이 사용자 정보는 정확하지 않을 수 있습니다." @@ -294,7 +294,7 @@ common: notifications: "알림" users: "추천 사용자" polls: "투표" - post-form: "게시 양식" + post-form: "글 입력란" server: "서버 정보" nav: "내비게이션" tips: "팁" @@ -319,7 +319,7 @@ auth/views/index.vue: error: "세션이 존재하지 않습니다." sign-in: "로그인 해주시기 바랍니다" common/views/pages/explore.vue: - verified-users: "공식 계정" + pinned-users: "고정된 사용자" popular-users: "인기 사용자" recently-updated-users: "최근 게시한 사용자" recently-registered-users: "신규 사용자" @@ -449,18 +449,23 @@ common/views/components/messaging.vue: search-user: "사용자 찾기" you: "당신" no-history: "기록이 없습니다" + user: "사용자" + group: "그룹" + start-with-user: "사용자와 대화 시작" + start-with-group: "그룹과 대화 시작" + select-group: "그룹을 선택하여 주십시오" common/views/components/messaging-room.vue: - empty: "이 사용자와 대화한 적이 없습니다" + not-talked-user: "이 사용자와의 대화가 없습니다" + not-talked-group: "이 그룹과의 대화가 없습니다" no-history: "이것보다 과거의 기록이 없습니다" - resize-form: "드래그하여 폼의 크기 조절" new-message: "새 메시지가 있습니다" - only-one-file-attached: "메시지에는 하나의 파일만 첨부할 수 있습니다" + only-one-file-attached: "메시지에 첨부할 수 있는 파일은 하나까지입니다" common/views/components/messaging-room.form.vue: input-message-here: "여기에 메시지를 입력하세요" send: "전송" attach-from-local: "PC에서 파일 첨부" attach-from-drive: "드라이브에서 파일 첨부" - only-one-file-attached: "메시지에는 하나의 파일만 첨부할 수 있습니다" + only-one-file-attached: "메시지에 첨부할 수 있는 파일은 하나까지입니다" common/views/components/messaging-room.message.vue: is-read: "읽음" deleted: "이 메시지는 삭제되었습니다" @@ -473,6 +478,7 @@ common/views/components/nav.vue: repository: "저장소" develop: "개발자" feedback: "피드백" + tos: "이용 약관" common/views/components/note-menu.vue: mention: "멘션" detail: "상세" @@ -544,6 +550,7 @@ common/views/components/poll-editor.vue: day: "일" common/views/components/reaction-picker.vue: choose-reaction: "리액션 선택" + input-reaction-placeholder: "또는 이모지 입력" common/views/components/emoji-picker.vue: custom-emoji: "커스텀 이모지" people: "사람들" @@ -585,6 +592,8 @@ common/views/components/signup.vue: password-matched: "확인되었습니다" password-not-matched: "일치하지 않습니다" recaptcha: "자동 가입 방지" + agree-to: "{0}에 동의합니다." + tos: "이용 약관" create: "계정 만들기" some-error: "알 수 없는 이유로 계정 만들기에 실패했습니다. 다시 한번 시도해 주세요." common/views/components/special-message.vue: @@ -692,9 +701,32 @@ common/views/components/user-list-editor.vue: remove-user: "이 리스트에서 제거" delete-are-you-sure: "리스트 \"$1\"을 삭제하시겠습니까?" deleted: "삭제하였습니다" + add-user: "사용자 추가" +common/views/components/user-group-editor.vue: + users: "멤버" + rename: "그룹명을 변경" + delete: "그룹을 삭제" + transfer: "그룹을 양도" + transfer-are-you-sure: "그룹 「$1」을 「@$2」 님에게 양도하시겠습니까?" + transferred: "그룹을 양도하였습니다" + remove-user: "이 그룹에서 삭제" + delete-are-you-sure: "그룹 「$1」을 삭제하시겠습니까?" + deleted: "삭제하였습니다" + invite: "초대" + invited: "초대를 보냈습니다" common/views/components/user-lists.vue: + user-lists: "리스트" create-list: "리스트 만들기" list-name: "리스트 이름" +common/views/components/user-groups.vue: + user-groups: "그룹" + create-group: "그룹 만들기" + group-name: "그룹명" + owned-groups: "자신의 그룹" + joined-groups: "참여중인 그룹" + invites: "초대" + accept-invite: "참여" + reject-invite: "거부" common/views/widgets/broadcast.vue: fetching: "확인중" no-broadcasts: "공지사항이 없습니다" @@ -756,6 +788,10 @@ common/views/pages/follow.vue: request-pending: "팔로우 허가 대기중" follow-processing: "팔로우 처리중" follow-request: "팔로우 요청" +common/views/pages/follow-requests.vue: + received-follow-requests: "팔로우 요청" + accept: "승인" + reject: "거부" desktop: banner-crop-title: "배너로 표시할 부분을 선택" banner: "배너" @@ -1027,6 +1063,7 @@ desktop/views/components/ui.header.vue: desktop/views/components/ui.header.account.vue: profile: "프로필" lists: "리스트" + groups: "그룹" follow-requests: "팔로우 요청" admin: "관리" desktop/views/components/ui.header.nav.vue: @@ -1037,12 +1074,6 @@ desktop/views/components/ui.header.post.vue: post: "새 글" desktop/views/components/ui.header.search.vue: placeholder: "검색" -desktop/views/components/received-follow-requests-window.vue: - title: "팔로우 요청" - accept: "승인" - reject: "거부" -desktop/views/components/user-lists-window.vue: - title: "리스트" desktop/views/components/user-preview.vue: notes: "글" following: "팔로잉" @@ -1064,7 +1095,6 @@ admin/views/index.vue: users: "사용자" federation: "연합" announcements: "공지사항" - hashtags: "해시태그" abuse: "스팸 신고" queue: "작업 대기열" logs: "로그" @@ -1091,14 +1121,34 @@ admin/views/instance.vue: instance-name: "인스턴스 이름" instance-description: "인스턴스의 소개" host: "관리자" + icon-url: "아이콘 URL" + logo-url: "로고 URL" banner-url: "배너 이미지 URL" error-image-url: "오류 이미지 URL" languages: "인스턴스의 대상 언어" languages-desc: "공백으로 구분하여 여러 개 설정할 수 있습니다." + tos-url: "이용약관 URL" + repository-url: "저장소 URL" + feedback-url: "피드백 URL" maintainer-config: "관리자 정보" maintainer-name: "관리자 이름" maintainer-email: "관리자 연락처" + advanced-config: "그 외 설정" + note-and-tl: "글과 타임라인" drive-config: "드라이브 설정" + use-object-storage: "오브젝트 스토리지를 사용" + object-storage-base-url: "URL" + object-storage-bucket: "버킷 이름" + object-storage-prefix: "프리픽스" + object-storage-endpoint: "엔드포인트" + object-storage-region: "리전" + object-storage-port: "포트" + object-storage-access-key: "액세스 키" + object-storage-secret-key: "시크릿 키" + object-storage-use-ssl: "SSL 사용" + object-storage-s3-info: "Amazon S3를 오브젝트 스토리지로 사용하는 경우의 「엔드포인트」와 「리전」의 설정값에 대해서는 {0}을 확인하여 주십시오." + object-storage-s3-info-here: "이곳" + object-storage-gcs-info: "Google Cloud Storage를 오브젝트 스토리지로 사용하는 경우, 「엔드포인트」는 storage.googleapis.com 으로 설정하고, 「리전」 란은 비웁니다." cache-remote-files: "원격 파일을 캐시" cache-remote-files-desc: "이 설정을 해지하면 원격 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 프라이버시 설정에서 직접 링크를 무효로 설정한 사용자에게는 파일이 보이지 않거나, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다. 일반적으로 이 설정을 ON으로 두는 것을 추천합니다." local-drive-capacity-mb: "로컬 사용자 한 명당 드라이브 용량" @@ -1106,9 +1156,14 @@ admin/views/instance.vue: mb: "메가바이트 단위" recaptcha-config: "reCAPCHA 설정" recaptcha-info: "reCAPCHA를 사용하도록 설정하는 경우 reCAPCHA 토큰을 확보해야 합니다. https://www.google.com/recaptcha/intro/ 에 접속하여 토큰을 가져와주십시오." + recaptcha-info2: "v3는지원하지 않습니다. v2를 사용하여 주십시오." enable-recaptcha: "reCAPCHA 활성화" - recaptcha-site-key: "reCAPTCHA site key" - recaptcha-secret-key: "reCAPTCHA secret key" + recaptcha-site-key: "사이트 키" + recaptcha-secret-key: "시크릿 키" + recaptcha-preview: "미리보기" + hidden-tags: "숨긴 해시태그" + hidden-tags-info: "집계에서 제외할 해시태그를 줄 바꿈으로 구분하여 기술합니다." + external-service-integration-config: "외부 서비스 연계" twitter-integration-config: "Twitter 연동 설정" twitter-integration-info: "콜백 URL은 {url} 로 설정됩니다." enable-twitter-integration: "트위터 연동 활성화" @@ -1139,7 +1194,8 @@ admin/views/instance.vue: invite: "초대" save: "저장" saved: "저장하였습니다" - user-recommendation-config: "추천 사용자" + pinned-users: "고정된 사용자" + pinned-users-info: "고정해두고 싶은 사용자를 줄바꿈으로 구분하여 기술합니다." email-config: "메일 서버 설정" email-config-info: "메일 주소 확인 혹은 비밀번호 재설정에 사용 됩니다." enable-email: "메일 발신 활성화" @@ -1223,14 +1279,10 @@ admin/views/users.vue: silence-confirm: "침묵으로 설정합니까?" unmake-silence: "침묵 해제" unsilence-confirm: "침묵 해제하시겠습니까?" - verify: "공식 계정으로 설정" - verify-confirm: "공식 계정으로 설정하시겠습니까?" - verified: "공식 계정으로 설정하였습니다" - unverify: "공식 계정 해제" - unverify-confirm: "공식 계정을 해제하시겠습니까?" - unverified: "공식 계정을 해제하였습니다" update-remote-user: "원격 사용자 정보 갱신" remote-user-updated: "원격 사용자 정보를 갱신하였습니다" + delete-all-files: "모든 파일 삭제" + delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?" users: title: "사용자" sort: @@ -1245,7 +1297,6 @@ admin/views/users.vue: admin: "관리자" moderator: "모더레이터" adminOrModerator: "관리자+모더레이터" - verified: "공식 계정" silenced: "침묵됨" suspended: "정지됨" origin: @@ -1307,6 +1358,7 @@ admin/views/federation.vue: latest-request-received-at: "마지막으로 요청을 받은 시간" remove-all-following: "모든 팔로잉 해제" remove-all-following-info: "{host}(으)로부터 모든 팔로잉을 해제합니다. 해당 인스턴스가 더 이상 존재하지 않게 된 경우 등에 실행하십시오." + delete-all-files: "파일을 모두 삭제" block: "차단" marked-as-closed: "폐쇄된 것으로 표시" lookup: "조회" @@ -1353,6 +1405,8 @@ admin/views/federation.vue: chart-spans: hour: "1시간마다" day: "1일마다" + blocked-hosts: "차단" + blocked-hosts-info: "차단할 호스트를 줄바꿈으로 구분하여 기술합니다." desktop/views/pages/welcome.vue: about: "자세히..." timeline: "타임라인" @@ -1509,6 +1563,7 @@ mobile/views/components/ui.nav.vue: follow-requests: "팔로우 요청" search: "검색" user-lists: "리스트" + user-groups: "그룹" widgets: "위젯" game: "게임" admin: "관리" @@ -1521,8 +1576,6 @@ mobile/views/pages/drive.vue: rename-folder: "폴더 이름 바꾸기" move-folder: "이 폴더를 이동" delete-folder: "이 폴더를 삭제" -mobile/views/pages/user-lists.vue: - title: "리스트" mobile/views/pages/signup.vue: lets-start: "📦 이제 시작해도 됩니다" mobile/views/pages/followers.vue: @@ -1547,10 +1600,6 @@ mobile/views/pages/widgets/activity.vue: activity: "활동" mobile/views/pages/share.vue: share-with: "{name}(으)로 공유" -mobile/views/pages/received-follow-requests.vue: - title: "팔로우 요청" - accept: "승인" - reject: "거부" mobile/views/pages/note.vue: title: "글" prev: "이전 글" @@ -1652,42 +1701,251 @@ pages: page-created: "페이지를 만들었습니다" page-updated: "페이지를 수정했습니다" are-you-sure-delete: "이 페이지를 삭제하시겠습니까?" + page-deleted: "페이지가 삭제되었습니다" + edit-this-page: "이 페이지를 편집" + view-source: "소스 보기" + view-page: "페이지 보기" + like: "좋아요" + unlike: "좋아요 해제" + liked-pages: "좋아요한 페이지" + my-pages: "내 페이지" + inspector: "인스펙터" + content: "페이지 블록" + variables: "변수" + variables-info: "변수를 사용하면 동적인 페이지를 만들 수 있습니다. 텍스트에 { 변수명 }을 적으면 그 위치에 변수의 값을 집어넣습니다. 예를 들자면 Hello { thing } world! 라는 텍스트가 있을 때, 변수(thing)의 값이 ai인 경우 텍스트는 Hello ai world!가 됩니다." + variables-info2: "변수의 평가(값을 산출해내는 것)는 위에서부터 아래로 진행되므로 어떤 변수의 내부에서 자신보다 아래에 있는 변수를 참조할 수는 없습니다. 예를 들자면 위에서부터 A, B, C의 3개의 변수가 정의되어 있을 때, C의 내부에 A나 B를 참조할 수는 있지만, A의 내부에서 B나 C를 참조할 수는 없습니다." + variables-info3: "사용자로부터 입력을 받으려면, 페이지에 「사용자 입력」 블록을 삽입하고 「변수명」에 입력받은 값을 저장하고 싶은 변수명을 설정합니다 (변수는 자동으로 생성됩니다). 그 변수를 사용하여 사용자 입력에 따라 동작할 수 있습니다." + variables-info4: "함수를 사용하면 반복되는 작업을 손쉽게 처리할 수 있습니다. 함수를 만드시려면 「함수」 타입의 변수를 만듭니다. 함수에서 슬롯(인수)를 받도록 설정하면, 함수를 사용할 때 슬롯에 입력된 값을 함수 안에서 변수로써 이용할 수 있게 됩니다. 또한, AiScript 표준에는 함수를 인수로 받는 함수(고차함수)도 존재합니다. 함수를 미리 정의하는 것 외에, 이와 같은 고차함수를 즉석으로 설정할 수 있습니다." + more-details: "자세한 설명" title: "제목" + url: "페이지 URL" + summary: "페이지 요약" + align-center: "가운데 정렬" + font: "글꼴" + fontSerif: "세리프" + fontSansSerif: "산 세리프" + set-eye-catching-image: "아이캐치 이미지를 설정" + remove-eye-catching-image: "아이캐치 이미지를 삭제" + choose-block: "블록 추가" + select-type: "종류 선택" + enter-variable-name: "변수명을 설정해주십시오" + the-variable-name-is-already-used: "그 변수명은 이미 사용중입니다" + content-blocks: "콘텐츠" + input-blocks: "입력" + special-blocks: "특수" + post-from-post-form: "이 내용을 올리기" + posted-from-post-form: "게시하였습니다" blocks: + text: "텍스트" + textarea: "텍스트 영역" + section: "섹션" image: "이미지" - post: "게시 양식" + button: "버튼" + if: "만약" + _if: + variable: "변수" + post: "글 입력란" _post: text: "내용" + textInput: "텍스트 입력" _textInput: + name: "변수명" text: "제목" + default: "기본값" + textareaInput: "여러 줄 텍스트 입력" _textareaInput: + name: "변수명" text: "제목" + default: "기본값" + numberInput: "수치 입력" _numberInput: + name: "변수명" text: "제목" + default: "기본값" + switch: "스위치" _switch: + name: "변수명" text: "제목" + default: "기본값" + counter: "카운터" _counter: + name: "변수명" text: "제목" + inc: "증가치" _button: text: "제목" + action: "버튼을 눌렀을 때의 동작" _action: + dialog: "대화상자를 표시" _dialog: content: "내용" + resetRandom: "난수를 초기화" script: categories: + flow: "흐름 제어" + logical: "논리 연산" + operation: "계산" + comparison: "비교" random: "랜덤" + value: "값" + fn: "함수" + text: "텍스트 조작" + convert: "변환" list: "리스트" blocks: + text: "텍스트" + multiLineText: "텍스트 (여러줄)" + textList: "텍스트 목록" + _textList: + info: "각각을 줄 바꿈으로 구분해주십시오" + strLen: "텍스트의 길이" + _strLen: + arg1: "텍스트" + strPick: "문자 추출" + _strPick: + arg1: "텍스트" + arg2: "문자 위치" + strReplace: "텍스트 치환" + _strReplace: + arg1: "텍스트" + arg2: "치환 전" + arg3: "치환 후" + strReverse: "텍스트 뒤집기" + _strReverse: + arg1: "텍스트" + join: "텍스트 접합" _join: arg1: "리스트" + arg2: "구분자" + add: "+ 더하기" + _add: + arg1: "A" + arg2: "B" + subtract: "- 빼기" + _subtract: + arg1: "A" + arg2: "B" + multiply: "× 곱하기" + _multiply: + arg1: "A" + arg2: "B" + divide: "÷ 나누기" + _divide: + arg1: "A" + arg2: "B" + remind: "÷ 나눈 나머지" + _remind: + arg1: "A" + arg2: "B" + eq: "A와 B가 동일" + _eq: + arg1: "A" + arg2: "B" + notEq: "A와 B가 다름" + _notEq: + arg1: "A" + arg2: "B" + and: "A 그리고 B" + _and: + arg1: "A" + arg2: "B" + or: "A 혹은 B" + _or: + arg1: "A" + arg2: "B" + lt: "< A가 B보다 작음" + _lt: + arg1: "A" + arg2: "B" + gt: "> A가 B보다 큼" + _gt: + arg1: "A" + arg2: "B" + ltEq: "<= A가 B보다 작거나 같음" + _ltEq: + arg1: "A" + arg2: "B" + gtEq: ">= A가 B보다 크거나 같음" + _gtEq: + arg1: "A" + arg2: "B" + if: "분기" + _if: + arg1: "만약" + arg2: "그러면" + arg3: "그렇지 않으면" + not: "부정" + _not: + arg1: "부정" random: "랜덤" + _random: + arg1: "확률" + rannum: "난수" + _rannum: + arg1: "최소" + arg2: "최대" + randomPick: "목록에서 임의로 선택" _randomPick: arg1: "리스트" + dailyRandom: "랜덤 (하루동안 결과 유지)" + _dailyRandom: + arg1: "확률" + dailyRannum: "난수 (하루동안 결과 유지)" + _dailyRannum: + arg1: "최소" + arg2: "최대" + dailyRandomPick: "목록에서 임의로 선택 (하루동안 결과 유지)" _dailyRandomPick: arg1: "리스트" + seedRandom: "무작위 (시드)" + _seedRandom: + arg1: "시드" + arg2: "확률" + seedRannum: "난수 (시드)" + _seedRannum: + arg1: "시드" + arg2: "최소" + arg3: "최대" + seedRandomPick: "목록에서 무작위로 선택 (시드)" _seedRandomPick: + arg1: "시드" arg2: "리스트" + DRPWPM: "확률형 목록에서 임의로 선택 (하루동안 결과 유지)" + _DRPWPM: + arg1: "텍스트 목록" + pick: "목록에서 선택" _pick: arg1: "리스트" + arg2: "위치" + number: "수치" + stringToNumber: "텍스트를 수치로" + _stringToNumber: + arg1: "텍스트" + numberToString: "수치를 텍스트로" + _numberToString: + arg1: "수치" + splitStrByLine: "텍스트를 행 단위로 분할" + _splitStrByLine: + arg1: "텍스트" + ref: "변수" + fn: "함수" + _fn: + slots: "슬롯" + slots-info: "각 슬롯을 줄 바꿈으로 구분하여 주십시오" + arg1: "출력" + for: "반복" + _for: + arg1: "횟수" + arg2: "처리" + typeError: "슬롯 {slot}은 \"{expect}\"를 사용할 수 있지만 \"{actual}이 들어있습니다!" + thereIsEmptySlot: "슬롯 {slot}이(가) 비었습니다!" types: + string: "텍스트" + number: "수치" + boolean: "플래그" array: "리스트" + stringArray: "텍스트 목록" + emptySlot: "빈 슬롯" + enviromentVariables: "환경 변수" + pageVariables: "페이지 요소" + argVariables: "입력 슬롯" diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml index 755f8ab3f..fd7a27eb9 100644 --- a/locales/nl-NL.yml +++ b/locales/nl-NL.yml @@ -104,10 +104,9 @@ common/views/components/messaging.vue: search-user: "Gebruiker zoeken" you: "Jij" no-history: "Geen geschiedenis" + user: "Gebruiker" common/views/components/messaging-room.vue: - empty: "Geen gesprekken" no-history: "Er is geen verdere geschiedenis" - resize-form: "Versleep om grootte te wijzigen" new-message: "Nieuw bericht" common/views/components/messaging-room.form.vue: input-message-here: "Voer hier je bericht in" @@ -202,6 +201,9 @@ common/views/components/profile-editor.vue: enter-password: "Voer het wachtwoord in" common/views/components/user-list-editor.vue: users: "Gebruiker" + add-user: "Gebruiker toevoegen" +common/views/components/user-lists.vue: + user-lists: "Lijsten" common/views/widgets/broadcast.vue: fetching: "Bezig met ophalen" no-broadcasts: "Geen uitzendingen" @@ -401,8 +403,6 @@ desktop/views/components/ui.header.post.vue: post: "Nieuw bericht opstellen" desktop/views/components/ui.header.search.vue: placeholder: "Zoeken" -desktop/views/components/user-lists-window.vue: - title: "Lijsten" desktop/views/components/user-preview.vue: notes: "Berichten" following: "Volgend" @@ -422,8 +422,6 @@ admin/views/dashboard.vue: notes: "Bericht" admin/views/abuse.vue: remove-report: "Verwijderen" -admin/views/instance.vue: - user-recommendation-config: "Aanbevolen gebruikers" admin/views/charts.vue: notes: "Bericht" users: "Gebruiker" @@ -560,8 +558,6 @@ mobile/views/pages/drive.vue: contextmenu: upload: "Bestand uploaden" create-folder: "Map creëren" -mobile/views/pages/user-lists.vue: - title: "Lijsten" mobile/views/pages/home.vue: home: "Startpagina" local: "Lokaal" @@ -620,6 +616,7 @@ docs: edit-this-page-on-github: "Heb je een fout ontdekt of wil je bijdragen aan de documentatie? " edit-this-page-on-github-link: "Bewerk deze pagina op GitHub!" pages: + like: "Leuk" blocks: image: "Afbeeldingen" script: diff --git a/locales/no-NO.yml b/locales/no-NO.yml index 6e5ff5282..7206c771d 100644 --- a/locales/no-NO.yml +++ b/locales/no-NO.yml @@ -130,6 +130,7 @@ common/views/components/cw-button.vue: hide: "Skjul" common/views/components/messaging.vue: you: "Du" + user: "Bruker" common/views/components/messaging-room.form.vue: send: "Send" common/views/components/messaging-room.message.vue: @@ -192,8 +193,13 @@ common/views/components/profile-editor.vue: user-lists: "Lister" common/views/components/user-list-editor.vue: users: "Bruker" +common/views/components/user-group-editor.vue: + invite: "Inviter" common/views/components/user-lists.vue: + user-lists: "Lister" list-name: "Liste navn" +common/views/components/user-groups.vue: + invites: "Inviter" common/views/widgets/broadcast.vue: fetching: "Henter" next: "Neste" @@ -307,11 +313,6 @@ desktop/views/components/ui.header.post.vue: post: "Skriv nytt innlegg" desktop/views/components/ui.header.search.vue: placeholder: "Søk" -desktop/views/components/received-follow-requests-window.vue: - accept: "Godta" - reject: "Avslå" -desktop/views/components/user-lists-window.vue: - title: "Brukerlister" desktop/views/components/user-preview.vue: notes: "Innlegg" following: "Følger" @@ -448,17 +449,12 @@ mobile/views/components/ui.nav.vue: user-lists: "Lister" game: "Spill" admin: "Admin" -mobile/views/pages/user-lists.vue: - title: "Lister" mobile/views/pages/home.vue: home: "Hjem" local: "Lokalt" global: "Globalt" mobile/views/pages/widgets.vue: add-widget: "Legg til" -mobile/views/pages/received-follow-requests.vue: - accept: "Godta" - reject: "Avslå" mobile/views/pages/note.vue: title: "Innlegg" prev: "Forrige innlegg" @@ -490,6 +486,7 @@ deck/deck.user-column.vue: followers: "Følgere" images: "Bilder" pages: + like: "Lik" blocks: image: "Bilder" script: diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 49845177f..08a5cfeb4 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -166,9 +166,9 @@ common: update-available-title: "Aktualizacja jest dostępna" update-available: "Nowa wersja Misskey jest dostępna ({newer}, obecna to {current}). Odśwież stronę, aby zastosować aktualizację." my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany." - verified-user: "Zweryfikowane konto" hide-password: "Ukryj hasło" show-password: "Pokaż hasło" + enter-username: "Wprowadź nazwę użytkownika" view-on-remote: "Dla dopełnienia, zobacz to zdalnie." renoted-by: "{user} udostępnił(a)" error: @@ -218,8 +218,6 @@ auth/views/index.vue: please-go-back: "Wróć do aplikacji." error: "Sesja nie istnieje." sign-in: "Proszę zalogować się." -common/views/pages/explore.vue: - verified-users: "Zweryfikowane konto" common/views/components/games/reversi/reversi.vue: matching: waiting-for: "Oczekiwanie na {}" @@ -326,18 +324,15 @@ common/views/components/messaging.vue: search-user: "Znajdź użytkownika" you: "Ty" no-history: "Brak historii" + user: "Użytkownicy" common/views/components/messaging-room.vue: - empty: "Brak konwersacji" no-history: "Brak dalszej historii" - resize-form: "Przeciągnij aby zmienić rozmiar" new-message: "Nowa wiadomość" - only-one-file-attached: "Tylko JEDEN plik może zostać dołączony do wiadomości" common/views/components/messaging-room.form.vue: input-message-here: "Wprowadź wiadomość tutaj" send: "Wyślij" attach-from-local: "Załącz pliki z komputera" attach-from-drive: "Załącz pliki z dysku" - only-one-file-attached: "Tylko jeden plik może zostać dołączony do wiadomości" common/views/components/messaging-room.message.vue: is-read: "Przeczytano" deleted: "Wiadomość została usunięta" @@ -514,8 +509,15 @@ common/views/components/user-list-editor.vue: remove-user: "Usuń z tej listy" delete-are-you-sure: "Usunąć listę \"$1\"?" deleted: "Usunięto" + add-user: "Dodaj użytkownika" +common/views/components/user-group-editor.vue: + deleted: "Usunięto" + invite: "Zaproś" common/views/components/user-lists.vue: + user-lists: "Listy" list-name: "Nazwa listy" +common/views/components/user-groups.vue: + invites: "Zaproś" common/views/widgets/broadcast.vue: fetching: "Sprawdzanie" no-broadcasts: "Brak transmisji" @@ -571,6 +573,8 @@ common/views/pages/follow.vue: request-pending: "Oczekiwanie na pozwolenie" follow-processing: "Przetwarzanie śledzenia" follow-request: "Poproś o śledzenie" +common/views/pages/follow-requests.vue: + received-follow-requests: "Prośby o śledzenie" desktop: banner: "Baner" uploading-banner: "Wysyłanie baneru" @@ -832,12 +836,6 @@ desktop/views/components/ui.header.post.vue: post: "Utwórz nowy wpis" desktop/views/components/ui.header.search.vue: placeholder: "Szukaj" -desktop/views/components/received-follow-requests-window.vue: - title: "Prośby o śledzenie" - accept: "Zatwierdź" - reject: "Odmów" -desktop/views/components/user-lists-window.vue: - title: "Listy" desktop/views/components/user-preview.vue: notes: "Wpisy" following: "Śledzeni" @@ -858,7 +856,6 @@ admin/views/index.vue: moderators: "Moderatorzy" users: "Użytkownicy" announcements: "Ogłoszenia" - hashtags: "Hashtagi" admin/views/dashboard.vue: dashboard: "Kokpit" accounts: "Konta" @@ -870,6 +867,7 @@ admin/views/abuse.vue: remove-report: "Usuń" admin/views/instance.vue: instance: "Instancja" + recaptcha-preview: "Pokaż podgląd" github-integration-client-id: "Client ID" github-integration-client-secret: "Client Secret" discord-integration-client-id: "Client ID" @@ -877,7 +875,6 @@ admin/views/instance.vue: invite: "Zaproś" save: "Zapisz" saved: "Zapisano" - user-recommendation-config: "Polecani użytkownicy" email: "Adres e-mail" admin/views/charts.vue: notes: "Wpisy" @@ -907,7 +904,6 @@ admin/views/users.vue: state: all: "Wszyscy" moderator: "Moderatorzy" - verified: "Zweryfikowane konto" origin: title: "Źródło" local: "Lokalny" @@ -953,6 +949,7 @@ admin/views/federation.vue: blocked: "Zablokuj" chart-srcs: requests: "Żądania" + blocked-hosts: "Zablokuj" desktop/views/pages/welcome.vue: about: "O Misskey" timeline: "Oś czasu" @@ -1107,8 +1104,6 @@ mobile/views/pages/drive.vue: contextmenu: upload: "Wyślij plik" create-folder: "Utwórz katalog" -mobile/views/pages/user-lists.vue: - title: "Listy" mobile/views/pages/signup.vue: lets-start: "Rozpocznijmy! 📦" mobile/views/pages/home.vue: @@ -1123,10 +1118,6 @@ mobile/views/pages/widgets.vue: customization-tips: "Wskazówki o dostosowywaniu" mobile/views/pages/widgets/activity.vue: activity: "Aktywność" -mobile/views/pages/received-follow-requests.vue: - title: "Prośby o śledzenie" - accept: "Zatwierdź" - reject: "Odmów" mobile/views/pages/note.vue: title: "Wpis" prev: "Poprzedni wpis" @@ -1201,6 +1192,7 @@ dev/views/new-app.vue: app-name: "Nazwa Aplikacji" authority: "Uprawnienia" pages: + like: "Lubię" title: "Tytuł" blocks: image: "Zdjęcia" diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml index 587aa248c..f2fd2a540 100644 --- a/locales/pt-PT.yml +++ b/locales/pt-PT.yml @@ -89,7 +89,6 @@ common: update-available-title: "Atualização disponível" update-available: "Uma nova versão de Misskey está disponível ({newer}). A versão atual é {current}. Recarregue a página para atualizar." my-token-regenerated: "Seu token foi recriado, portanto você foi deslogado." - verified-user: "Conta verificada" reversi: drawn: "Empatado" my-turn: "Seu turno" @@ -129,8 +128,6 @@ auth/views/index.vue: please-go-back: "Por favor, volte ao aplicativo." error: "A sessão não existe." sign-in: "Por favor, entre." -common/views/pages/explore.vue: - verified-users: "Conta verificada" common/views/components/games/reversi/reversi.index.vue: invite: "Convidar" rule: "Como jogar" @@ -163,6 +160,10 @@ common/views/components/profile-editor.vue: name: "Nome" export-targets: following-list: "Seguindo" +common/views/components/user-group-editor.vue: + invite: "Convidar" +common/views/components/user-groups.vue: + invites: "Convidar" common/views/widgets/posts-monitor.vue: title: "Gráfico de publicações" common/views/widgets/memo.vue: @@ -194,10 +195,6 @@ admin/views/instance.vue: invite: "Convidar" admin/views/drive.vue: delete: "Apagar" -admin/views/users.vue: - users: - state: - verified: "Conta verificada" admin/views/emoji.vue: emojis: remove: "Apagar" @@ -277,6 +274,7 @@ docs: dev/views/index.vue: manage-apps: "Gerenciar aplicativos" pages: + like: "Curtir" blocks: image: "Imagens" post: "Formulário de publicação" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 4a181aa63..002e3bfab 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -147,6 +147,7 @@ mobile/views/components/sub-note-content.vue: mobile/views/pages/widgets.vue: customization-tips: "Советы по настройке" pages: + like: "Нравится" script: categories: random: "Случайно" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 2629aa71d..ec62f21b2 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -145,7 +145,7 @@ common: profile: "个人资料" notification: "通知" apps: "应用程序" - tags: "标签" + tags: "哈希标签" mute-and-block: "屏蔽/拉黑" blocking: "拉黑" security: "安全性" @@ -168,7 +168,7 @@ common: use-avatar-reversi-stones: "用头像作为黑白棋的棋子" disable-animated-mfm: "在帖子中禁用动画文本" disable-showing-animated-images: "不播放动画" - suggest-recent-hashtags: "在帖子表单上显示最近流行的主题标签" + suggest-recent-hashtags: "在帖子表单上显示最近流行的哈希标签" always-show-nsfw: "总是显示 NSFW 的内容" always-mark-nsfw: "总是用 NSFW 来标记附件" show-full-acct: "不要从用户名中忽略主机名" @@ -251,9 +251,9 @@ common: update-available-title: "有可用更新" update-available: "新的 Misskey 版本现已发布({newer}。目前版本{current}). 刷新页面以应用更新。" my-token-regenerated: "您的 Token 已被重置, 您将自动登出。" - verified-user: "认证用户" hide-password: "隐藏密码" show-password: "显示密码" + enter-username: "请输入用户名" do-not-use-in-production: "这是一个开发者测试版. 请勿在生产环境中使用." user-suspended: "该用户已被冻结。" is-remote-user: "此用户信息可能不准确。" @@ -298,7 +298,7 @@ common: server: "服务器信息" nav: "导航" tips: "提示" - hashtags: "标签" + hashtags: "哈希标签" queue: "队列" dev: "构建应用程序失败，请再试一次。" ai-chan-kawaii: "小蓝真可爱" @@ -319,7 +319,7 @@ auth/views/index.vue: error: "会话不存在。" sign-in: "请登录。" common/views/pages/explore.vue: - verified-users: "官方账户" + pinned-users: "已置顶用户" popular-users: "热门用户" recently-updated-users: "活跃用户" recently-registered-users: "新用户" @@ -449,18 +449,23 @@ common/views/components/messaging.vue: search-user: "查找用户" you: "您" no-history: "没有历史记录" + user: "用户" + group: "群组" + start-with-user: "开始用户聊天" + start-with-group: "开始群组聊天" + select-group: "请选择群组" common/views/components/messaging-room.vue: - empty: "没有对话" + not-talked-user: "没有用户的会话记录" + not-talked-group: "没有群组的会话记录" no-history: "没有更多的历史记录" - resize-form: "拖动以调整大小" new-message: "新信息" - only-one-file-attached: "只有一个附件可以附加到消息中。" + only-one-file-attached: "只能添加一个附件" common/views/components/messaging-room.form.vue: input-message-here: "在此键入信息" send: "发送" attach-from-local: "从电脑中添加文件" attach-from-drive: "从网盘中添加文件" - only-one-file-attached: "在信息中只允许添加一个附件" + only-one-file-attached: "只能添加一个附件" common/views/components/messaging-room.message.vue: is-read: "已读" deleted: "此消息已被删除" @@ -470,9 +475,10 @@ common/views/components/nav.vue: status: "状态" wiki: "维基百科" donors: "捐赠者" - repository: "代码库" + repository: "源码库" develop: "开发人员" feedback: "反馈" + tos: "服务条款" common/views/components/note-menu.vue: mention: "提到" detail: "详细信息" @@ -585,6 +591,8 @@ common/views/components/signup.vue: password-matched: "确认" password-not-matched: "密码不一致" recaptcha: "验证" + agree-to: "同意{0}" + tos: "服务条款" create: "创建一个账户" some-error: "由于某种原因，创建帐户失败。请再试一次。" common/views/components/special-message.vue: @@ -692,9 +700,32 @@ common/views/components/user-list-editor.vue: remove-user: "从此列表中删除" delete-are-you-sure: "删除列表“$1”？" deleted: "已删除" + add-user: "添加用户" +common/views/components/user-group-editor.vue: + users: "成员" + rename: "更改群组名" + delete: "删除群组" + transfer: "群组转让" + transfer-are-you-sure: "将群组「$1」转让给「@$2」吗？" + transferred: "群组已转让" + remove-user: "从本群组中删除" + delete-are-you-sure: "确定要删除「$1」组？" + deleted: "已删除" + invite: "邀请" + invited: "邀请已发送" common/views/components/user-lists.vue: + user-lists: "列表" create-list: "创建列表" list-name: "列表名称" +common/views/components/user-groups.vue: + user-groups: "群组" + create-group: "创建群组" + group-name: "群组名" + owned-groups: "我的群组" + joined-groups: "加入群组" + invites: "邀请" + accept-invite: "加入" + reject-invite: "拒绝" common/views/widgets/broadcast.vue: fetching: "确认中" no-broadcasts: "没有公告" @@ -714,7 +745,7 @@ common/views/widgets/posts-monitor.vue: title: "投稿表格" toggle: "切换视图" common/views/widgets/hashtags.vue: - title: "标签" + title: "哈希标签" common/views/widgets/server.vue: title: "服务器信息" toggle: "切换显示" @@ -756,6 +787,10 @@ common/views/pages/follow.vue: request-pending: "发送关注申请" follow-processing: "申请处理中" follow-request: "关注请求" +common/views/pages/follow-requests.vue: + received-follow-requests: "关注申请" + accept: "接受" + reject: "拒绝" desktop: banner-crop-title: "裁剪显示为背景的部分" banner: "背景" @@ -1017,8 +1052,8 @@ desktop/views/components/timeline.vue: mentions: "提到的" messages: "直接发布" list: "列表" - hashtag: "标签" - add-tag-timeline: "添加标签" + hashtag: "哈希标签" + add-tag-timeline: "添加哈希标签" add-list: "添加列表" list-name: "列表名称" desktop/views/components/ui.header.vue: @@ -1027,6 +1062,7 @@ desktop/views/components/ui.header.vue: desktop/views/components/ui.header.account.vue: profile: "个人资料" lists: "列表" + groups: "群组" follow-requests: "关注申请" admin: "管理" desktop/views/components/ui.header.nav.vue: @@ -1037,12 +1073,6 @@ desktop/views/components/ui.header.post.vue: post: "撰写新帖子" desktop/views/components/ui.header.search.vue: placeholder: "搜索" -desktop/views/components/received-follow-requests-window.vue: - title: "关注申请" - accept: "接收" - reject: "拒绝" -desktop/views/components/user-lists-window.vue: - title: "用户列表" desktop/views/components/user-preview.vue: notes: "帖子" following: "关注中" @@ -1064,7 +1094,6 @@ admin/views/index.vue: users: "用户" federation: "联合" announcements: "公告" - hashtags: "标签" abuse: "举报垃圾信息" queue: "作业队列" logs: "登录" @@ -1091,14 +1120,34 @@ admin/views/instance.vue: instance-name: "实例名称" instance-description: "实例介绍" host: "主机名" + icon-url: "图标URL" + logo-url: "Logo URL" banner-url: "背景图片地址" error-image-url: "无效的图像URL" languages: "实例语言" languages-desc: "您可以添加多个，以空格分隔。" + tos-url: "服务条款URL" + repository-url: "源码库URL" + feedback-url: "反馈URL" maintainer-config: "管理员信息" maintainer-name: "管理员名称" maintainer-email: "联系管理员" + advanced-config: "其他设置" + note-and-tl: "帖子和时间线" drive-config: "网盘设置" + use-object-storage: "使用对象存储" + object-storage-base-url: "URL" + object-storage-bucket: "存储空间名" + object-storage-prefix: "前缀" + object-storage-endpoint: "端点" + object-storage-region: "区域" + object-storage-port: "端口" + object-storage-access-key: "访问密钥" + object-storage-secret-key: "密钥" + object-storage-use-ssl: "使用 SSL" + object-storage-s3-info: "使用Amazon S3作为对象存储时，请确认{0}相关“终端”和“区域”的设置。" + object-storage-s3-info-here: "这里" + object-storage-gcs-info: "将Google Cloud Storage用作对象存储时，请将“终端”设置为storage.googleapis.com，并将“区域”留空。" cache-remote-files: "远程文件缓存" cache-remote-files-desc: "如果没有此参数，则所有远程文件都将直接链接到其主机服务器。 这将是保存服务器存储的有效解决方案，但是对于设置禁用直接链接的用户而言，远程文件不可见，因为不会生成缩略图，从而增加流量。 建议启用此参数集。" local-drive-capacity-mb: "每个用户的网盘空间" @@ -1106,9 +1155,14 @@ admin/views/instance.vue: mb: "以兆字节(Mbps)为单位" recaptcha-config: "reCAPTCHA设置" recaptcha-info: "reCAPTCHA token是必要的. 请从 https://www.google.com/recaptcha/intro/ 获取。\n请注意, 该功能在中国大陆不可用。" + recaptcha-info2: "不支持v3。请使用v2。" enable-recaptcha: "启用 reCAPTCHA\n(请注意, 此功能在中国大陆不可用. 如果启用, 可能导致无法正常使用登录或注册等功能)" - recaptcha-site-key: "reCAPTCHA site key" - recaptcha-secret-key: "reCAPTCHA secret key" + recaptcha-site-key: "网站密钥" + recaptcha-secret-key: "密钥" + recaptcha-preview: "预览" + hidden-tags: "隐藏哈希标签" + hidden-tags-info: "使用换行符分隔要从集合中排除的哈希标签。" + external-service-integration-config: "连接外部服务" twitter-integration-config: "连接到Twitter的设置" twitter-integration-info: "设置返回的URL{url}。" enable-twitter-integration: "启用连接到Twitter" @@ -1139,7 +1193,8 @@ admin/views/instance.vue: invite: "邀请" save: "保存" saved: "保存完毕" - user-recommendation-config: "推荐用户" + pinned-users: "置顶用户" + pinned-users-info: "描述您要置顶的用户，以换行符分隔。" email-config: "电子邮件服务器设置" email-config-info: "用于确认电子邮件和密码重置等。" enable-email: "启用电子邮件送递" @@ -1223,14 +1278,10 @@ admin/views/users.vue: silence-confirm: "确认屏蔽？" unmake-silence: "解除禁言" unsilence-confirm: "解除屏蔽？" - verify: "认证用户" - verify-confirm: "是否官方账号？" - verified: "此账户已被认证" - unverify: "解除账户认证" - unverify-confirm: "是否解除官方账号认证？" - unverified: "该帐户未经认证" update-remote-user: "更新远程用户信息" remote-user-updated: "远程用户信息已更新" + delete-all-files: "删除所有文件" + delete-all-files-confirm: "删除所有文件吗？" users: title: "用户" sort: @@ -1245,7 +1296,6 @@ admin/views/users.vue: admin: "管理员" moderator: "版主" adminOrModerator: "管理员+版主" - verified: "官方认证账户" silenced: "已禁言" suspended: "已冻结" origin: @@ -1307,6 +1357,7 @@ admin/views/federation.vue: latest-request-received-at: "上次收到的请求" remove-all-following: "取消所有关注" remove-all-following-info: "取消{host}的所有关注者。当实例不存在时执行。" + delete-all-files: "删除所有文件" block: "拉黑" marked-as-closed: "标记为已关闭" lookup: "查询" @@ -1353,6 +1404,8 @@ admin/views/federation.vue: chart-spans: hour: "每小时" day: "每天" + blocked-hosts: "拉黑" + blocked-hosts-info: "描述您要阻止的主机，以换行符分隔。" desktop/views/pages/welcome.vue: about: "更多信息..." timeline: "时间线" @@ -1374,7 +1427,7 @@ desktop/views/pages/search.vue: not-available: "在此实例的设置中关闭搜索功能。" not-found: "没有找到“{q}”的帖子" desktop/views/pages/tag.vue: - no-posts-found: "没有找到带有主题标签“{q}”的帖子" + no-posts-found: "没有找到带有哈希标签“{q}”的帖子" desktop/views/pages/user-list.users.vue: users: "用户" add-user: "添加用户" @@ -1450,7 +1503,7 @@ mobile/views/components/drive.file-detail.vue: download: "下载" rename: "重命名" move: "移动" - hash: "Hash (md5)" + hash: "哈希(md5)" exif: "EXIF" nsfw: "阅读注意" mark-as-sensitive: "标记为“敏感”" @@ -1509,6 +1562,7 @@ mobile/views/components/ui.nav.vue: follow-requests: "关注申请" search: "搜索" user-lists: "列表" + user-groups: "群组" widgets: "小部件" game: "游戏" admin: "管理" @@ -1521,8 +1575,6 @@ mobile/views/pages/drive.vue: rename-folder: "重命名文件夹" move-folder: "移动此文件夹" delete-folder: "删除此文件夹" -mobile/views/pages/user-lists.vue: - title: "列表" mobile/views/pages/signup.vue: lets-start: "您的账户现已准备就绪！ 📦" mobile/views/pages/followers.vue: @@ -1537,7 +1589,7 @@ mobile/views/pages/home.vue: mentions: "Mentions" messages: "直接发布" mobile/views/pages/tag.vue: - no-posts-found: "没有找到带有主题标签“{q}”的帖子" + no-posts-found: "没有找到带有哈希标签“{q}”的帖子" mobile/views/pages/widgets.vue: dashboard: "仪表盘" widgets-hints: "您可以添加/删除/重新排列小部件。 要移动小部件，请拖动“三”。 点击“×”删除小部件。 某些小部件可以通过点击来更改显示。" @@ -1547,10 +1599,6 @@ mobile/views/pages/widgets/activity.vue: activity: "活动" mobile/views/pages/share.vue: share-with: "共享{name}" -mobile/views/pages/received-follow-requests.vue: - title: "关注申请" - accept: "批准" - reject: "拒绝" mobile/views/pages/note.vue: title: "帖文" prev: "上一个帖子" @@ -1589,7 +1637,7 @@ deck: home: "首页" local: "Local" hybrid: "社交" - hashtag: "标签" + hashtag: "哈希标签" global: "Global" mentions: "Mentions" direct: "直接发布" @@ -1656,6 +1704,10 @@ pages: edit-this-page: "编辑此页面" view-source: "查看源代码" view-page: "查看页面" + like: "赞" + unlike: "取消赞" + liked-pages: "喜欢的页面" + my-pages: "个人页面" inspector: "检查器" content: "页面内容" variables: "变量" @@ -1671,6 +1723,8 @@ pages: font: "字体" fontSerif: "衬线字体" fontSansSerif: "无衬线字体" + set-eye-catching-image: "设置封面图片" + remove-eye-catching-image: "删除封面图片" choose-block: "添加块" select-type: "类型选择" enter-variable-name: "请确定变量名" @@ -1735,6 +1789,7 @@ pages: value: "值" fn: "函数" text: "文本操作" + convert: "转换" list: "列表" blocks: text: "文本" @@ -1818,6 +1873,9 @@ pages: arg1: "如果" arg2: "的话" arg3: "否则" + not: "否定" + _not: + arg1: "否定" random: "随机" _random: arg1: "概率" @@ -1851,6 +1909,7 @@ pages: _seedRandomPick: arg1: "种子" arg2: "列表" + DRPWPM: "从概率列表中随机选择(每用户每天)" _DRPWPM: arg1: "文本列表" pick: "从列表中选择" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index f3ff7f55b..9d8d8ebb6 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -86,3 +86,5 @@ admin/views/dashboard.vue: drive: "雲端硬碟" admin/views/charts.vue: drive: "雲端硬碟" +pages: + like: "贊" diff --git a/migration/1556746559567-UserProfile.ts b/migration/1556746559567-UserProfile.ts index 719f8e1ae..2dc7349cc 100644 --- a/migration/1556746559567-UserProfile.ts +++ b/migration/1556746559567-UserProfile.ts @@ -3,21 +3,14 @@ import {MigrationInterface, QueryRunner} from "typeorm"; export class UserProfile1556746559567 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`); - await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`); - await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" VARCHAR(64)`); - await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`); - await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`); - await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" VARCHAR(64)`); + await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE VARCHAR(64) USING "githubId"::VARCHAR(64)`); + await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE VARCHAR(64) USING "discordExpiresDate"::VARCHAR(64)`); } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`); - await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`); - await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" INTEGER`); - await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`); - await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`); - await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" INTEGER`); + await queryRunner.query(`UPDATE "user_profile" SET github = FALSE, discord = FALSE`); + await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE INTEGER USING NULL`); + await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE INTEGER USING NULL`); } } diff --git a/migration/1557761316509-AddSomeUrls.ts b/migration/1557761316509-AddSomeUrls.ts new file mode 100644 index 000000000..a0a2c7970 --- /dev/null +++ b/migration/1557761316509-AddSomeUrls.ts @@ -0,0 +1,16 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class AddSomeUrls1557761316509 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/syuilo/misskey'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/syuilo/misskey/issues/new'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "feedbackUrl"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "repositoryUrl"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "ToSUrl"`); + } +} diff --git a/migration/1557932705754-ObjectStorageSetting.ts b/migration/1557932705754-ObjectStorageSetting.ts new file mode 100644 index 000000000..dde6aa65f --- /dev/null +++ b/migration/1557932705754-ObjectStorageSetting.ts @@ -0,0 +1,31 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class ObjectStorageSetting1557932705754 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "meta" ADD "useObjectStorage" boolean NOT NULL DEFAULT false`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBucket" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStoragePrefix" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageBaseUrl" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageEndpoint" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageRegion" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageAccessKey" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageSecretKey" character varying(512)`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStoragePort" integer`); + await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageUseSSL" boolean NOT NULL DEFAULT true`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageUseSSL"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStoragePort"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageSecretKey"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageAccessKey"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageRegion"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageEndpoint"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageBaseUrl"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStoragePrefix"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageBucket"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useObjectStorage"`); + } + +} diff --git a/migration/1558072954435-PageLike.ts b/migration/1558072954435-PageLike.ts new file mode 100644 index 000000000..93cdb8afe --- /dev/null +++ b/migration/1558072954435-PageLike.ts @@ -0,0 +1,23 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class PageLike1558072954435 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE "page_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "pageId" character varying(32) NOT NULL, CONSTRAINT "PK_813f034843af992d3ae0f43c64c" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE INDEX "IDX_0e61efab7f88dbb79c9166dbb4" ON "page_like" ("userId") `); + await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa" ON "page_like" ("userId", "pageId") `); + await queryRunner.query(`ALTER TABLE "page" ADD "likedCount" integer NOT NULL DEFAULT 0`); + await queryRunner.query(`ALTER TABLE "page_like" ADD CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "page_like" ADD CONSTRAINT "FK_cf8782626dced3176038176a847" FOREIGN KEY ("pageId") REFERENCES "page"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "page_like" DROP CONSTRAINT "FK_cf8782626dced3176038176a847"`); + await queryRunner.query(`ALTER TABLE "page_like" DROP CONSTRAINT "FK_0e61efab7f88dbb79c9166dbb48"`); + await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "likedCount"`); + await queryRunner.query(`DROP INDEX "IDX_4ce6fb9c70529b4c8ac46c9bfa"`); + await queryRunner.query(`DROP INDEX "IDX_0e61efab7f88dbb79c9166dbb4"`); + await queryRunner.query(`DROP TABLE "page_like"`); + } + +} diff --git a/migration/1558103093633-UserGroup.ts b/migration/1558103093633-UserGroup.ts new file mode 100644 index 000000000..04783b8df --- /dev/null +++ b/migration/1558103093633-UserGroup.ts @@ -0,0 +1,41 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class UserGroup1558103093633 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE "user_group" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "isPrivate" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_3c29fba6fe013ec8724378ce7c9" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE INDEX "IDX_20e30aa35180e317e133d75316" ON "user_group" ("createdAt") `); + await queryRunner.query(`CREATE INDEX "IDX_3d6b372788ab01be58853003c9" ON "user_group" ("userId") `); + await queryRunner.query(`CREATE TABLE "user_group_joining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_15f2425885253c5507e1599cfe7" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23" ON "user_group_joining" ("userId") `); + await queryRunner.query(`CREATE INDEX "IDX_67dc758bc0566985d1b3d39986" ON "user_group_joining" ("userGroupId") `); + await queryRunner.query(`ALTER TABLE "messaging_message" ADD "groupId" character varying(32)`); + await queryRunner.query(`ALTER TABLE "messaging_message" ADD "reads" character varying(32) array NOT NULL DEFAULT '{}'::varchar[]`); + await queryRunner.query(`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" DROP NOT NULL`); + await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."recipientId" IS 'The recipient user ID.'`); + await queryRunner.query(`CREATE INDEX "IDX_2c4be03b446884f9e9c502135b" ON "messaging_message" ("groupId") `); + await queryRunner.query(`ALTER TABLE "messaging_message" ADD CONSTRAINT "FK_2c4be03b446884f9e9c502135be" FOREIGN KEY ("groupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "user_group" ADD CONSTRAINT "FK_3d6b372788ab01be58853003c93" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "user_group_joining" ADD CONSTRAINT "FK_67dc758bc0566985d1b3d399865" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_67dc758bc0566985d1b3d399865"`); + await queryRunner.query(`ALTER TABLE "user_group_joining" DROP CONSTRAINT "FK_f3a1b4bd0c7cabba958a0c0b231"`); + await queryRunner.query(`ALTER TABLE "user_group" DROP CONSTRAINT "FK_3d6b372788ab01be58853003c93"`); + await queryRunner.query(`ALTER TABLE "messaging_message" DROP CONSTRAINT "FK_2c4be03b446884f9e9c502135be"`); + await queryRunner.query(`DROP INDEX "IDX_2c4be03b446884f9e9c502135b"`); + await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."recipientId" IS ''`); + await queryRunner.query(`ALTER TABLE "messaging_message" ALTER COLUMN "recipientId" SET NOT NULL`); + await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "reads"`); + await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "groupId"`); + await queryRunner.query(`DROP INDEX "IDX_67dc758bc0566985d1b3d39986"`); + await queryRunner.query(`DROP INDEX "IDX_f3a1b4bd0c7cabba958a0c0b23"`); + await queryRunner.query(`DROP TABLE "user_group_joining"`); + await queryRunner.query(`DROP INDEX "IDX_3d6b372788ab01be58853003c9"`); + await queryRunner.query(`DROP INDEX "IDX_20e30aa35180e317e133d75316"`); + await queryRunner.query(`DROP TABLE "user_group"`); + } + +} diff --git a/migration/1558257926829-UserGroupInvite.ts b/migration/1558257926829-UserGroupInvite.ts new file mode 100644 index 000000000..a78e47922 --- /dev/null +++ b/migration/1558257926829-UserGroupInvite.ts @@ -0,0 +1,25 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class UserGroupInvite1558257926829 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE "user_group_invite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_3893884af0d3a5f4d01e7921a97" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE INDEX "IDX_1039988afa3bf991185b277fe0" ON "user_group_invite" ("userId") `); + await queryRunner.query(`CREATE INDEX "IDX_e10924607d058004304611a436" ON "user_group_invite" ("userGroupId") `); + await queryRunner.query(`CREATE UNIQUE INDEX "IDX_78787741f9010886796f2320a4" ON "user_group_invite" ("userId", "userGroupId") `); + await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d9ecaed8c6dc43f3592c229282" ON "user_group_joining" ("userId", "userGroupId") `); + await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_1039988afa3bf991185b277fe03" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_e10924607d058004304611a436a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_e10924607d058004304611a436a"`); + await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_1039988afa3bf991185b277fe03"`); + await queryRunner.query(`DROP INDEX "IDX_d9ecaed8c6dc43f3592c229282"`); + await queryRunner.query(`DROP INDEX "IDX_78787741f9010886796f2320a4"`); + await queryRunner.query(`DROP INDEX "IDX_e10924607d058004304611a436"`); + await queryRunner.query(`DROP INDEX "IDX_1039988afa3bf991185b277fe0"`); + await queryRunner.query(`DROP TABLE "user_group_invite"`); + } + +} diff --git a/migration/1558266512381-UserListJoining.ts b/migration/1558266512381-UserListJoining.ts new file mode 100644 index 000000000..f4a917045 --- /dev/null +++ b/migration/1558266512381-UserListJoining.ts @@ -0,0 +1,13 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class UserListJoining1558266512381 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_joining" ("userId", "userListId") `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DROP INDEX "IDX_90f7da835e4c10aca6853621e1"`); + } + +} diff --git a/package.json b/package.json index bc7b2f514..3e7dde6c1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.12.0", + "version": "11.20.0", "codename": "daybreak", "repository": { "type": "git", @@ -12,6 +12,9 @@ "scripts": { "start": "node ./index.js", "init": "node ./built/init.js", + "ormconfig": "node ./built/ormconfig.js", + "migrate": "npm run ormconfig && ts-node ./node_modules/typeorm/cli.js migration:run", + "migrateandstart": "npm run migrate && npm run start", "build": "webpack && gulp build", "webpack": "webpack", "watch": "webpack --watch", @@ -22,6 +25,10 @@ "test": "gulp test", "format": "gulp format" }, + "resolutions": { + "gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1", + "video-thumbnail-generator/lodash": "^4.17.11" + }, "dependencies": { "@elastic/elasticsearch": "7.0.0-rc.2", "@fortawesome/fontawesome-svg-core": "1.2.15", @@ -30,13 +37,11 @@ "@fortawesome/free-solid-svg-icons": "5.7.2", "@fortawesome/vue-fontawesome": "0.1.5", "@koa/cors": "2.2.3", - "@prezzemolo/zip": "0.0.3", "@types/bcryptjs": "2.4.2", "@types/bull": "3.5.11", "@types/dateformat": "3.0.0", "@types/deep-equal": "1.0.1", "@types/double-ended-queue": "2.1.0", - "@types/file-type": "10.9.1", "@types/gulp": "4.0.6", "@types/gulp-mocha": "0.0.32", "@types/gulp-rename": "0.0.33", @@ -94,17 +99,17 @@ "@types/websocket": "0.0.40", "@types/ws": "6.0.1", "animejs": "3.0.1", - "apexcharts": "3.6.9", + "apexcharts": "3.6.12", "autobind-decorator": "2.4.0", "autosize": "4.0.2", "autwh": "0.1.0", "bcryptjs": "2.4.3", "bootstrap-vue": "2.0.0-rc.13", - "bull": "3.8.1", + "bull": "3.9.1", "cafy": "15.1.1", "chai": "4.2.0", "chalk": "2.4.2", - "cli-highlight": "2.1.0", + "cli-highlight": "2.1.1", "commander": "2.20.0", "content-disposition": "0.5.3", "crc-32": "1.2.0", @@ -121,7 +126,7 @@ "feed": "2.0.4", "file-type": "10.11.0", "fuckadblock": "3.2.1", - "gulp": "4.0.1", + "gulp": "4.0.2", "gulp-cssnano": "2.1.3", "gulp-imagemin": "5.0.3", "gulp-mocha": "6.0.0", @@ -140,7 +145,7 @@ "is-root": "2.1.0", "is-svg": "4.1.0", "js-yaml": "3.13.1", - "jsdom": "15.0.0", + "jsdom": "15.1.0", "json5": "2.1.0", "json5-loader": "2.0.0", "katex": "0.10.1", @@ -173,7 +178,7 @@ "os-utils": "0.0.14", "parse5": "5.1.0", "parsimmon": "1.12.0", - "pg": "7.10.0", + "pg": "7.11.0", "portscanner": "2.2.0", "postcss-loader": "3.0.0", "prismjs": "1.16.0", @@ -212,7 +217,7 @@ "summaly": "2.2.0", "systeminformation": "4.1.6", "syuilo-password-strength": "0.0.1", - "terser-webpack-plugin": "1.2.3", + "terser-webpack-plugin": "1.2.4", "textarea-caret": "3.1.0", "tinycolor2": "1.4.1", "tmp": "0.1.0", @@ -245,13 +250,13 @@ "vue-style-loader": "4.1.2", "vue-svg-inline-loader": "1.2.15", "vue-template-compiler": "2.6.10", - "vuedraggable": "2.20.0", + "vuedraggable": "2.21.0", "vuewordcloud": "18.7.11", - "vuex": "3.1.0", + "vuex": "3.1.1", "vuex-persistedstate": "2.5.4", - "web-push": "3.3.3", - "webpack": "4.30.0", - "webpack-cli": "3.3.1", + "web-push": "3.3.5", + "webpack": "4.32.2", + "webpack-cli": "3.3.2", "websocket": "1.0.28", "ws": "7.0.0", "xev": "2.0.1" diff --git a/src/boot/master.ts b/src/boot/master.ts index 503f09c1f..6c23a528f 100644 --- a/src/boot/master.ts +++ b/src/boot/master.ts @@ -50,7 +50,7 @@ export async function masterMain() { // initialize app config = await init(); - if (config.port == null) { + if (config.port == null || Number.isNaN(config.port)) { bootLogger.error('The port is not configured. Please configure port.', null, true); process.exit(1); } diff --git a/src/client/app/admin/views/announcements.vue b/src/client/app/admin/views/announcements.vue index c1b2d6778..f6c0540b3 100644 --- a/src/client/app/admin/views/announcements.vue +++ b/src/client/app/admin/views/announcements.vue @@ -1,7 +1,7 @@ @@ -149,7 +162,7 @@ import Vue from 'vue'; import i18n from '../../i18n'; import { faPaperPlane } from '@fortawesome/free-regular-svg-icons'; -import { faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-svg-icons'; +import { faTrashAlt, faBan, faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faTrafficLight, faInbox } from '@fortawesome/free-solid-svg-icons'; import ApexCharts from 'apexcharts'; import * as tinycolor from 'tinycolor2'; @@ -176,7 +189,8 @@ export default Vue.extend({ chartSrc: 'requests', chartSpan: 'hour', chartInstance: null, - faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox + blockedHosts: '', + faTrashAlt, faBan, faGlobe, faTerminal, faSearch, faMinusCircle, faServer, faCrosshairs, faEnvelopeOpenText, faUsers, faCaretDown, faCaretUp, faPaperPlane, faTrafficLight, faInbox }; }, @@ -246,6 +260,10 @@ export default Vue.extend({ mounted() { this.fetchInstances(); + + this.$root.getMeta().then(meta => { + this.blockedHosts = meta.blockedHosts.join('\n'); + }); }, beforeDestroy() { @@ -293,6 +311,17 @@ export default Vue.extend({ }); }, + deleteAllFiles() { + this.$root.api('admin/federation/delete-all-files', { + host: this.instance.host + }).then(() => { + this.$root.dialog({ + type: 'success', + splash: true + }); + }); + }, + updateInstance() { this.$root.api('admin/federation/update-instance', { host: this.instance.host, @@ -477,6 +506,22 @@ export default Vue.extend({ }] }; }, + + saveBlockedHosts() { + this.$root.api('admin/update-meta', { + blockedHosts: this.blockedHosts.split('\n') + }).then(() => { + this.$root.dialog({ + type: 'success', + text: this.$t('saved') + }); + }).catch(e => { + this.$root.dialog({ + type: 'error', + text: e + }); + }); + } } }); diff --git a/src/client/app/admin/views/hashtags.vue b/src/client/app/admin/views/hashtags.vue deleted file mode 100644 index e1cc4b494..000000000 --- a/src/client/app/admin/views/hashtags.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - diff --git a/src/client/app/admin/views/index.vue b/src/client/app/admin/views/index.vue index 4bce197ed..43e47038f 100644 --- a/src/client/app/admin/views/index.vue +++ b/src/client/app/admin/views/index.vue @@ -28,7 +28,6 @@
  • {{ $t('federation') }}
  • {{ $t('emoji') }}
  • {{ $t('announcements') }}
    • -
  • {{ $t('hashtags') }}
  • {{ $t('abuse') }}
    • @@ -48,7 +47,6 @@
    -
    @@ -68,7 +66,6 @@ import XLogs from "./logs.vue"; import XModerators from "./moderators.vue"; import XEmoji from "./emoji.vue"; import XAnnouncements from "./announcements.vue"; -import XHashtags from "./hashtags.vue"; import XUsers from "./users.vue"; import XDrive from "./drive.vue"; import XAbuse from "./abuse.vue"; @@ -91,7 +88,6 @@ export default Vue.extend({ XModerators, XEmoji, XAnnouncements, - XHashtags, XUsers, XDrive, XAbuse, diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index d81edc8fe..588b24f6b 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -2,140 +2,242 @@
    -
    +
    {{ $t('host') }} {{ $t('instance-name') }} {{ $t('instance-description') }} {{ $t('icon-url') }} {{ $t('logo-url') }} {{ $t('banner-url') }} - {{ $t('error-image-url') }} - {{ $t('languages') }} + {{ $t('tos-url') }} +
    + {{ $t('advanced-config') }} + {{ $t('error-image-url') }} + {{ $t('languages') }} + {{ $t('repository-url') }} + {{ $t('feedback-url') }} +
    {{ $t('maintainer-config') }}
    {{ $t('maintainer-name') }} {{ $t('maintainer-email') }}
    +
    + {{ $t('disable-registration') }} + {{ $t('invite') }} +
    +
    + {{ $t('save') }} +
    + + + +
    {{ $t('max-note-text-length') }}
    - {{ $t('disable-registration') }} {{ $t('disable-local-timeline') }} {{ $t('disable-global-timeline') }} {{ $t('disabling-timelines-info') }} +
    +
    {{ $t('enable-emoji-reaction') }} {{ $t('use-star-for-reaction-fallback') }}
    -
    -
    {{ $t('drive-config') }}
    +
    + {{ $t('save') }} +
    + + + + +
    + {{ $t('use-object-storage') }} + +
    +
    {{ $t('cache-remote-files') }} +
    +
    {{ $t('local-drive-capacity-mb') }} {{ $t('remote-drive-capacity-mb') }}
    -
    -
    {{ $t('recaptcha-config') }}
    - {{ $t('enable-recaptcha') }} - {{ $t('recaptcha-info') }} - - {{ $t('recaptcha-site-key') }} - {{ $t('recaptcha-secret-key') }} - -
    -
    {{ $t('proxy-account-config') }}
    + {{ $t('save') }} +
    +     + + + +
    + + + + {{ $t('save') }} +
    +     + + + +
    {{ $t('proxy-account-info') }} {{ $t('proxy-account-username') }} {{ $t('proxy-account-warn') }}
    -
    {{ $t('email-config') }}
    + {{ $t('save') }} +
    +     + + + +
    {{ $t('enable-email') }} - {{ $t('email') }} - - {{ $t('smtp-host') }} - {{ $t('smtp-port') }} - - {{ $t('smtp-auth') }} - - {{ $t('smtp-user') }} - {{ $t('smtp-pass') }} - - {{ $t('smtp-secure') }} +
    -
    {{ $t('serviceworker-config') }}
    + {{ $t('save') }} +
    +     + + + +
    {{ $t('enable-serviceworker') }} - {{ $t('vapid-info') }}
    npm i web-push -g
    web-push generate-vapid-keys     - - {{ $t('vapid-publickey') }} - {{ $t('vapid-privatekey') }} - +
    -
    summaly Proxy
    - URL -
    -
    - {{ $t('save') }} + {{ $t('save') }}
    - + +
    + {{ $t('enable-recaptcha') }} + +
    +
    +
    {{ $t('recaptcha-preview') }}
    +
    +
    - - {{ $t('save') }} + {{ $t('save') }}
    - -
    - {{ $t('invite') }} -

    Code: {{ inviteCode }}

    -
    -     - - - +
    +
    {{ $t('twitter-integration-config') }}
    {{ $t('enable-twitter-integration') }} - - {{ $t('twitter-integration-consumer-key') }} - {{ $t('twitter-integration-consumer-secret') }} - - {{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }} - {{ $t('save') }} +
    -     - - -
    +
    {{ $t('github-integration-config') }}
    {{ $t('enable-github-integration') }} - - {{ $t('github-integration-client-id') }} - {{ $t('github-integration-client-secret') }} - - {{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }} - {{ $t('save') }} + +
    +
    +
    {{ $t('discord-integration-config') }}
    + {{ $t('enable-discord-integration') }} + +
    +
    + {{ $t('save') }}
    - - -
    - {{ $t('enable-discord-integration') }} - - {{ $t('discord-integration-client-id') }} - {{ $t('discord-integration-client-secret') }} - - {{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }} - {{ $t('save') }} -
    -     +
    + {{ $t('advanced-config') }} + + + +
    + + + + {{ $t('save') }} +
    +     + + + +
    + URL +
    +
    + {{ $t('save') }} +
    +     +
    @@ -144,8 +246,8 @@ import Vue from 'vue'; import i18n from '../../i18n'; import { url, host } from '../../config'; import { toUnicode } from 'punycode'; -import { faHeadset, faShieldAlt, faGhost, faUserPlus, faBolt } from '@fortawesome/free-solid-svg-icons'; -import { faEnvelope as farEnvelope } from '@fortawesome/free-regular-svg-icons'; +import { faHeadset, faShieldAlt, faGhost, faUserPlus, faBolt, faThumbtack, faPencilAlt, faHashtag } from '@fortawesome/free-solid-svg-icons'; +import { faEnvelope as farEnvelope, faSave } from '@fortawesome/free-regular-svg-icons'; export default Vue.extend({ i18n: i18n('admin/views/instance.vue'), @@ -156,6 +258,9 @@ export default Vue.extend({ host: toUnicode(host), maintainerName: null, maintainerEmail: null, + ToSUrl: null, + repositoryUrl: "https://github.com/syuilo/misskey", + feedbackUrl: null, disableRegistration: false, disableLocalTimeline: false, disableGlobalTimeline: false, @@ -185,7 +290,6 @@ export default Vue.extend({ discordClientId: null, discordClientSecret: null, proxyAccount: null, - inviteCode: null, summalyProxy: null, enableEmail: false, email: null, @@ -198,8 +302,19 @@ export default Vue.extend({ enableServiceWorker: false, swPublicKey: null, swPrivateKey: null, - pinnedUsers: [], - faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt + pinnedUsers: '', + hiddenTags: '', + useObjectStorage: false, + objectStorageBaseUrl: null, + objectStorageBucket: null, + objectStoragePrefix: null, + objectStorageEndpoint: null, + objectStorageRegion: null, + objectStoragePort: null, + objectStorageAccessKey: null, + objectStorageSecretKey: null, + objectStorageUseSSL: false, + faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt, faThumbtack, faPencilAlt, faSave, faHashtag }; }, @@ -207,6 +322,9 @@ export default Vue.extend({ this.$root.getMeta(true).then(meta => { this.maintainerName = meta.maintainerName; this.maintainerEmail = meta.maintainerEmail; + this.ToSUrl = meta.ToSUrl; + this.repositoryUrl = meta.repositoryUrl; + this.feedbackUrl = meta.feedbackUrl; this.disableRegistration = meta.disableRegistration; this.disableLocalTimeline = meta.disableLocalTimeline; this.disableGlobalTimeline = meta.disableGlobalTimeline; @@ -249,13 +367,55 @@ export default Vue.extend({ this.swPublicKey = meta.swPublickey; this.swPrivateKey = meta.swPrivateKey; this.pinnedUsers = meta.pinnedUsers.join('\n'); + this.hiddenTags = meta.hiddenTags.join('\n'); + this.useObjectStorage = meta.useObjectStorage; + this.objectStorageBaseUrl = meta.objectStorageBaseUrl; + this.objectStorageBucket = meta.objectStorageBucket; + this.objectStoragePrefix = meta.objectStoragePrefix; + this.objectStorageEndpoint = meta.objectStorageEndpoint; + this.objectStorageRegion = meta.objectStorageRegion; + this.objectStoragePort = meta.objectStoragePort; + this.objectStorageAccessKey = meta.objectStorageAccessKey; + this.objectStorageSecretKey = meta.objectStorageSecretKey; + this.objectStorageUseSSL = meta.objectStorageUseSSL; + }); + }, + + mounted() { + const renderRecaptchaPreview = () => { + if (!(window as any).grecaptcha) return; + if (!this.$refs.recaptcha) return; + if (!this.recaptchaSiteKey) return; + (window as any).grecaptcha.render(this.$refs.recaptcha, { + sitekey: this.recaptchaSiteKey + }); + }; + + window.onRecaotchaLoad = () => { + renderRecaptchaPreview(); + }; + + const head = document.getElementsByTagName('head')[0]; + const script = document.createElement('script'); + script.setAttribute('src', 'https://www.google.com/recaptcha/api.js?onload=onRecaotchaLoad'); + head.appendChild(script); + + this.$watch('enableRecaptcha', () => { + renderRecaptchaPreview(); + }); + + this.$watch('recaptchaSiteKey', () => { + renderRecaptchaPreview(); }); }, methods: { invite() { this.$root.api('admin/invite').then(x => { - this.inviteCode = x.code; + this.$root.dialog({ + type: 'info', + text: x.code + }); }).catch(e => { this.$root.dialog({ type: 'error', @@ -268,6 +428,9 @@ export default Vue.extend({ this.$root.api('admin/update-meta', { maintainerName: this.maintainerName, maintainerEmail: this.maintainerEmail, + ToSUrl: this.ToSUrl, + repositoryUrl: this.repositoryUrl, + feedbackUrl: this.feedbackUrl, disableRegistration: this.disableRegistration, disableLocalTimeline: this.disableLocalTimeline, disableGlobalTimeline: this.disableGlobalTimeline, @@ -308,7 +471,18 @@ export default Vue.extend({ enableServiceWorker: this.enableServiceWorker, swPublicKey: this.swPublicKey, swPrivateKey: this.swPrivateKey, - pinnedUsers: this.pinnedUsers.split('\n') + pinnedUsers: this.pinnedUsers.split('\n'), + hiddenTags: this.hiddenTags.split('\n'), + useObjectStorage: this.useObjectStorage, + objectStorageBaseUrl: this.objectStorageBaseUrl ? this.objectStorageBaseUrl : null, + objectStorageBucket: this.objectStorageBucket ? this.objectStorageBucket : null, + objectStoragePrefix: this.objectStoragePrefix ? this.objectStoragePrefix : null, + objectStorageEndpoint: this.objectStorageEndpoint ? this.objectStorageEndpoint : null, + objectStorageRegion: this.objectStorageRegion ? this.objectStorageRegion : null, + objectStoragePort: this.objectStoragePort ? this.objectStoragePort : null, + objectStorageAccessKey: this.objectStorageAccessKey ? this.objectStorageAccessKey : null, + objectStorageSecretKey: this.objectStorageSecretKey ? this.objectStorageSecretKey : null, + objectStorageUseSSL: this.objectStorageUseSSL, }).then(() => { this.$root.dialog({ type: 'success', diff --git a/src/client/app/admin/views/logs.vue b/src/client/app/admin/views/logs.vue index 5c2cfdb39..cb5431818 100644 --- a/src/client/app/admin/views/logs.vue +++ b/src/client/app/admin/views/logs.vue @@ -26,6 +26,8 @@
    + + {{ $t('delete-all') }} @@ -78,6 +80,15 @@ export default Vue.extend({ }).then(logs => { this.logs = logs.reverse(); }); + }, + + deleteAll() { + this.$root.api('admin/delete-logs').then(() => { + this.$root.dialog({ + type: 'success', + splash: true + }); + }); } } }); diff --git a/src/client/app/admin/views/queue.chart.vue b/src/client/app/admin/views/queue.chart.vue new file mode 100644 index 000000000..ff29aa839 --- /dev/null +++ b/src/client/app/admin/views/queue.chart.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/client/app/admin/views/queue.vue b/src/client/app/admin/views/queue.vue index b379ba185..43a41ffbe 100644 --- a/src/client/app/admin/views/queue.vue +++ b/src/client/app/admin/views/queue.vue @@ -2,59 +2,27 @@
    -
    -
    Deliver
    - The queue is jammed. - - - Process - - - - - Active - - - - - Waiting - - - - - Delayed - - - - -
    +
    +
    {{ $t('domains.deliver') }}
    +
    -
    -
    Inbox
    - The queue is jammed. - - - Process - - - - - Active - - - - - Waiting - - - - - Delayed - - - - -
    +
    +
    {{ $t('domains.inbox') }}
    + +
    +
    +
    + {{ $t('other-queues') }} +
    +
    {{ $t('domains.db') }}
    + +
    + +
    +
    {{ $t('domains.objectStorage') }}
    + +
    +
    {{ $t('remove-all-jobs') }} @@ -69,9 +37,13 @@ + + + + @@ -94,74 +66,31 @@ diff --git a/src/client/app/common/views/components/ui/input.vue b/src/client/app/common/views/components/ui/input.vue index dd0912f83..e266e141e 100644 --- a/src/client/app/common/views/components/ui/input.vue +++ b/src/client/app/common/views/components/ui/input.vue @@ -210,17 +210,25 @@ export default Vue.extend({ } this.$nextTick(() => { - if (this.$refs.prefix) { - this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px'; - if (this.$refs.prefix.offsetWidth) { - this.$refs.input.style.paddingLeft = this.$refs.prefix.offsetWidth + 'px'; + // このコンポーネントが作成された時、非表示状態である場合がある + // 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する + const clock = setInterval(() => { + if (this.$refs.prefix) { + this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px'; + if (this.$refs.prefix.offsetWidth) { + this.$refs.input.style.paddingLeft = this.$refs.prefix.offsetWidth + 'px'; + } } - } - if (this.$refs.suffix) { - if (this.$refs.suffix.offsetWidth) { - this.$refs.input.style.paddingRight = this.$refs.suffix.offsetWidth + 'px'; + if (this.$refs.suffix) { + if (this.$refs.suffix.offsetWidth) { + this.$refs.input.style.paddingRight = this.$refs.suffix.offsetWidth + 'px'; + } } - } + }, 100); + + this.$once('hook:beforeDestroy', () => { + clearInterval(clock); + }); }); this.$on('keydown', (e: KeyboardEvent) => { diff --git a/src/client/app/common/views/components/ui/margin.vue b/src/client/app/common/views/components/ui/margin.vue new file mode 100644 index 000000000..508116f07 --- /dev/null +++ b/src/client/app/common/views/components/ui/margin.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/client/app/common/views/components/ui/pagination.vue b/src/client/app/common/views/components/ui/pagination.vue new file mode 100644 index 000000000..67aa89d36 --- /dev/null +++ b/src/client/app/common/views/components/ui/pagination.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue index af5f3e4eb..9c61e4605 100644 --- a/src/client/app/common/views/components/url-preview.vue +++ b/src/client/app/common/views/components/url-preview.vue @@ -9,7 +9,7 @@
    - +
    @@ -23,17 +23,18 @@

    {{ sitename }}

    -     +
    - - diff --git a/src/client/app/common/views/components/user-menu.vue b/src/client/app/common/views/components/user-menu.vue index 0af0fdb7e..532dcf35c 100644 --- a/src/client/app/common/views/components/user-menu.vue +++ b/src/client/app/common/views/components/user-menu.vue @@ -7,7 +7,6 @@ diff --git a/src/client/app/common/views/deck/deck.direct-column.vue b/src/client/app/common/views/deck/deck.direct-column.vue index c68a361a9..66d34520a 100644 --- a/src/client/app/common/views/deck/deck.direct-column.vue +++ b/src/client/app/common/views/deck/deck.direct-column.vue @@ -2,7 +2,7 @@ - + @@ -10,13 +10,14 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import XColumn from './deck.column.vue'; -import XDirect from './deck.direct.vue'; +import XNotes from './deck.notes.vue'; export default Vue.extend({ i18n: i18n(), + components: { XColumn, - XDirect + XNotes }, props: { @@ -30,6 +31,22 @@ export default Vue.extend({ } }, + data() { + return { + connection: null, + pagination: { + endpoint: 'notes/mentions', + limit: 10, + params: { + includeMyRenotes: this.$store.state.settings.showMyRenotes, + includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes, + includeLocalRenotes: this.$store.state.settings.showLocalRenotes, + visibility: 'specified' + } + } + }; + }, + computed: { name(): string { if (this.column.name) return this.column.name; @@ -37,9 +54,25 @@ export default Vue.extend({ } }, + mounted() { + this.connection = this.$root.stream.useSharedConnection('main'); + this.connection.on('mention', this.onNote); + }, + + beforeDestroy() { + this.connection.dispose(); + }, + methods: { + onNote(note) { + // Prepend a note + if (note.visibility == 'specified') { + (this.$refs.timeline as any).prepend(note); + } + }, + focus() { - this.$refs.tl.focus(); + this.$refs.timeline.focus(); } } }); diff --git a/src/client/app/common/views/deck/deck.direct.vue b/src/client/app/common/views/deck/deck.direct.vue deleted file mode 100644 index 29db5cb7f..000000000 --- a/src/client/app/common/views/deck/deck.direct.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - diff --git a/src/client/app/common/views/deck/deck.explore-column.vue b/src/client/app/common/views/deck/deck.explore-column.vue deleted file mode 100644 index 53db677b3..000000000 --- a/src/client/app/common/views/deck/deck.explore-column.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - diff --git a/src/client/app/common/views/deck/deck.favorites-column.vue b/src/client/app/common/views/deck/deck.favorites-column.vue deleted file mode 100644 index 526b998f8..000000000 --- a/src/client/app/common/views/deck/deck.favorites-column.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/src/client/app/common/views/deck/deck.featured-column.vue b/src/client/app/common/views/deck/deck.featured-column.vue deleted file mode 100644 index d2c44e74c..000000000 --- a/src/client/app/common/views/deck/deck.featured-column.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/src/client/app/common/views/deck/deck.hashtag-tl.vue b/src/client/app/common/views/deck/deck.hashtag-tl.vue index 6f89f6a23..94d2efc43 100644 --- a/src/client/app/common/views/deck/deck.hashtag-tl.vue +++ b/src/client/app/common/views/deck/deck.hashtag-tl.vue @@ -1,13 +1,11 @@ diff --git a/src/client/app/common/views/deck/deck.note-column.vue b/src/client/app/common/views/deck/deck.note-column.vue index ddc3860d3..bcc887e2f 100644 --- a/src/client/app/common/views/deck/deck.note-column.vue +++ b/src/client/app/common/views/deck/deck.note-column.vue @@ -8,7 +8,7 @@
    {{ $t('@.is-remote-post') }} - {{ $t('@.view-on-remote') }} + {{ $t('@.view-on-remote') }}
    diff --git a/src/client/app/common/views/deck/deck.notes.vue b/src/client/app/common/views/deck/deck.notes.vue index 680b44bc8..5081d1f99 100644 --- a/src/client/app/common/views/deck/deck.notes.vue +++ b/src/client/app/common/views/deck/deck.notes.vue @@ -1,8 +1,8 @@ @@ -27,31 +28,38 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import XNotification from './deck.notification.vue'; - -const displayLimit = 20; +import paging from '../../../common/scripts/paging'; export default Vue.extend({ i18n: i18n(), + components: { XNotification }, inject: ['column', 'isScrollTop', 'count'], + mixins: [ + paging({ + onQueueChanged: (self, q) => { + self.count(q.length); + }, + }), + ], + data() { return { - fetching: true, - fetchingMoreNotifications: false, - notifications: [], - queue: [], - moreNotifications: false, - connection: null + connection: null, + pagination: { + endpoint: 'i/notifications', + limit: 20, + } }; }, computed: { _notifications(): any[] { - return (this.notifications as any).map(notification => { + return (this.items as any).map(notification => { const date = new Date(notification.createdAt).getDate(); const month = new Date(notification.createdAt).getMonth() + 1; notification._date = date; @@ -61,33 +69,12 @@ export default Vue.extend({ } }, - watch: { - queue(q) { - this.count(q.length); - } - }, - mounted() { this.connection = this.$root.stream.useSharedConnection('main'); - this.connection.on('notification', this.onNotification); this.column.$on('top', this.onTop); this.column.$on('bottom', this.onBottom); - - const max = 10; - - this.$root.api('i/notifications', { - limit: max + 1 - }).then(notifications => { - if (notifications.length == max + 1) { - this.moreNotifications = true; - notifications.pop(); - } - - this.notifications = notifications; - this.fetching = false; - }); }, beforeDestroy() { @@ -98,26 +85,6 @@ export default Vue.extend({ }, methods: { - fetchMoreNotifications() { - this.fetchingMoreNotifications = true; - - const max = 20; - - this.$root.api('i/notifications', { - limit: max + 1, - untilId: this.notifications[this.notifications.length - 1].id - }).then(notifications => { - if (notifications.length == max + 1) { - this.moreNotifications = true; - notifications.pop(); - } else { - this.moreNotifications = false; - } - this.notifications = this.notifications.concat(notifications); - this.fetchingMoreNotifications = false; - }); - }, - onNotification(notification) { // TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない this.$root.stream.send('readNotification', { @@ -126,35 +93,6 @@ export default Vue.extend({ this.prepend(notification); }, - - prepend(notification) { - if (this.isScrollTop()) { - // Prepend the notification - this.notifications.unshift(notification); - - // オーバーフローしたら古い通知は捨てる - if (this.notifications.length >= displayLimit) { - this.notifications = this.notifications.slice(0, displayLimit); - } - } else { - this.queue.push(notification); - } - }, - - releaseQueue() { - for (const n of this.queue) { - this.prepend(n); - } - this.queue = []; - }, - - onTop() { - this.releaseQueue(); - }, - - onBottom() { - this.fetchMoreNotifications(); - } } }); diff --git a/src/client/app/common/views/deck/deck.search-column.vue b/src/client/app/common/views/deck/deck.search-column.vue index 17ee2ef45..a2d1142fb 100644 --- a/src/client/app/common/views/deck/deck.search-column.vue +++ b/src/client/app/common/views/deck/deck.search-column.vue @@ -5,7 +5,7 @@
    - +
    @@ -16,8 +16,6 @@ import XColumn from './deck.column.vue'; import XNotes from './deck.notes.vue'; import { genSearchQuery } from '../../../common/scripts/gen-search-query'; -const limit = 20; - export default Vue.extend({ components: { XColumn, @@ -26,24 +24,11 @@ export default Vue.extend({ data() { return { - makePromise: async cursor => this.$root.api('notes/search', { - limit: limit + 1, - offset: cursor ? cursor : undefined, - ...(await genSearchQuery(this, this.q)) - }).then(notes => { - if (notes.length == limit + 1) { - notes.pop(); - return { - notes: notes, - cursor: cursor ? cursor + limit : limit - }; - } else { - return { - notes: notes, - more: false - }; - } - }) + pagination: { + endpoint: 'notes/search', + limit: 20, + params: () => genSearchQuery(this, this.q) + } }; }, diff --git a/src/client/app/common/views/deck/deck.tl.vue b/src/client/app/common/views/deck/deck.tl.vue index 9284f06ee..e6c716070 100644 --- a/src/client/app/common/views/deck/deck.tl.vue +++ b/src/client/app/common/views/deck/deck.tl.vue @@ -6,7 +6,7 @@

    {{ $t('disabled-timeline.description') }}

    - + diff --git a/src/client/app/common/views/pages/featured.vue b/src/client/app/common/views/pages/featured.vue new file mode 100644 index 000000000..161511998 --- /dev/null +++ b/src/client/app/common/views/pages/featured.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/client/app/common/views/pages/follow-requests.vue b/src/client/app/common/views/pages/follow-requests.vue new file mode 100644 index 000000000..e5b6e2902 --- /dev/null +++ b/src/client/app/common/views/pages/follow-requests.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/client/app/common/views/pages/followers.vue b/src/client/app/common/views/pages/followers.vue index 1d68d71e8..b546e69ae 100644 --- a/src/client/app/common/views/pages/followers.vue +++ b/src/client/app/common/views/pages/followers.vue @@ -1,7 +1,5 @@ diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue index 29580fab6..7938d706b 100644 --- a/src/client/app/common/views/pages/page/page.vue +++ b/src/client/app/common/views/pages/page/page.vue @@ -12,6 +12,11 @@ @{{ page.user.username }} {{ $t('edit-this-page') }} {{ $t('view-source') }} + @@ -19,8 +24,8 @@ @@ -125,8 +152,8 @@ export default Vue.extend({ > .title z-index 1 margin 0 - padding 32px 64px - font-size 24px + padding 16px 32px + font-size 20px font-weight bold color var(--text) box-shadow 0 var(--lineWidth) rgba(#000, 0.07) @@ -135,30 +162,45 @@ export default Vue.extend({ padding 16px 32px font-size 20px + @media (max-width 400px) + padding 10px 20px + font-size 16px + > div color var(--text) - padding 48px 64px - font-size 18px + padding 24px 32px + font-size 16px @media (max-width 600px) padding 24px 32px font-size 16px + @media (max-width 400px) + padding 20px 20px + font-size 15px + > footer color var(--text) - padding 0 64px 38px 64px + padding 0 32px 28px 32px @media (max-width 600px) padding 0 32px 28px 32px + @media (max-width 400px) + padding 0 20px 20px 20px + font-size 14px + > small display block opacity 0.5 > a - font-size 14px + font-size 90% > a + a margin-left 8px + > .like + margin-top 16px + diff --git a/src/client/app/common/views/pages/pages.vue b/src/client/app/common/views/pages/pages.vue new file mode 100644 index 000000000..d0a56ac2f --- /dev/null +++ b/src/client/app/common/views/pages/pages.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/client/app/common/views/pages/share.vue b/src/client/app/common/views/pages/share.vue index 0452b25df..293a9bcfb 100644 --- a/src/client/app/common/views/pages/share.vue +++ b/src/client/app/common/views/pages/share.vue @@ -3,7 +3,7 @@

    {{ $t('share-with', { name }) }}

    - +

    {{ $t('@.close') }} @@ -16,6 +16,9 @@ import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('mobile/views/pages/share.vue'), + components: { + XPostForm: () => import('../../../desktop/views/components/post-form.vue').then(m => m.default) + }, data() { return { name: null, @@ -35,15 +38,15 @@ export default Vue.extend({ return t.trim(); } }, - methods: { - close() { - window.close(); - } - }, mounted() { this.$root.getMeta().then(meta => { this.name = meta.name || 'Misskey'; }); + }, + methods: { + close() { + window.close(); + } } }); diff --git a/src/client/app/common/views/pages/user-group-editor.vue b/src/client/app/common/views/pages/user-group-editor.vue new file mode 100644 index 000000000..9cc012af7 --- /dev/null +++ b/src/client/app/common/views/pages/user-group-editor.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/src/client/app/common/views/pages/user-groups.vue b/src/client/app/common/views/pages/user-groups.vue new file mode 100644 index 000000000..a51a5f723 --- /dev/null +++ b/src/client/app/common/views/pages/user-groups.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/client/app/common/views/components/user-list-editor.vue b/src/client/app/common/views/pages/user-list-editor.vue similarity index 65% rename from src/client/app/common/views/components/user-list-editor.vue rename to src/client/app/common/views/pages/user-list-editor.vue index 86024c4da..3bc5cca77 100644 --- a/src/client/app/common/views/components/user-list-editor.vue +++ b/src/client/app/common/views/pages/user-list-editor.vue @@ -1,18 +1,23 @@ + + diff --git a/src/client/app/common/views/widgets/post-form.vue b/src/client/app/common/views/widgets/post-form.vue index d8617bea5..e180290f9 100644 --- a/src/client/app/common/views/widgets/post-form.vue +++ b/src/client/app/common/views/widgets/post-form.vue @@ -38,7 +38,6 @@ import define from '../../../common/define-widget'; import i18n from '../../../i18n'; import insertTextAtCursor from 'insert-text-at-cursor'; -import XPostFormAttaches from '../components/post-form-attaches.vue'; export default define({ name: 'post-form', @@ -49,7 +48,7 @@ export default define({ i18n: i18n('desktop/views/widgets/post-form.vue'), components: { - XPostFormAttaches + XPostFormAttaches: () => import('../components/post-form-attaches.vue').then(m => m.default) }, data() { diff --git a/src/client/app/common/views/widgets/rss.vue b/src/client/app/common/views/widgets/rss.vue index e97919767..c1a66bfeb 100644 --- a/src/client/app/common/views/widgets/rss.vue +++ b/src/client/app/common/views/widgets/rss.vue @@ -7,7 +7,7 @@

    {{ $t('@.loading') }}

    - {{ item.title }} + {{ item.title }}
    diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index e8da23526..ce0b96e0a 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -13,7 +13,6 @@ import fuckAdBlock from '../common/scripts/fuck-ad-block'; import composeNotification from '../common/scripts/compose-notification'; import MkHome from './views/home/home.vue'; -import MkDeck from '../common/views/deck/deck.vue'; import MkSelectDrive from './views/pages/selectdrive.vue'; import MkDrive from './views/pages/drive.vue'; import MkMessagingRoom from './views/pages/messaging-room.vue'; @@ -22,9 +21,9 @@ import MkShare from '../common/views/pages/share.vue'; import MkFollow from '../common/views/pages/follow.vue'; import MkNotFound from '../common/views/pages/not-found.vue'; import MkSettings from './views/pages/settings.vue'; +import DeckColumn from '../common/views/deck/deck.column-template.vue'; import Ctx from './views/components/context-menu.vue'; -import PostFormWindow from './views/components/post-form-window.vue'; import RenoteFormWindow from './views/components/renote-form-window.vue'; import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue'; import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue'; @@ -61,12 +60,13 @@ init(async (launch, os) => { }); if (o.cb) vm.$once('closed', o.cb); } else { - const vm = this.$root.new(PostFormWindow, { + this.$root.newAsync(() => import('./views/components/post-form-window.vue').then(m => m.default), { reply: o.reply, mention: o.mention, animation: o.animation == null ? true : o.animation + }).then(vm => { + if (o.cb) vm.$once('closed', o.cb); }); - if (o.cb) vm.$once('closed', o.cb); } }, @@ -128,7 +128,7 @@ init(async (launch, os) => { mode: 'history', routes: [ os.store.state.device.inDeckMode - ? { path: '/', name: 'index', component: MkDeck, children: [ + ? { path: '/', name: 'index', component: () => import('../common/views/deck/deck.vue').then(m => m.default), children: [ { path: '/@:user', component: () => import('../common/views/deck/deck.user-column.vue').then(m => m.default), children: [ { path: '', name: 'user', component: () => import('../common/views/deck/deck.user-column.home.vue').then(m => m.default) }, { path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) }, @@ -137,10 +137,16 @@ init(async (launch, os) => { { path: '/notes/:note', name: 'note', component: () => import('../common/views/deck/deck.note-column.vue').then(m => m.default) }, { path: '/search', component: () => import('../common/views/deck/deck.search-column.vue').then(m => m.default) }, { path: '/tags/:tag', name: 'tag', component: () => import('../common/views/deck/deck.hashtag-column.vue').then(m => m.default) }, - { path: '/featured', name: 'featured', component: () => import('../common/views/deck/deck.featured-column.vue').then(m => m.default) }, - { path: '/explore', name: 'explore', component: () => import('../common/views/deck/deck.explore-column.vue').then(m => m.default) }, - { path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('../common/views/deck/deck.explore-column.vue').then(m => m.default) }, - { path: '/i/favorites', component: () => import('../common/views/deck/deck.favorites-column.vue').then(m => m.default) } + { path: '/featured', name: 'featured', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/featured.vue').then(m => m.default), platform: 'deck' }) }, + { path: '/explore', name: 'explore', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/explore.vue').then(m => m.default) }) }, + { path: '/explore/tags/:tag', name: 'explore-tag', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/explore.vue').then(m => m.default), tag: route.params.tag }) }, + { path: '/i/favorites', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/favorites.vue').then(m => m.default), platform: 'deck' }) }, + { path: '/i/pages', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/pages.vue').then(m => m.default) }) }, + { path: '/i/lists', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-lists.vue').then(m => m.default) }) }, + { path: '/i/lists/:listId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-list-editor.vue').then(m => m.default), listId: route.params.listId }) }, + { path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) }, + { path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) }, + { path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) }, ]} : { path: '/', component: MkHome, children: [ { path: '', name: 'index', component: MkHomeTimeline }, @@ -152,16 +158,26 @@ init(async (launch, os) => { { path: '/notes/:note', name: 'note', component: () => import('./views/home/note.vue').then(m => m.default) }, { path: '/search', component: () => import('./views/home/search.vue').then(m => m.default) }, { path: '/tags/:tag', name: 'tag', component: () => import('./views/home/tag.vue').then(m => m.default) }, - { path: '/featured', name: 'featured', component: () => import('./views/home/featured.vue').then(m => m.default) }, + { path: '/featured', name: 'featured', component: () => import('../common/views/pages/featured.vue').then(m => m.default), props: { platform: 'desktop' } }, { path: '/explore', name: 'explore', component: () => import('../common/views/pages/explore.vue').then(m => m.default) }, { path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('../common/views/pages/explore.vue').then(m => m.default) }, - { path: '/i/favorites', component: () => import('./views/home/favorites.vue').then(m => m.default) }, - { path: '/i/pages', component: () => import('./views/home/pages.vue').then(m => m.default) }, + { path: '/i/favorites', component: () => import('../common/views/pages/favorites.vue').then(m => m.default), props: { platform: 'desktop' } }, + { path: '/i/pages', component: () => import('../common/views/pages/pages.vue').then(m => m.default) }, + { path: '/i/lists', component: () => import('../common/views/pages/user-lists.vue').then(m => m.default) }, + { path: '/i/lists/:listId', props: true, component: () => import('../common/views/pages/user-list-editor.vue').then(m => m.default) }, + { path: '/i/groups', component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }, + { path: '/i/groups/:groupId', props: true, component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default) }, + { path: '/i/follow-requests', component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }, + { path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) }, + { path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) }, + { path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) }, + { path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) }, ]}, - { path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) }, - { path: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, - { path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, - { path: '/i/pages/edit/:pageId', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) }, + { path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) }, + { path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) }, + { path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) }, + { path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) }, + { path: '/i/messaging/group/:group', component: MkMessagingRoom }, { path: '/i/messaging/:user', component: MkMessagingRoom }, { path: '/i/drive', component: MkDrive }, { path: '/i/drive/folder/:folder', component: MkDrive }, diff --git a/src/client/app/desktop/views/components/detail-notes.vue b/src/client/app/desktop/views/components/detail-notes.vue new file mode 100644 index 000000000..e50dda7c6 --- /dev/null +++ b/src/client/app/desktop/views/components/detail-notes.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts index 76ab7b5fe..0cc44e1bb 100644 --- a/src/client/app/desktop/views/components/index.ts +++ b/src/client/app/desktop/views/components/index.ts @@ -6,11 +6,9 @@ import note from './note.vue'; import notes from './notes.vue'; import subNoteContent from './sub-note-content.vue'; import window from './window.vue'; -import noteFormWindow from './post-form-window.vue'; import renoteFormWindow from './renote-form-window.vue'; import mediaVideo from './media-video.vue'; import notifications from './notifications.vue'; -import noteForm from './post-form.vue'; import renoteForm from './renote-form.vue'; import notePreview from './note-preview.vue'; import noteDetail from './note-detail.vue'; @@ -25,11 +23,9 @@ Vue.component('mk-note', note); Vue.component('mk-notes', notes); Vue.component('mk-sub-note-content', subNoteContent); Vue.component('mk-window', window); -Vue.component('mk-post-form-window', noteFormWindow); Vue.component('mk-renote-form-window', renoteFormWindow); Vue.component('mk-media-video', mediaVideo); Vue.component('mk-notifications', notifications); -Vue.component('mk-post-form', noteForm); Vue.component('mk-renote-form', renoteForm); Vue.component('mk-note-preview', notePreview); Vue.component('mk-note-detail', noteDetail); diff --git a/src/client/app/desktop/views/components/messaging-room-window.vue b/src/client/app/desktop/views/components/messaging-room-window.vue index 00cd423cd..6c1708b59 100644 --- a/src/client/app/desktop/views/components/messaging-room-window.vue +++ b/src/client/app/desktop/views/components/messaging-room-window.vue @@ -1,7 +1,7 @@ @@ -16,10 +16,14 @@ export default Vue.extend({ components: { XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default) }, - props: ['user'], + props: ['user', 'group'], computed: { popout(): string { - return `${url}/i/messaging/${getAcct(this.user)}`; + if (this.user) { + return `${url}/i/messaging/${getAcct(this.user)}`; + } else if (this.group) { + return `${url}/i/messaging/group/${this.group.id}`; + } } } }); diff --git a/src/client/app/desktop/views/components/messaging-window.vue b/src/client/app/desktop/views/components/messaging-window.vue index 1572c4066..7cec9484d 100644 --- a/src/client/app/desktop/views/components/messaging-window.vue +++ b/src/client/app/desktop/views/components/messaging-window.vue @@ -1,7 +1,7 @@ @@ -20,6 +20,11 @@ export default Vue.extend({ this.$root.new(MkMessagingRoomWindow, { user: user }); + }, + navigateGroup(group) { + this.$root.new(MkMessagingRoomWindow, { + group: group + }); } } }); diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index bcff8c877..e0ce5ce1c 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -54,7 +54,7 @@ - {{ $t('location') }} + {{ $t('location') }}
    diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue index 585294fc8..1c00faed3 100644 --- a/src/client/app/desktop/views/components/note.vue +++ b/src/client/app/desktop/views/components/note.vue @@ -32,7 +32,7 @@
    - 位置情報 + 位置情報
    diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index b051ff51c..0820d5d80 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -4,9 +4,9 @@
    -
    {{ $t('@.no-notes') }}
    +
    {{ $t('@.no-notes') }}
    - +
    - -

    {{ $t('empty') }}

    +

    {{ $t('empty') }}

    + @@ -143,23 +144,29 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import getNoteSummary from '../../../../../misc/get-note-summary'; +import paging from '../../../common/scripts/paging'; export default Vue.extend({ i18n: i18n(), + + mixins: [ + paging({}), + ], + data() { return { - fetching: true, - fetchingMoreNotifications: false, - notifications: [], - moreNotifications: false, connection: null, - getNoteSummary + getNoteSummary, + pagination: { + endpoint: 'i/notifications', + limit: 10, + } }; }, computed: { _notifications(): any[] { - return (this.notifications as any).map(notification => { + return (this.items as any).map(notification => { const date = new Date(notification.createdAt).getDate(); const month = new Date(notification.createdAt).getMonth() + 1; notification._date = date; @@ -171,22 +178,7 @@ export default Vue.extend({ mounted() { this.connection = this.$root.stream.useSharedConnection('main'); - this.connection.on('notification', this.onNotification); - - const max = 10; - - this.$root.api('i/notifications', { - limit: max + 1 - }).then(notifications => { - if (notifications.length == max + 1) { - this.moreNotifications = true; - notifications.pop(); - } - - this.notifications = notifications; - this.fetching = false; - }); }, beforeDestroy() { @@ -194,33 +186,13 @@ export default Vue.extend({ }, methods: { - fetchMoreNotifications() { - this.fetchingMoreNotifications = true; - - const max = 30; - - this.$root.api('i/notifications', { - limit: max + 1, - untilId: this.notifications[this.notifications.length - 1].id - }).then(notifications => { - if (notifications.length == max + 1) { - this.moreNotifications = true; - notifications.pop(); - } else { - this.moreNotifications = false; - } - this.notifications = this.notifications.concat(notifications); - this.fetchingMoreNotifications = false; - }); - }, - onNotification(notification) { // TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない this.$root.stream.send('readNotification', { id: notification.id }); - this.notifications.unshift(notification); + this.prepend(notification); } } }); diff --git a/src/client/app/desktop/views/components/post-form-window.vue b/src/client/app/desktop/views/components/post-form-window.vue index 1d718bef1..ae5f0af71 100644 --- a/src/client/app/desktop/views/components/post-form-window.vue +++ b/src/client/app/desktop/views/components/post-form-window.vue @@ -12,7 +12,7 @@
    - import Vue from 'vue'; import i18n from '../../../i18n'; +import XPostForm from './post-form.vue'; export default Vue.extend({ i18n: i18n('desktop/views/components/post-form-window.vue'), + + components: { + XPostForm + }, + props: { reply: { type: Object, diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 0307ff305..39b7781a1 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -1,5 +1,5 @@ @@ -15,8 +15,6 @@ import Vue from 'vue'; import i18n from '../../../i18n'; -const fetchLimit = 10; - export default Vue.extend({ i18n: i18n('mobile/views/pages/home.timeline.vue'), @@ -43,7 +41,7 @@ export default Vue.extend({ }, query: {}, endpoint: null, - makePromise: null + pagination: null }; }, @@ -110,25 +108,14 @@ export default Vue.extend({ this.connection.on('mention', onNote); } - this.makePromise = cursor => this.$root.api(this.endpoint, { - limit: fetchLimit + 1, - untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined), - untilId: cursor ? cursor : undefined, - ...this.baseQuery, ...this.query - }).then(notes => { - if (notes.length == fetchLimit + 1) { - notes.pop(); - return { - notes: notes, - more: true - }; - } else { - return { - notes: notes, - more: false - }; - } - }); + this.pagination = { + endpoint: this.endpoint, + limit: 10, + params: init => ({ + untilDate: init ? undefined : (this.date ? this.date.getTime() : undefined), + ...this.baseQuery, ...this.query + }) + }; }, methods: { diff --git a/src/client/app/mobile/views/pages/messaging-room.vue b/src/client/app/mobile/views/pages/messaging-room.vue index aa00d4869..787284712 100644 --- a/src/client/app/mobile/views/pages/messaging-room.vue +++ b/src/client/app/mobile/views/pages/messaging-room.vue @@ -2,9 +2,10 @@ - + @@ -22,6 +23,7 @@ export default Vue.extend({ return { fetching: true, user: null, + group: null, unwatchDarkmode: null }; }, @@ -48,12 +50,21 @@ export default Vue.extend({ methods: { fetch() { this.fetching = true; - this.$root.api('users/show', parseAcct(this.$route.params.user)).then(user => { - this.user = user; - this.fetching = false; + if (this.$route.params.user) { + this.$root.api('users/show', parseAcct(this.$route.params.user)).then(user => { + this.user = user; + this.fetching = false; - document.title = `${this.$t('@.messaging')}: ${Vue.filter('userName')(this.user)} | ${this.$root.instanceName}`; - }); + document.title = `${this.$t('@.messaging')}: ${Vue.filter('userName')(this.user)} | ${this.$root.instanceName}`; + }); + } else { + this.$root.api('users/groups/show', { groupId: this.$route.params.group }).then(group => { + this.group = group; + this.fetching = false; + + document.title = this.$t('@.messaging') + ': ' + this.group.name; + }); + } } } }); diff --git a/src/client/app/mobile/views/pages/messaging.vue b/src/client/app/mobile/views/pages/messaging.vue index 5ce2f14bb..ff66ae06e 100644 --- a/src/client/app/mobile/views/pages/messaging.vue +++ b/src/client/app/mobile/views/pages/messaging.vue @@ -1,7 +1,7 @@ @@ -21,6 +21,9 @@ export default Vue.extend({ methods: { navigate(user) { (this as any).$router.push(`/i/messaging/${getAcct(user)}`); + }, + navigateGroup(group) { + (this as any).$router.push(`/i/messaging/group/${group.id}`); } } }); diff --git a/src/client/app/mobile/views/pages/page-editor.vue b/src/client/app/mobile/views/pages/page-editor.vue deleted file mode 100644 index 0b04f2580..000000000 --- a/src/client/app/mobile/views/pages/page-editor.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/page.vue b/src/client/app/mobile/views/pages/page.vue deleted file mode 100644 index f494abffd..000000000 --- a/src/client/app/mobile/views/pages/page.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/pages.vue b/src/client/app/mobile/views/pages/pages.vue deleted file mode 100644 index 100c814ad..000000000 --- a/src/client/app/mobile/views/pages/pages.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/received-follow-requests.vue b/src/client/app/mobile/views/pages/received-follow-requests.vue deleted file mode 100644 index abf0c3383..000000000 --- a/src/client/app/mobile/views/pages/received-follow-requests.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/search.vue b/src/client/app/mobile/views/pages/search.vue index 45f383790..dca1ffd40 100644 --- a/src/client/app/mobile/views/pages/search.vue +++ b/src/client/app/mobile/views/pages/search.vue @@ -3,7 +3,7 @@
    - +
    @@ -14,42 +14,27 @@ import i18n from '../../../i18n'; import Progress from '../../../common/scripts/loading'; import { genSearchQuery } from '../../../common/scripts/gen-search-query'; -const limit = 20; - export default Vue.extend({ i18n: i18n('mobile/views/pages/search.vue'), data() { return { - makePromise: async cursor => this.$root.api('notes/search', { - limit: limit + 1, - untilId: cursor ? cursor : undefined, - ...(await genSearchQuery(this, this.q)) - }).then(notes => { - if (notes.length == limit + 1) { - notes.pop(); - return { - notes: notes, - more: true - }; - } else { - return { - notes: notes, - more: false - }; - } - }) + pagination: { + endpoint: 'notes/search', + limit: 20, + params: () => genSearchQuery(this, this.q) + } }; }, - watch: { - $route() { - this.$refs.timeline.reload(); - } - }, computed: { q(): string { return this.$route.query.q; } }, + watch: { + $route() { + this.$refs.timeline.reload(); + } + }, mounted() { document.title = `${this.$t('search')}: ${this.q} | ${this.$root.instanceName}`; }, diff --git a/src/client/app/mobile/views/pages/tag.vue b/src/client/app/mobile/views/pages/tag.vue index f41cf1f18..19482ec38 100644 --- a/src/client/app/mobile/views/pages/tag.vue +++ b/src/client/app/mobile/views/pages/tag.vue @@ -3,7 +3,7 @@
    - +
    @@ -13,30 +13,17 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import Progress from '../../../common/scripts/loading'; -const limit = 20; - export default Vue.extend({ i18n: i18n('mobile/views/pages/tag.vue'), data() { return { - makePromise: cursor => this.$root.api('notes/search-by-tag', { - limit: limit + 1, - untilId: cursor ? cursor : undefined, - tag: this.$route.params.tag - }).then(notes => { - if (notes.length == limit + 1) { - notes.pop(); - return { - notes: notes, - more: true - }; - } else { - return { - notes: notes, - more: false - }; + pagination: { + endpoint: 'notes/search-by-tag', + limit: 20, + params: { + tag: this.$route.params.tag } - }) + } }; }, watch: { diff --git a/src/client/app/mobile/views/pages/ui.vue b/src/client/app/mobile/views/pages/ui.vue new file mode 100644 index 000000000..397ba5df0 --- /dev/null +++ b/src/client/app/mobile/views/pages/ui.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/client/app/mobile/views/pages/user-list.vue b/src/client/app/mobile/views/pages/user-list.vue deleted file mode 100644 index 68fd0358c..000000000 --- a/src/client/app/mobile/views/pages/user-list.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - diff --git a/src/client/app/mobile/views/pages/user-lists.vue b/src/client/app/mobile/views/pages/user-lists.vue deleted file mode 100644 index a3e9bd78b..000000000 --- a/src/client/app/mobile/views/pages/user-lists.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - diff --git a/src/client/app/mobile/views/pages/user/home.vue b/src/client/app/mobile/views/pages/user/home.vue index 00c63c288..1d7b0a4e6 100644 --- a/src/client/app/mobile/views/pages/user/home.vue +++ b/src/client/app/mobile/views/pages/user/home.vue @@ -19,8 +19,6 @@
    - {{ $t('frequently-replied-users') }} - {{ $t('followers-you-know') }} diff --git a/src/client/app/mobile/views/pages/user/index.vue b/src/client/app/mobile/views/pages/user/index.vue index 7afa06d4a..f8f4719a6 100644 --- a/src/client/app/mobile/views/pages/user/index.vue +++ b/src/client/app/mobile/views/pages/user/index.vue @@ -5,7 +5,7 @@

    {{ $t('@.user-suspended') }}

    -

    {{ $t('@.is-remote-user') }}{{ $t('@.view-on-remote') }}

    +

    {{ $t('@.is-remote-user') }}{{ $t('@.view-on-remote') }}

    diff --git a/src/client/themes/dark.json5 b/src/client/themes/dark.json5 index 8e0c726b4..0665d5990 100644 --- a/src/client/themes/dark.json5 +++ b/src/client/themes/dark.json5 @@ -235,5 +235,8 @@ pageBlockBorder: 'rgba(255, 255, 255, 0.1)', pageBlockBorderHover: 'rgba(255, 255, 255, 0.15)', + + groupUserListOwnerFg: '#f15f71', + groupUserListOwnerBg: '#5d282e' }, } diff --git a/src/client/themes/light.json5 b/src/client/themes/light.json5 index 1fff18176..cbe456ca5 100644 --- a/src/client/themes/light.json5 +++ b/src/client/themes/light.json5 @@ -235,5 +235,8 @@ pageBlockBorder: 'rgba(0, 0, 0, 0.1)', pageBlockBorderHover: 'rgba(0, 0, 0, 0.15)', + + groupUserListOwnerFg: '#f15f71', + groupUserListOwnerBg: '#ffdfdf' }, } diff --git a/src/config/types.ts b/src/config/types.ts index d312a5a18..c35bc6357 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -14,6 +14,7 @@ export type Source = { db: string; user: string; pass: string; + extra?: { [x: string]: string }; }; redis: { host: string; @@ -27,13 +28,6 @@ export type Source = { port: number; pass: string; }; - drive?: { - storage: string; - bucket?: string; - prefix?: string; - baseUrl?: string; - config?: any; - }; autoAdmin?: boolean; diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts index f9ba90a0b..e560354c7 100644 --- a/src/daemons/queue-stats.ts +++ b/src/daemons/queue-stats.ts @@ -1,6 +1,6 @@ import * as Deque from 'double-ended-queue'; import Xev from 'xev'; -import { deliverQueue, inboxQueue } from '../queue'; +import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../queue'; const ev = new Xev(); @@ -18,6 +18,8 @@ export default function() { let activeDeliverJobs = 0; let activeInboxJobs = 0; + let activeDbJobs = 0; + let activeObjectStorageJobs = 0; deliverQueue.on('global:active', () => { activeDeliverJobs++; @@ -27,9 +29,19 @@ export default function() { activeInboxJobs++; }); + dbQueue.on('global:active', () => { + activeDbJobs++; + }); + + objectStorageQueue.on('global:active', () => { + activeObjectStorageJobs++; + }); + async function tick() { const deliverJobCounts = await deliverQueue.getJobCounts(); const inboxJobCounts = await inboxQueue.getJobCounts(); + const dbJobCounts = await dbQueue.getJobCounts(); + const objectStorageJobCounts = await objectStorageQueue.getJobCounts(); const stats = { deliver: { @@ -43,7 +55,19 @@ export default function() { active: inboxJobCounts.active, waiting: inboxJobCounts.waiting, delayed: inboxJobCounts.delayed - } + }, + db: { + activeSincePrevTick: activeDbJobs, + active: dbJobCounts.active, + waiting: dbJobCounts.waiting, + delayed: dbJobCounts.delayed + }, + objectStorage: { + activeSincePrevTick: activeObjectStorageJobs, + active: objectStorageJobCounts.active, + waiting: objectStorageJobCounts.waiting, + delayed: objectStorageJobCounts.delayed + }, }; ev.emit('queueStats', stats); @@ -53,6 +77,8 @@ export default function() { activeDeliverJobs = 0; activeInboxJobs = 0; + activeDbJobs = 0; + activeObjectStorageJobs = 0; } tick(); diff --git a/src/db/postgre.ts b/src/db/postgre.ts index 18283836a..8e2d585e9 100644 --- a/src/db/postgre.ts +++ b/src/db/postgre.ts @@ -24,6 +24,9 @@ import { SwSubscription } from '../models/entities/sw-subscription'; import { Blocking } from '../models/entities/blocking'; import { UserList } from '../models/entities/user-list'; import { UserListJoining } from '../models/entities/user-list-joining'; +import { UserGroup } from '../models/entities/user-group'; +import { UserGroupJoining } from '../models/entities/user-group-joining'; +import { UserGroupInvite } from '../models/entities/user-group-invite'; import { Hashtag } from '../models/entities/hashtag'; import { NoteFavorite } from '../models/entities/note-favorite'; import { AbuseUserReport } from '../models/entities/abuse-user-report'; @@ -41,6 +44,7 @@ import { UserKeypair } from '../models/entities/user-keypair'; import { UserPublickey } from '../models/entities/user-publickey'; import { UserProfile } from '../models/entities/user-profile'; import { Page } from '../models/entities/page'; +import { PageLike } from '../models/entities/page-like'; const sqlLogger = dbLogger.createSubLogger('sql', 'white', false); @@ -89,8 +93,21 @@ export function initDb(justBorrow = false, sync = false, log = false) { username: config.db.user, password: config.db.pass, database: config.db.db, + extra: config.db.extra, synchronize: process.env.NODE_ENV === 'test' || sync, dropSchema: process.env.NODE_ENV === 'test' && !justBorrow, + cache: { + type: 'redis', + options: { + host: config.redis.host, + port: config.redis.port, + options:{ + auth_pass: config.redis.pass, + prefix: config.redis.prefix, + db: config.redis.db || 0 + } + } + }, logging: log, logger: log ? new MyCustomLogger() : undefined, entities: [ @@ -105,6 +122,9 @@ export function initDb(justBorrow = false, sync = false, log = false) { UserPublickey, UserList, UserListJoining, + UserGroup, + UserGroupJoining, + UserGroupInvite, UserNotePining, Following, FollowRequest, @@ -116,6 +136,7 @@ export function initDb(justBorrow = false, sync = false, log = false) { NoteWatching, NoteUnread, Page, + PageLike, Log, DriveFile, DriveFolder, diff --git a/src/docs/article.pug b/src/docs/article.pug index 38494fec6..48f501d40 100644 --- a/src/docs/article.pug +++ b/src/docs/article.pug @@ -6,4 +6,4 @@ block main block footer p = i18n('docs.edit-this-page-on-github') - a(href=src target="_blank")= i18n('docs.edit-this-page-on-github-link') + a(href=src rel="noopener" target="_blank")= i18n('docs.edit-this-page-on-github-link') diff --git a/src/init.ts b/src/init.ts index 3dcfc28b7..2fe16a706 100644 --- a/src/init.ts +++ b/src/init.ts @@ -4,6 +4,7 @@ console.log('Init database...'); initDb(false, true, true).then(() => { console.log('Done :)'); + process.exit(0); }, e => { console.error('Failed to init database'); console.error(e); diff --git a/src/models/entities/messaging-message.ts b/src/models/entities/messaging-message.ts index d3c3eab3a..c18897a37 100644 --- a/src/models/entities/messaging-message.ts +++ b/src/models/entities/messaging-message.ts @@ -2,6 +2,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typ import { User } from './user'; import { DriveFile } from './drive-file'; import { id } from '../id'; +import { UserGroup } from './user-group'; @Entity() export class MessagingMessage { @@ -29,10 +30,10 @@ export class MessagingMessage { @Index() @Column({ - ...id(), + ...id(), nullable: true, comment: 'The recipient user ID.' }) - public recipientId: User['id']; + public recipientId: User['id'] | null; @ManyToOne(type => User, { onDelete: 'CASCADE' @@ -40,6 +41,19 @@ export class MessagingMessage { @JoinColumn() public recipient: User | null; + @Index() + @Column({ + ...id(), nullable: true, + comment: 'The recipient group ID.' + }) + public groupId: UserGroup['id'] | null; + + @ManyToOne(type => UserGroup, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public group: UserGroup | null; + @Column('varchar', { length: 4096, nullable: true }) @@ -50,6 +64,12 @@ export class MessagingMessage { }) public isRead: boolean; + @Column({ + ...id(), + array: true, default: '{}' + }) + public reads: User['id'][]; + @Column({ ...id(), nullable: true, diff --git a/src/models/entities/meta.ts b/src/models/entities/meta.ts index 2c36b8333..fdd281823 100644 --- a/src/models/entities/meta.ts +++ b/src/models/entities/meta.ts @@ -268,4 +268,81 @@ export class Meta { nullable: true }) public discordClientSecret: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public ToSUrl: string | null; + + @Column('varchar', { + length: 512, + default: 'https://github.com/syuilo/misskey', + nullable: false + }) + public repositoryUrl: string; + + @Column('varchar', { + length: 512, + default: 'https://github.com/syuilo/misskey/issues/new', + nullable: true + }) + public feedbackUrl: string | null; + + @Column('boolean', { + default: false, + }) + public useObjectStorage: boolean; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStorageBucket: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStoragePrefix: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStorageBaseUrl: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStorageEndpoint: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStorageRegion: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStorageAccessKey: string | null; + + @Column('varchar', { + length: 512, + nullable: true + }) + public objectStorageSecretKey: string | null; + + @Column('integer', { + nullable: true + }) + public objectStoragePort: number | null; + + @Column('boolean', { + default: true, + }) + public objectStorageUseSSL: boolean; } diff --git a/src/models/entities/note.ts b/src/models/entities/note.ts index b71c02234..33a6d2bc2 100644 --- a/src/models/entities/note.ts +++ b/src/models/entities/note.ts @@ -43,8 +43,8 @@ export class Note { @JoinColumn() public renote: Note | null; - @Column({ - type: 'text', nullable: true + @Column('varchar', { + length: 8192, nullable: true }) public text: string | null; diff --git a/src/models/entities/page-like.ts b/src/models/entities/page-like.ts new file mode 100644 index 000000000..ca84ece8f --- /dev/null +++ b/src/models/entities/page-like.ts @@ -0,0 +1,33 @@ +import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; +import { User } from './user'; +import { id } from '../id'; +import { Page } from './page'; + +@Entity() +@Index(['userId', 'pageId'], { unique: true }) +export class PageLike { + @PrimaryColumn(id()) + public id: string; + + @Column('timestamp with time zone') + public createdAt: Date; + + @Index() + @Column(id()) + public userId: User['id']; + + @ManyToOne(type => User, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public user: User | null; + + @Column(id()) + public pageId: Page['id']; + + @ManyToOne(type => Page, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public page: Page | null; +} diff --git a/src/models/entities/page.ts b/src/models/entities/page.ts index f57ca8c7c..05015ba17 100644 --- a/src/models/entities/page.ts +++ b/src/models/entities/page.ts @@ -95,6 +95,11 @@ export class Page { }) public visibleUserIds: User['id'][]; + @Column('integer', { + default: 0 + }) + public likedCount: number; + constructor(data: Partial) { if (data == null) return; diff --git a/src/models/entities/user-group-invite.ts b/src/models/entities/user-group-invite.ts new file mode 100644 index 000000000..2adf2c024 --- /dev/null +++ b/src/models/entities/user-group-invite.ts @@ -0,0 +1,42 @@ +import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; +import { User } from './user'; +import { UserGroup } from './user-group'; +import { id } from '../id'; + +@Entity() +@Index(['userId', 'userGroupId'], { unique: true }) +export class UserGroupInvite { + @PrimaryColumn(id()) + public id: string; + + @Column('timestamp with time zone', { + comment: 'The created date of the UserGroupInvite.' + }) + public createdAt: Date; + + @Index() + @Column({ + ...id(), + comment: 'The user ID.' + }) + public userId: User['id']; + + @ManyToOne(type => User, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public user: User | null; + + @Index() + @Column({ + ...id(), + comment: 'The group ID.' + }) + public userGroupId: UserGroup['id']; + + @ManyToOne(type => UserGroup, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public userGroup: UserGroup | null; +} diff --git a/src/models/entities/user-group-joining.ts b/src/models/entities/user-group-joining.ts new file mode 100644 index 000000000..e09c3230f --- /dev/null +++ b/src/models/entities/user-group-joining.ts @@ -0,0 +1,42 @@ +import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; +import { User } from './user'; +import { UserGroup } from './user-group'; +import { id } from '../id'; + +@Entity() +@Index(['userId', 'userGroupId'], { unique: true }) +export class UserGroupJoining { + @PrimaryColumn(id()) + public id: string; + + @Column('timestamp with time zone', { + comment: 'The created date of the UserGroupJoining.' + }) + public createdAt: Date; + + @Index() + @Column({ + ...id(), + comment: 'The user ID.' + }) + public userId: User['id']; + + @ManyToOne(type => User, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public user: User | null; + + @Index() + @Column({ + ...id(), + comment: 'The group ID.' + }) + public userGroupId: UserGroup['id']; + + @ManyToOne(type => UserGroup, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public userGroup: UserGroup | null; +} diff --git a/src/models/entities/user-group.ts b/src/models/entities/user-group.ts new file mode 100644 index 000000000..f4bac0322 --- /dev/null +++ b/src/models/entities/user-group.ts @@ -0,0 +1,46 @@ +import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; +import { User } from './user'; +import { id } from '../id'; + +@Entity() +export class UserGroup { + @PrimaryColumn(id()) + public id: string; + + @Index() + @Column('timestamp with time zone', { + comment: 'The created date of the UserGroup.' + }) + public createdAt: Date; + + @Column('varchar', { + length: 256, + }) + public name: string; + + @Index() + @Column({ + ...id(), + comment: 'The ID of owner.' + }) + public userId: User['id']; + + @ManyToOne(type => User, { + onDelete: 'CASCADE' + }) + @JoinColumn() + public user: User | null; + + @Column('boolean', { + default: false, + }) + public isPrivate: boolean; + + constructor(data: Partial) { + if (data == null) return; + + for (const [k, v] of Object.entries(data)) { + (this as any)[k] = v; + } + } +} diff --git a/src/models/entities/user-list-joining.ts b/src/models/entities/user-list-joining.ts index 8af4efb6a..bb7dc40b9 100644 --- a/src/models/entities/user-list-joining.ts +++ b/src/models/entities/user-list-joining.ts @@ -4,6 +4,7 @@ import { UserList } from './user-list'; import { id } from '../id'; @Entity() +@Index(['userId', 'userListId'], { unique: true }) export class UserListJoining { @PrimaryColumn(id()) public id: string; diff --git a/src/models/index.ts b/src/models/index.ts index e402d6723..a60cd10ef 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -6,7 +6,6 @@ import { PollVote } from './entities/poll-vote'; import { Meta } from './entities/meta'; import { SwSubscription } from './entities/sw-subscription'; import { NoteWatching } from './entities/note-watching'; -import { UserListJoining } from './entities/user-list-joining'; import { NoteUnread } from './entities/note-unread'; import { RegistrationTicket } from './entities/registration-tickets'; import { UserRepository } from './repositories/user'; @@ -20,6 +19,10 @@ import { SigninRepository } from './repositories/signin'; import { MessagingMessageRepository } from './repositories/messaging-message'; import { ReversiGameRepository } from './repositories/games/reversi/game'; import { UserListRepository } from './repositories/user-list'; +import { UserListJoining } from './entities/user-list-joining'; +import { UserGroupRepository } from './repositories/user-group'; +import { UserGroupJoining } from './entities/user-group-joining'; +import { UserGroupInviteRepository } from './repositories/user-group-invite'; import { FollowRequestRepository } from './repositories/follow-request'; import { MutingRepository } from './repositories/muting'; import { BlockingRepository } from './repositories/blocking'; @@ -36,6 +39,7 @@ import { AuthSessionRepository } from './repositories/auth-session'; import { UserProfile } from './entities/user-profile'; import { HashtagRepository } from './repositories/hashtag'; import { PageRepository } from './repositories/page'; +import { PageLikeRepository } from './repositories/page-like'; export const Apps = getCustomRepository(AppRepository); export const Notes = getCustomRepository(NoteRepository); @@ -51,6 +55,9 @@ export const UserKeypairs = getRepository(UserKeypair); export const UserPublickeys = getRepository(UserPublickey); export const UserLists = getCustomRepository(UserListRepository); export const UserListJoinings = getRepository(UserListJoining); +export const UserGroups = getCustomRepository(UserGroupRepository); +export const UserGroupJoinings = getRepository(UserGroupJoining); +export const UserGroupInvites = getCustomRepository(UserGroupInviteRepository); export const UserNotePinings = getRepository(UserNotePining); export const Followings = getCustomRepository(FollowingRepository); export const FollowRequests = getCustomRepository(FollowRequestRepository); @@ -74,3 +81,4 @@ export const ReversiGames = getCustomRepository(ReversiGameRepository); export const ReversiMatchings = getCustomRepository(ReversiMatchingRepository); export const Logs = getRepository(Log); export const Pages = getCustomRepository(PageRepository); +export const PageLikes = getCustomRepository(PageLikeRepository); diff --git a/src/models/repositories/messaging-message.ts b/src/models/repositories/messaging-message.ts index 33f95bbd5..6db2f4fa7 100644 --- a/src/models/repositories/messaging-message.ts +++ b/src/models/repositories/messaging-message.ts @@ -1,6 +1,6 @@ import { EntityRepository, Repository } from 'typeorm'; import { MessagingMessage } from '../entities/messaging-message'; -import { Users, DriveFiles } from '..'; +import { Users, DriveFiles, UserGroups } from '..'; import { ensure } from '../../prelude/ensure'; import { types, bool, SchemaType } from '../../misc/schema'; @@ -16,11 +16,13 @@ export class MessagingMessageRepository extends Repository { src: MessagingMessage['id'] | MessagingMessage, me?: any, options?: { - populateRecipient: boolean + populateRecipient?: boolean, + populateGroup?: boolean, } ): Promise { const opts = options || { - populateRecipient: true + populateRecipient: true, + populateGroup: true, }; const message = typeof src === 'object' ? src : await this.findOne(src).then(ensure); @@ -32,10 +34,13 @@ export class MessagingMessageRepository extends Repository { userId: message.userId, user: await Users.pack(message.user || message.userId, me), recipientId: message.recipientId, - recipient: opts.populateRecipient ? await Users.pack(message.recipient || message.recipientId, me) : undefined, + recipient: message.recipientId && opts.populateRecipient ? await Users.pack(message.recipient || message.recipientId, me) : undefined, + groupId: message.groupId, + group: message.groupId && opts.populateGroup ? await UserGroups.pack(message.group || message.groupId) : undefined, fileId: message.fileId, file: message.fileId ? await DriveFiles.pack(message.fileId) : null, - isRead: message.isRead + isRead: message.isRead, + reads: message.reads, }; } } @@ -83,17 +88,36 @@ export const packedMessagingMessageSchema = { }, recipientId: { type: types.string, - optional: bool.false, nullable: bool.false, + optional: bool.false, nullable: bool.true, format: 'id', }, recipient: { type: types.object, - optional: bool.true, nullable: bool.false, + optional: bool.true, nullable: bool.true, ref: 'User' }, + groupId: { + type: types.string, + optional: bool.false, nullable: bool.true, + format: 'id', + }, + group: { + type: types.object, + optional: bool.true, nullable: bool.true, + ref: 'UserGroup' + }, isRead: { type: types.boolean, optional: bool.true, nullable: bool.false, }, + reads: { + type: types.array, + optional: bool.true, nullable: bool.false, + items: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'id' + } + }, }, }; diff --git a/src/models/repositories/note-favorite.ts b/src/models/repositories/note-favorite.ts index 5bc638410..01064f306 100644 --- a/src/models/repositories/note-favorite.ts +++ b/src/models/repositories/note-favorite.ts @@ -2,6 +2,7 @@ import { EntityRepository, Repository } from 'typeorm'; import { NoteFavorite } from '../entities/note-favorite'; import { Notes } from '..'; import { ensure } from '../../prelude/ensure'; +import { types, bool } from '../../misc/schema'; @EntityRepository(NoteFavorite) export class NoteFavoriteRepository extends Repository { @@ -13,6 +14,8 @@ export class NoteFavoriteRepository extends Repository { return { id: favorite.id, + createdAt: favorite.createdAt, + noteId: favorite.noteId, note: await Notes.pack(favorite.note || favorite.noteId, me), }; } @@ -24,3 +27,33 @@ export class NoteFavoriteRepository extends Repository { return Promise.all(favorites.map(x => this.pack(x, me))); } } + +export const packedNoteFavoriteSchema = { + type: types.object, + optional: bool.false, nullable: bool.false, + properties: { + id: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'id', + description: 'The unique identifier for this favorite.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'date-time', + description: 'The date that the favorite was created.' + }, + note: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'Note', + }, + noteId: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'id', + }, + }, +}; diff --git a/src/models/repositories/page-like.ts b/src/models/repositories/page-like.ts new file mode 100644 index 000000000..3e7e803fd --- /dev/null +++ b/src/models/repositories/page-like.ts @@ -0,0 +1,26 @@ +import { EntityRepository, Repository } from 'typeorm'; +import { PageLike } from '../entities/page-like'; +import { Pages } from '..'; +import { ensure } from '../../prelude/ensure'; + +@EntityRepository(PageLike) +export class PageLikeRepository extends Repository { + public async pack( + src: PageLike['id'] | PageLike, + me?: any + ) { + const like = typeof src === 'object' ? src : await this.findOne(src).then(ensure); + + return { + id: like.id, + page: await Pages.pack(like.page || like.pageId, me), + }; + } + + public packMany( + likes: any[], + me: any + ) { + return Promise.all(likes.map(x => this.pack(x, me))); + } +} diff --git a/src/models/repositories/page.ts b/src/models/repositories/page.ts index 2293edbc0..3b4142002 100644 --- a/src/models/repositories/page.ts +++ b/src/models/repositories/page.ts @@ -1,24 +1,30 @@ import { EntityRepository, Repository } from 'typeorm'; import { Page } from '../entities/page'; import { SchemaType, types, bool } from '../../misc/schema'; -import { Users, DriveFiles } from '..'; +import { Users, DriveFiles, PageLikes } from '..'; import { awaitAll } from '../../prelude/await-all'; import { DriveFile } from '../entities/drive-file'; +import { User } from '../entities/user'; +import { ensure } from '../../prelude/ensure'; export type PackedPage = SchemaType; @EntityRepository(Page) export class PageRepository extends Repository { public async pack( - src: Page, + src: Page['id'] | Page, + me?: User['id'] | User | null | undefined, ): Promise { + const meId = me ? typeof me === 'string' ? me : me.id : null; + const page = typeof src === 'object' ? src : await this.findOne(src).then(ensure); + const attachedFiles: Promise[] = []; const collectFile = (xs: any[]) => { for (const x of xs) { if (x.type === 'image') { attachedFiles.push(DriveFiles.findOne({ id: x.fileId, - userId: src.userId + userId: page.userId })); } if (x.children) { @@ -26,7 +32,7 @@ export class PageRepository extends Repository { } } }; - collectFile(src.content); + collectFile(page.content); // 後方互換性のため let migrated = false; @@ -47,29 +53,31 @@ export class PageRepository extends Repository { } } }; - migrate(src.content); + migrate(page.content); if (migrated) { - this.update(src.id, { - content: src.content + this.update(page.id, { + content: page.content }); } return await awaitAll({ - id: src.id, - createdAt: src.createdAt.toISOString(), - updatedAt: src.updatedAt.toISOString(), - userId: src.userId, - user: Users.pack(src.user || src.userId), - content: src.content, - variables: src.variables, - title: src.title, - name: src.name, - summary: src.summary, - alignCenter: src.alignCenter, - font: src.font, - eyeCatchingImageId: src.eyeCatchingImageId, - eyeCatchingImage: src.eyeCatchingImageId ? await DriveFiles.pack(src.eyeCatchingImageId) : null, - attachedFiles: DriveFiles.packMany(await Promise.all(attachedFiles)) + id: page.id, + createdAt: page.createdAt.toISOString(), + updatedAt: page.updatedAt.toISOString(), + userId: page.userId, + user: Users.pack(page.user || page.userId), + content: page.content, + variables: page.variables, + title: page.title, + name: page.name, + summary: page.summary, + alignCenter: page.alignCenter, + font: page.font, + eyeCatchingImageId: page.eyeCatchingImageId, + eyeCatchingImage: page.eyeCatchingImageId ? await DriveFiles.pack(page.eyeCatchingImageId) : null, + attachedFiles: DriveFiles.packMany(await Promise.all(attachedFiles)), + likedCount: page.likedCount, + isLiked: meId ? await PageLikes.findOne({ pageId: page.id, userId: meId }).then(x => x != null) : undefined, }); } diff --git a/src/models/repositories/user-group-invite.ts b/src/models/repositories/user-group-invite.ts new file mode 100644 index 000000000..1d4c2aa15 --- /dev/null +++ b/src/models/repositories/user-group-invite.ts @@ -0,0 +1,24 @@ +import { EntityRepository, Repository } from 'typeorm'; +import { UserGroupInvite } from '../entities/user-group-invite'; +import { UserGroups } from '..'; +import { ensure } from '../../prelude/ensure'; + +@EntityRepository(UserGroupInvite) +export class UserGroupInviteRepository extends Repository { + public async pack( + src: UserGroupInvite['id'] | UserGroupInvite, + ) { + const invite = typeof src === 'object' ? src : await this.findOne(src).then(ensure); + + return { + id: invite.id, + group: await UserGroups.pack(invite.userGroup || invite.userGroupId), + }; + } + + public packMany( + invites: any[], + ) { + return Promise.all(invites.map(x => this.pack(x))); + } +} diff --git a/src/models/repositories/user-group.ts b/src/models/repositories/user-group.ts new file mode 100644 index 000000000..38174ce23 --- /dev/null +++ b/src/models/repositories/user-group.ts @@ -0,0 +1,67 @@ +import { EntityRepository, Repository } from 'typeorm'; +import { UserGroup } from '../entities/user-group'; +import { ensure } from '../../prelude/ensure'; +import { UserGroupJoinings } from '..'; +import { bool, types, SchemaType } from '../../misc/schema'; + +export type PackedUserGroup = SchemaType; + +@EntityRepository(UserGroup) +export class UserGroupRepository extends Repository { + public async pack( + src: UserGroup['id'] | UserGroup, + ): Promise { + const userGroup = typeof src === 'object' ? src : await this.findOne(src).then(ensure); + + const users = await UserGroupJoinings.find({ + userGroupId: userGroup.id + }); + + return { + id: userGroup.id, + createdAt: userGroup.createdAt.toISOString(), + name: userGroup.name, + ownerId: userGroup.userId, + userIds: users.map(x => x.userId) + }; + } +} + +export const packedUserGroupSchema = { + type: types.object, + optional: bool.false, nullable: bool.false, + properties: { + id: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'id', + description: 'The unique identifier for this UserGroup.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: types.string, + optional: bool.false, nullable: bool.false, + format: 'date-time', + description: 'The date that the UserGroup was created.' + }, + name: { + type: types.string, + optional: bool.false, nullable: bool.false, + description: 'The name of the UserGroup.' + }, + ownerId: { + type: types.string, + nullable: bool.false, optional: bool.false, + format: 'id', + }, + userIds: { + type: types.array, + nullable: bool.false, optional: bool.true, + items: { + type: types.string, + nullable: bool.false, optional: bool.false, + format: 'id', + } + }, + }, +}; diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index 330220fb7..d3cd75b17 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -1,6 +1,6 @@ import { EntityRepository, Repository, In } from 'typeorm'; import { User, ILocalUser, IRemoteUser } from '../entities/user'; -import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles } from '..'; +import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserGroupJoinings } from '..'; import { ensure } from '../../prelude/ensure'; import config from '../../config'; import { SchemaType, bool, types } from '../../misc/schema'; @@ -54,6 +54,31 @@ export class UserRepository extends Repository { }; } + public async getHasUnreadMessagingMessage(userId: User['id']): Promise { + const joinings = await UserGroupJoinings.find({ userId: userId }); + + const groupQs = Promise.all(joinings.map(j => MessagingMessages.createQueryBuilder('message') + .where(`message.groupId = :groupId`, { groupId: j.userGroupId }) + .andWhere('message.userId != :userId', { userId: userId }) + .andWhere('NOT (:userId = ANY(message.reads))', { userId: userId }) + .andWhere('message.createdAt > :joinedAt', { joinedAt: j.createdAt }) // 自分が加入する前の会話については、未読扱いしない + .getOne().then(x => x != null))); + + const [withUser, withGroups] = await Promise.all([ + // TODO: ミュートを考慮 + MessagingMessages.count({ + where: { + recipientId: userId, + isRead: false + }, + take: 1 + }).then(count => count > 0), + groupQs + ]); + + return withUser || withGroups.some(x => x); + } + public async pack( src: User['id'] | User, me?: User['id'] | User | null | undefined, @@ -151,13 +176,8 @@ export class UserRepository extends Repository { autoWatch: profile!.autoWatch, alwaysMarkNsfw: profile!.alwaysMarkNsfw, carefulBot: profile!.carefulBot, - hasUnreadMessagingMessage: MessagingMessages.count({ - where: { - recipientId: user.id, - isRead: false - }, - take: 1 - }).then(count => count > 0), + autoAcceptFollowed: profile!.autoAcceptFollowed, + hasUnreadMessagingMessage: this.getHasUnreadMessagingMessage(user.id), hasUnreadNotification: Notifications.count({ where: { notifieeId: user.id, diff --git a/src/ormconfig.ts b/src/ormconfig.ts new file mode 100644 index 000000000..6b7297b2c --- /dev/null +++ b/src/ormconfig.ts @@ -0,0 +1,19 @@ +import * as fs from 'fs'; +import config from './config'; + +const json = { + type: 'postgres', + host: config.db.host, + port: config.db.port, + username: config.db.user, + password: config.db.pass, + database: config.db.db, + extra: config.db.extra, + entities: ['src/models/entities/*.ts'], + migrations: ['migration/*.ts'], + cli: { + migrationsDir: 'migration' + } +}; + +fs.writeFileSync('ormconfig.json', JSON.stringify(json)); diff --git a/src/queue/index.ts b/src/queue/index.ts index a010004f1..70233d831 100644 --- a/src/queue/index.ts +++ b/src/queue/index.ts @@ -8,6 +8,7 @@ import { program } from '../argv'; import processDeliver from './processors/deliver'; import processInbox from './processors/inbox'; import processDb from './processors/db'; +import procesObjectStorage from './processors/object-storage'; import { queueLogger } from './logger'; import { DriveFile } from '../models/entities/drive-file'; @@ -34,9 +35,12 @@ function renderError(e: Error): any { export const deliverQueue = initializeQueue('deliver'); export const inboxQueue = initializeQueue('inbox'); export const dbQueue = initializeQueue('db'); +export const objectStorageQueue = initializeQueue('objectStorage'); const deliverLogger = queueLogger.createSubLogger('deliver'); const inboxLogger = queueLogger.createSubLogger('inbox'); +const dbLogger = queueLogger.createSubLogger('db'); +const objectStorageLogger = queueLogger.createSubLogger('objectStorage'); deliverQueue .on('waiting', (jobId) => deliverLogger.debug(`waiting id=${jobId}`)) @@ -54,6 +58,22 @@ inboxQueue .on('error', (job: any, err: Error) => inboxLogger.error(`error ${err}`, { job, e: renderError(err) })) .on('stalled', (job) => inboxLogger.warn(`stalled id=${job.id} activity=${job.data.activity ? job.data.activity.id : 'none'}`)); +dbQueue + .on('waiting', (jobId) => dbLogger.debug(`waiting id=${jobId}`)) + .on('active', (job) => dbLogger.debug(`active id=${job.id}`)) + .on('completed', (job, result) => dbLogger.debug(`completed(${result}) id=${job.id}`)) + .on('failed', (job, err) => dbLogger.warn(`failed(${err}) id=${job.id}`, { job, e: renderError(err) })) + .on('error', (job: any, err: Error) => dbLogger.error(`error ${err}`, { job, e: renderError(err) })) + .on('stalled', (job) => dbLogger.warn(`stalled id=${job.id}`)); + +objectStorageQueue + .on('waiting', (jobId) => objectStorageLogger.debug(`waiting id=${jobId}`)) + .on('active', (job) => objectStorageLogger.debug(`active id=${job.id}`)) + .on('completed', (job, result) => objectStorageLogger.debug(`completed(${result}) id=${job.id}`)) + .on('failed', (job, err) => objectStorageLogger.warn(`failed(${err}) id=${job.id}`, { job, e: renderError(err) })) + .on('error', (job: any, err: Error) => objectStorageLogger.error(`error ${err}`, { job, e: renderError(err) })) + .on('stalled', (job) => objectStorageLogger.warn(`stalled id=${job.id}`)); + export function deliver(user: ILocalUser, content: any, to: any) { if (content == null) return null; @@ -165,11 +185,21 @@ export function createImportUserListsJob(user: ILocalUser, fileId: DriveFile['id }); } +export function createDeleteObjectStorageFileJob(key: string) { + return objectStorageQueue.add('deleteFile', { + key: key + }, { + removeOnComplete: true, + removeOnFail: true + }); +} + export default function() { if (!program.onlyServer) { deliverQueue.process(128, processDeliver); inboxQueue.process(128, processInbox); processDb(dbQueue); + procesObjectStorage(objectStorageQueue); } } diff --git a/src/queue/processors/db/delete-drive-files.ts b/src/queue/processors/db/delete-drive-files.ts index 4e4eab86b..5ecee9139 100644 --- a/src/queue/processors/db/delete-drive-files.ts +++ b/src/queue/processors/db/delete-drive-files.ts @@ -1,7 +1,7 @@ import * as Bull from 'bull'; import { queueLogger } from '../../logger'; -import deleteFile from '../../../services/drive/delete-file'; +import { deleteFile } from '../../../services/drive/delete-file'; import { Users, DriveFiles } from '../../../models'; import { MoreThan } from 'typeorm'; diff --git a/src/queue/processors/object-storage/delete-file.ts b/src/queue/processors/object-storage/delete-file.ts new file mode 100644 index 000000000..8e6b5f959 --- /dev/null +++ b/src/queue/processors/object-storage/delete-file.ts @@ -0,0 +1,22 @@ +import * as Bull from 'bull'; +import * as Minio from 'minio'; +import { fetchMeta } from '../../../misc/fetch-meta'; + +export default async (job: Bull.Job) => { + const meta = await fetchMeta(); + + const minio = new Minio.Client({ + endPoint: meta.objectStorageEndpoint!, + region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined, + port: meta.objectStoragePort ? meta.objectStoragePort : undefined, + useSSL: meta.objectStorageUseSSL, + accessKey: meta.objectStorageAccessKey!, + secretKey: meta.objectStorageSecretKey!, + }); + + const key: string = job.data.key; + + await minio.removeObject(meta.objectStorageBucket!, key); + + return 'Success'; +}; diff --git a/src/queue/processors/object-storage/index.ts b/src/queue/processors/object-storage/index.ts new file mode 100644 index 000000000..f2fc08f1a --- /dev/null +++ b/src/queue/processors/object-storage/index.ts @@ -0,0 +1,12 @@ +import * as Bull from 'bull'; +import deleteFile from './delete-file'; + +const jobs = { + deleteFile, +} as any; + +export default function(q: Bull.Queue) { + for (const [k, v] of Object.entries(jobs)) { + q.process(k, v as any); + } +} diff --git a/src/server/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts index 2cb5a1f87..d18d8cd9d 100644 --- a/src/server/api/common/read-messaging-message.ts +++ b/src/server/api/common/read-messaging-message.ts @@ -1,21 +1,33 @@ -import { publishMainStream } from '../../../services/stream'; +import { publishMainStream, publishGroupMessagingStream } from '../../../services/stream'; import { publishMessagingStream } from '../../../services/stream'; import { publishMessagingIndexStream } from '../../../services/stream'; import { User } from '../../../models/entities/user'; import { MessagingMessage } from '../../../models/entities/messaging-message'; -import { MessagingMessages } from '../../../models'; +import { MessagingMessages, UserGroupJoinings, Users } from '../../../models'; import { In } from 'typeorm'; +import { IdentifiableError } from '../../../misc/identifiable-error'; +import { UserGroup } from '../../../models/entities/user-group'; /** * Mark messages as read */ -export default async ( +export async function readUserMessagingMessage( userId: User['id'], otherpartyId: User['id'], messageIds: MessagingMessage['id'][] -) => { +) { if (messageIds.length === 0) return; + const messages = await MessagingMessages.find({ + id: In(messageIds) + }); + + for (const message of messages) { + if (message.recipientId !== userId) { + throw new IdentifiableError('e140a4bf-49ce-4fb6-b67c-b78dadf6b52f', 'Access denied (user).'); + } + } + // Update documents await MessagingMessages.update({ id: In(messageIds), @@ -30,14 +42,62 @@ export default async ( publishMessagingStream(otherpartyId, userId, 'read', messageIds); publishMessagingIndexStream(userId, 'read', messageIds); - // Calc count of my unread messages - const count = await MessagingMessages.count({ - recipientId: userId, - isRead: false - }); - - if (count == 0) { + if (!await Users.getHasUnreadMessagingMessage(userId)) { // 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行 publishMainStream(userId, 'readAllMessagingMessages'); } -}; +} + +/** + * Mark messages as read + */ +export async function readGroupMessagingMessage( + userId: User['id'], + groupId: UserGroup['id'], + messageIds: MessagingMessage['id'][] +) { + if (messageIds.length === 0) return; + + // check joined + const joining = await UserGroupJoinings.findOne({ + userId: userId, + userGroupId: groupId + }); + + if (joining == null) { + throw new IdentifiableError('930a270c-714a-46b2-b776-ad27276dc569', 'Access denied (group).'); + } + + const messages = await MessagingMessages.find({ + id: In(messageIds) + }); + + const reads = []; + + for (const message of messages) { + if (message.userId === userId) continue; + if (message.reads.includes(userId)) continue; + + // Update document + await MessagingMessages.createQueryBuilder().update() + .set({ + reads: (() => `array_append("reads", '${joining.userId}')`) as any + }) + .where('id = :id', { id: message.id }) + .execute(); + + reads.push(message.id); + } + + // Publish event + publishGroupMessagingStream(groupId, 'read', { + ids: reads, + userId: userId + }); + publishMessagingIndexStream(userId, 'read', reads); + + if (!await Users.getHasUnreadMessagingMessage(userId)) { + // 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行 + publishMainStream(userId, 'readAllMessagingMessages'); + } +} diff --git a/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts new file mode 100644 index 000000000..276d1f37b --- /dev/null +++ b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -0,0 +1,32 @@ +import $ from 'cafy'; +import define from '../../define'; +import { deleteFile } from '../../../../services/drive/delete-file'; +import { DriveFiles } from '../../../../models'; +import { ID } from '../../../../misc/cafy-id'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, + + params: { + userId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のユーザーID', + 'en-US': 'The user ID which you want to suspend' + } + }, + } +}; + +export default define(meta, async (ps, me) => { + const files = await DriveFiles.find({ + userId: ps.userId + }); + + for (const file of files) { + deleteFile(file); + } +}); diff --git a/src/server/api/endpoints/admin/delete-logs.ts b/src/server/api/endpoints/admin/delete-logs.ts new file mode 100644 index 000000000..26cf13c1f --- /dev/null +++ b/src/server/api/endpoints/admin/delete-logs.ts @@ -0,0 +1,13 @@ +import define from '../../define'; +import { Logs } from '../../../../models'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, +}; + +export default define(meta, async (ps) => { + await Logs.delete({}); +}); diff --git a/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/src/server/api/endpoints/admin/drive/clean-remote-files.ts new file mode 100644 index 000000000..69cfe0db9 --- /dev/null +++ b/src/server/api/endpoints/admin/drive/clean-remote-files.ts @@ -0,0 +1,22 @@ +import { Not, IsNull } from 'typeorm'; +import define from '../../../define'; +import { deleteFile } from '../../../../../services/drive/delete-file'; +import { DriveFiles } from '../../../../../models'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, +}; + +export default define(meta, async (ps, me) => { + const files = await DriveFiles.find({ + userHost: Not(IsNull()), + isLink: false, + }); + + for (const file of files) { + deleteFile(file, true); + } +}); diff --git a/src/server/api/endpoints/admin/drive/cleanup.ts b/src/server/api/endpoints/admin/drive/cleanup.ts new file mode 100644 index 000000000..272416dee --- /dev/null +++ b/src/server/api/endpoints/admin/drive/cleanup.ts @@ -0,0 +1,21 @@ +import { IsNull } from 'typeorm'; +import define from '../../../define'; +import { deleteFile } from '../../../../../services/drive/delete-file'; +import { DriveFiles } from '../../../../../models'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, +}; + +export default define(meta, async (ps, me) => { + const files = await DriveFiles.find({ + userId: IsNull() + }); + + for (const file of files) { + deleteFile(file); + } +}); diff --git a/src/server/api/endpoints/admin/federation/delete-all-files.ts b/src/server/api/endpoints/admin/federation/delete-all-files.ts new file mode 100644 index 000000000..24ad9ce80 --- /dev/null +++ b/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -0,0 +1,27 @@ +import $ from 'cafy'; +import define from '../../../define'; +import { deleteFile } from '../../../../../services/drive/delete-file'; +import { DriveFiles } from '../../../../../models'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, + + params: { + host: { + validator: $.str + } + } +}; + +export default define(meta, async (ps, me) => { + const files = await DriveFiles.find({ + userHost: ps.host + }); + + for (const file of files) { + deleteFile(file); + } +}); diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts index 86e99730c..060df09ad 100644 --- a/src/server/api/endpoints/admin/logs.ts +++ b/src/server/api/endpoints/admin/logs.ts @@ -53,16 +53,18 @@ export default define(meta, async (ps) => { if (blackDomains.length > 0) { query.andWhere(new Brackets(qb => { for (const blackDomain of blackDomains) { - const subDomains = blackDomain.split('.'); - let i = 0; - for (const subDomain of subDomains) { - const p = `blackSubDomain_${subDomain}_${i}`; - // 全体で否定できないのでド・モルガンの法則で - // !(P && Q) を !P || !Q で表す - // SQL is 1 based, so we need '+ 1' - qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); - i++; - } + qb.andWhere(new Brackets(qb => { + const subDomains = blackDomain.split('.'); + let i = 0; + for (const subDomain of subDomains) { + const p = `blackSubDomain_${subDomain}_${i}`; + // 全体で否定できないのでド・モルガンの法則で + // !(P && Q) を !P || !Q で表す + // SQL is 1 based, so we need '+ 1' + qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); + i++; + } + })); } })); } diff --git a/src/server/api/endpoints/admin/queue/stats.ts b/src/server/api/endpoints/admin/queue/stats.ts index baeecba30..83684685f 100644 --- a/src/server/api/endpoints/admin/queue/stats.ts +++ b/src/server/api/endpoints/admin/queue/stats.ts @@ -1,5 +1,5 @@ import define from '../../../define'; -import { deliverQueue, inboxQueue } from '../../../../../queue'; +import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../../../../../queue'; export const meta = { tags: ['admin'], @@ -13,9 +13,13 @@ export const meta = { export default define(meta, async (ps) => { const deliverJobCounts = await deliverQueue.getJobCounts(); const inboxJobCounts = await inboxQueue.getJobCounts(); + const dbJobCounts = await dbQueue.getJobCounts(); + const objectStorageJobCounts = await objectStorageQueue.getJobCounts(); return { deliver: deliverJobCounts, - inbox: inboxJobCounts + inbox: inboxJobCounts, + db: dbJobCounts, + objectStorage: objectStorageJobCounts, }; }); diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts index 8a2019fcc..8e98d203f 100644 --- a/src/server/api/endpoints/admin/update-meta.ts +++ b/src/server/api/endpoints/admin/update-meta.ts @@ -70,6 +70,13 @@ export const meta = { } }, + blockedHosts: { + validator: $.optional.nullable.arr($.str), + desc: { + 'ja-JP': 'ブロックするホスト' + } + }, + mascotImageUrl: { validator: $.optional.nullable.str, desc: { @@ -330,6 +337,67 @@ export const meta = { 'ja-JP': 'ServiceWorkerのVAPIDキーペアの秘密鍵' } }, + + ToSUrl: { + validator: $.optional.nullable.str, + desc: { + 'ja-JP': '利用規約のURL' + } + }, + + repositoryUrl: { + validator: $.optional.str, + desc: { + 'ja-JP': 'リポジトリのURL' + } + }, + + feedbackUrl: { + validator: $.optional.str, + desc: { + 'ja-JP': 'フィードバックのURL' + } + }, + + useObjectStorage: { + validator: $.optional.bool + }, + + objectStorageBaseUrl: { + validator: $.optional.nullable.str + }, + + objectStorageBucket: { + validator: $.optional.nullable.str + }, + + objectStoragePrefix: { + validator: $.optional.nullable.str + }, + + objectStorageEndpoint: { + validator: $.optional.nullable.str + }, + + objectStorageRegion: { + validator: $.optional.nullable.str + }, + + objectStoragePort: { + validator: $.optional.nullable.num + }, + + objectStorageAccessKey: { + validator: $.optional.nullable.str + }, + + objectStorageSecretKey: { + validator: $.optional.nullable.str + }, + + objectStorageUseSSL: { + validator: $.optional.bool + }, } }; @@ -368,6 +436,10 @@ export default define(meta, async (ps) => { set.hiddenTags = ps.hiddenTags; } + if (Array.isArray(ps.blockedHosts)) { + set.blockedHosts = ps.blockedHosts; + } + if (ps.mascotImageUrl !== undefined) { set.mascotImageUrl = ps.mascotImageUrl; } @@ -516,6 +588,58 @@ export default define(meta, async (ps) => { set.swPrivateKey = ps.swPrivateKey; } + if (ps.ToSUrl !== undefined) { + set.ToSUrl = ps.ToSUrl; + } + + if (ps.repositoryUrl !== undefined) { + set.repositoryUrl = ps.repositoryUrl; + } + + if (ps.feedbackUrl !== undefined) { + set.feedbackUrl = ps.feedbackUrl; + } + + if (ps.useObjectStorage !== undefined) { + set.useObjectStorage = ps.useObjectStorage; + } + + if (ps.objectStorageBaseUrl !== undefined) { + set.objectStorageBaseUrl = ps.objectStorageBaseUrl; + } + + if (ps.objectStorageBucket !== undefined) { + set.objectStorageBucket = ps.objectStorageBucket; + } + + if (ps.objectStoragePrefix !== undefined) { + set.objectStoragePrefix = ps.objectStoragePrefix; + } + + if (ps.objectStorageEndpoint !== undefined) { + set.objectStorageEndpoint = ps.objectStorageEndpoint; + } + + if (ps.objectStorageRegion !== undefined) { + set.objectStorageRegion = ps.objectStorageRegion; + } + + if (ps.objectStoragePort !== undefined) { + set.objectStoragePort = ps.objectStoragePort; + } + + if (ps.objectStorageAccessKey !== undefined) { + set.objectStorageAccessKey = ps.objectStorageAccessKey; + } + + if (ps.objectStorageSecretKey !== undefined) { + set.objectStorageSecretKey = ps.objectStorageSecretKey; + } + + if (ps.objectStorageUseSSL !== undefined) { + set.objectStorageUseSSL = ps.objectStorageUseSSL; + } + await getConnection().transaction(async transactionalEntityManager => { const meta = await transactionalEntityManager.findOne(Meta, { order: { diff --git a/src/server/api/endpoints/drive/files/delete.ts b/src/server/api/endpoints/drive/files/delete.ts index d8cc5ec0a..d6a20f352 100644 --- a/src/server/api/endpoints/drive/files/delete.ts +++ b/src/server/api/endpoints/drive/files/delete.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import { ID } from '../../../../../misc/cafy-id'; -import del from '../../../../../services/drive/delete-file'; +import { deleteFile } from '../../../../../services/drive/delete-file'; import { publishDriveStream } from '../../../../../services/stream'; import define from '../../../define'; import { ApiError } from '../../../error'; @@ -57,7 +57,7 @@ export default define(meta, async (ps, user) => { } // Delete - await del(file); + await deleteFile(file); // Publish fileDeleted event publishDriveStream(user.id, 'fileDeleted', file.id); diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts index 05d571851..53a351471 100644 --- a/src/server/api/endpoints/hashtags/trend.ts +++ b/src/server/api/endpoints/hashtags/trend.ts @@ -59,6 +59,7 @@ export default define(meta, async () => { .where(`note.createdAt > :date`, { date: new Date(Date.now() - rangeA) }) .andWhere(`note.tags != '{}'`) .select(['note.tags', 'note.userId']) + .cache(60000) // 1 min .getMany(); if (tagNotes.length === 0) { @@ -108,6 +109,7 @@ export default define(meta, async () => { .where(':tag = ANY(note.tags)', { tag: tag }) .andWhere('note.createdAt < :lt', { lt: new Date(Date.now() - (interval * i)) }) .andWhere('note.createdAt > :gt', { gt: new Date(Date.now() - (interval * (i + 1))) }) + .cache(60000) // 1 min .getRawOne() .then(x => parseInt(x.count, 10)) ))); @@ -119,6 +121,7 @@ export default define(meta, async () => { .select('count(distinct note.userId)') .where(':tag = ANY(note.tags)', { tag: tag }) .andWhere('note.createdAt > :gt', { gt: new Date(Date.now() - (interval * range)) }) + .cache(60000) // 1 min .getRawOne() .then(x => parseInt(x.count, 10)) )); diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts index aad706545..d1e90dd15 100644 --- a/src/server/api/endpoints/i/favorites.ts +++ b/src/server/api/endpoints/i/favorites.ts @@ -3,6 +3,7 @@ import { ID } from '../../../../misc/cafy-id'; import define from '../../define'; import { NoteFavorites } from '../../../../models'; import { makePaginationQuery } from '../../common/make-pagination-query'; +import { types, bool } from '../../../../misc/schema'; export const meta = { desc: { @@ -29,7 +30,17 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, - } + }, + + res: { + type: types.array, + optional: bool.false, nullable: bool.false, + items: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'NoteFavorite', + } + }, }; export default define(meta, async (ps, user) => { diff --git a/src/server/api/endpoints/i/page-likes.ts b/src/server/api/endpoints/i/page-likes.ts new file mode 100644 index 000000000..23bde74c9 --- /dev/null +++ b/src/server/api/endpoints/i/page-likes.ts @@ -0,0 +1,45 @@ +import $ from 'cafy'; +import { ID } from '../../../../misc/cafy-id'; +import define from '../../define'; +import { PageLikes } from '../../../../models'; +import { makePaginationQuery } from '../../common/make-pagination-query'; + +export const meta = { + desc: { + 'ja-JP': '「いいね」したページ一覧を取得します。', + 'en-US': 'Get liked pages' + }, + + tags: ['account', 'pages'], + + requireCredential: true, + + kind: 'read:page-likes', + + params: { + limit: { + validator: $.optional.num.range(1, 100), + default: 10 + }, + + sinceId: { + validator: $.optional.type(ID), + }, + + untilId: { + validator: $.optional.type(ID), + }, + } +}; + +export default define(meta, async (ps, user) => { + const query = makePaginationQuery(PageLikes.createQueryBuilder('like'), ps.sinceId, ps.untilId) + .andWhere(`like.userId = :meId`, { meId: user.id }) + .leftJoinAndSelect('like.page', 'page'); + + const likes = await query + .take(ps.limit!) + .getMany(); + + return await PageLikes.packMany(likes, user); +}); diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts index d4b9721d8..56284499d 100644 --- a/src/server/api/endpoints/i/update-email.ts +++ b/src/server/api/endpoints/i/update-email.ts @@ -1,15 +1,13 @@ import $ from 'cafy'; import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; -import * as nodemailer from 'nodemailer'; -import { fetchMeta } from '../../../../misc/fetch-meta'; import rndstr from 'rndstr'; import config from '../../../../config'; import * as ms from 'ms'; import * as bcrypt from 'bcryptjs'; -import { apiLogger } from '../../logger'; import { Users, UserProfiles } from '../../../../models'; import { ensure } from '../../../../prelude/ensure'; +import { sendEmail } from '../../../../services/send-email'; export const meta = { requireCredential: true, @@ -63,36 +61,9 @@ export default define(meta, async (ps, user) => { emailVerifyCode: code }); - const meta = await fetchMeta(true); - - const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; - - const transporter = nodemailer.createTransport({ - host: meta.smtpHost, - port: meta.smtpPort, - secure: meta.smtpSecure, - ignoreTLS: !enableAuth, - auth: enableAuth ? { - user: meta.smtpUser, - pass: meta.smtpPass - } : undefined - } as any); - const link = `${config.url}/verify-email/${code}`; - transporter.sendMail({ - from: meta.email!, - to: ps.email, - subject: meta.name || 'Misskey', - text: `To verify email, please click this link: ${link}` - }, (error, info) => { - if (error) { - apiLogger.error(error); - return; - } - - apiLogger.info('Message sent: %s', info.messageId); - }); + sendEmail(ps.email, 'Email verification', `To verify email, please click this link: ${link}`); } return iObj; diff --git a/src/server/api/endpoints/i/user-group-invites.ts b/src/server/api/endpoints/i/user-group-invites.ts new file mode 100644 index 000000000..9d07fa31a --- /dev/null +++ b/src/server/api/endpoints/i/user-group-invites.ts @@ -0,0 +1,45 @@ +import $ from 'cafy'; +import { ID } from '../../../../misc/cafy-id'; +import define from '../../define'; +import { UserGroupInvites } from '../../../../models'; +import { makePaginationQuery } from '../../common/make-pagination-query'; + +export const meta = { + desc: { + 'ja-JP': 'グループへの招待一覧を取得します。', + 'en-US': 'Get user group invitations.' + }, + + tags: ['account', 'groups'], + + requireCredential: true, + + kind: 'read:user-groups', + + params: { + limit: { + validator: $.optional.num.range(1, 100), + default: 10 + }, + + sinceId: { + validator: $.optional.type(ID), + }, + + untilId: { + validator: $.optional.type(ID), + }, + } +}; + +export default define(meta, async (ps, user) => { + const query = makePaginationQuery(UserGroupInvites.createQueryBuilder('invite'), ps.sinceId, ps.untilId) + .andWhere(`invite.userId = :meId`, { meId: user.id }) + .leftJoinAndSelect('invite.userGroup', 'user_group'); + + const invites = await query + .take(ps.limit!) + .getMany(); + + return await UserGroupInvites.packMany(invites); +}); diff --git a/src/server/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts index 27e38bbde..833ec37e4 100644 --- a/src/server/api/endpoints/messaging/history.ts +++ b/src/server/api/endpoints/messaging/history.ts @@ -1,13 +1,13 @@ import $ from 'cafy'; import define from '../../define'; import { MessagingMessage } from '../../../../models/entities/messaging-message'; -import { MessagingMessages, Mutings } from '../../../../models'; +import { MessagingMessages, Mutings, UserGroupJoinings } from '../../../../models'; import { Brackets } from 'typeorm'; import { types, bool } from '../../../../misc/schema'; export const meta = { desc: { - 'ja-JP': 'Messagingの履歴を取得します。', + 'ja-JP': 'トークの履歴を取得します。', 'en-US': 'Show messaging history.' }, @@ -21,6 +21,11 @@ export const meta = { limit: { validator: $.optional.num.range(1, 100), default: 10 + }, + + group: { + validator: $.optional.bool, + default: false } }, @@ -40,26 +45,46 @@ export default define(meta, async (ps, user) => { muterId: user.id, }); + const groups = ps.group ? await UserGroupJoinings.find({ + userId: user.id, + }).then(xs => xs.map(x => x.userGroupId)) : []; + + if (ps.group && groups.length === 0) { + return []; + } + const history: MessagingMessage[] = []; for (let i = 0; i < ps.limit!; i++) { - const found = history.map(m => (m.userId === user.id) ? m.recipientId : m.userId); + const found = ps.group + ? history.map(m => m.groupId!) + : history.map(m => (m.userId === user.id) ? m.recipientId! : m.userId!); const query = MessagingMessages.createQueryBuilder('message') - .where(new Brackets(qb => { qb - .where(`message.userId = :userId`, { userId: user.id }) - .orWhere(`message.recipientId = :userId`, { userId: user.id }); - })) .orderBy('message.createdAt', 'DESC'); - if (found.length > 0) { - query.andWhere(`message.userId NOT IN (:...found)`, { found: found }); - query.andWhere(`message.recipientId NOT IN (:...found)`, { found: found }); - } + if (ps.group) { + query.where(`message.groupId IN (:...groups)`, { groups: groups }); - if (mute.length > 0) { - query.andWhere(`message.userId NOT IN (:...mute)`, { mute: mute.map(m => m.muteeId) }); - query.andWhere(`message.recipientId NOT IN (:...mute)`, { mute: mute.map(m => m.muteeId) }); + if (found.length > 0) { + query.andWhere(`message.groupId NOT IN (:...found)`, { found: found }); + } + } else { + query.where(new Brackets(qb => { qb + .where(`message.userId = :userId`, { userId: user.id }) + .orWhere(`message.recipientId = :userId`, { userId: user.id }); + })); + query.andWhere(`message.groupId IS NULL`); + + if (found.length > 0) { + query.andWhere(`message.userId NOT IN (:...found)`, { found: found }); + query.andWhere(`message.recipientId NOT IN (:...found)`, { found: found }); + } + + if (mute.length > 0) { + query.andWhere(`message.userId NOT IN (:...mute)`, { mute: mute.map(m => m.muteeId) }); + query.andWhere(`message.recipientId NOT IN (:...mute)`, { mute: mute.map(m => m.muteeId) }); + } } const message = await query.getOne(); diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts index 0d5295bff..ffd58c714 100644 --- a/src/server/api/endpoints/messaging/messages.ts +++ b/src/server/api/endpoints/messaging/messages.ts @@ -1,16 +1,17 @@ import $ from 'cafy'; import { ID } from '../../../../misc/cafy-id'; -import read from '../../common/read-messaging-message'; import define from '../../define'; import { ApiError } from '../../error'; import { getUser } from '../../common/getters'; -import { MessagingMessages } from '../../../../models'; +import { MessagingMessages, UserGroups, UserGroupJoinings } from '../../../../models'; import { makePaginationQuery } from '../../common/make-pagination-query'; import { types, bool } from '../../../../misc/schema'; +import { Brackets } from 'typeorm'; +import { readUserMessagingMessage, readGroupMessagingMessage } from '../../common/read-messaging-message'; export const meta = { desc: { - 'ja-JP': '指定したユーザーとのMessagingのメッセージ一覧を取得します。', + 'ja-JP': 'トークメッセージ一覧を取得します。', 'en-US': 'Get messages of messaging.' }, @@ -22,13 +23,21 @@ export const meta = { params: { userId: { - validator: $.type(ID), + validator: $.optional.type(ID), desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' } }, + groupId: { + validator: $.optional.type(ID), + desc: { + 'ja-JP': '対象のグループのID', + 'en-US': 'Target group ID' + } + }, + limit: { validator: $.optional.num.range(1, 100), default: 10 @@ -64,27 +73,85 @@ export const meta = { code: 'NO_SUCH_USER', id: '11795c64-40ea-4198-b06e-3c873ed9039d' }, + + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: 'c4d9f88c-9270-4632-b032-6ed8cee36f7f' + }, + + groupAccessDenied: { + message: 'You can not read messages of groups that you have not joined.', + code: 'GROUP_ACCESS_DENIED', + id: 'a053a8dd-a491-4718-8f87-50775aad9284' + }, } }; export default define(meta, async (ps, user) => { - // Fetch recipient - const recipient = await getUser(ps.userId).catch(e => { - if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); - throw e; - }); + if (ps.userId != null) { + // Fetch recipient (user) + const recipient = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); - const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId) - .andWhere(`(message.userId = :meId AND message.recipientId = :recipientId) OR (message.userId = :recipientId AND message.recipientId = :meId)`, { meId: user.id, recipientId: recipient.id }); + const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId) + .andWhere(new Brackets(qb => { qb + .where(new Brackets(qb => { qb + .where('message.userId = :meId') + .andWhere('message.recipientId = :recipientId'); + })) + .orWhere(new Brackets(qb => { qb + .where('message.userId = :recipientId') + .andWhere('message.recipientId = :meId'); + })); + })) + .setParameter('meId', user.id) + .setParameter('recipientId', recipient.id); - const messages = await query.getMany(); + const messages = await query.take(ps.limit!).getMany(); - // Mark all as read - if (ps.markAsRead) { - read(user.id, recipient.id, messages.map(x => x.id)); + // Mark all as read + if (ps.markAsRead) { + readUserMessagingMessage(user.id, recipient.id, messages.filter(m => m.recipientId === user.id).map(x => x.id)); + } + + return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, { + populateRecipient: false + }))); + } else if (ps.groupId != null) { + // Fetch recipient (group) + const recipientGroup = await UserGroups.findOne(ps.groupId); + + if (recipientGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + // check joined + const joining = await UserGroupJoinings.findOne({ + userId: user.id, + userGroupId: recipientGroup.id + }); + + if (joining == null) { + throw new ApiError(meta.errors.groupAccessDenied); + } + + const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId) + .andWhere(`message.groupId = :groupId`, { groupId: recipientGroup.id }); + + const messages = await query.take(ps.limit!).getMany(); + + // Mark all as read + if (ps.markAsRead) { + readGroupMessagingMessage(user.id, recipientGroup.id, messages.map(x => x.id)); + } + + return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, { + populateGroup: false + }))); + } else { + throw new Error(); } - - return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, { - populateRecipient: false - }))); }); diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts index 388852b9c..f5d7cf2b3 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/create.ts @@ -1,19 +1,22 @@ import $ from 'cafy'; import { ID } from '../../../../../misc/cafy-id'; -import { publishMainStream } from '../../../../../services/stream'; +import { publishMainStream, publishGroupMessagingStream } from '../../../../../services/stream'; import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../services/stream'; import pushSw from '../../../../../services/push-notification'; import define from '../../../define'; import { ApiError } from '../../../error'; import { getUser } from '../../../common/getters'; -import { MessagingMessages, DriveFiles, Mutings } from '../../../../../models'; +import { MessagingMessages, DriveFiles, Mutings, UserGroups, UserGroupJoinings } from '../../../../../models'; import { MessagingMessage } from '../../../../../models/entities/messaging-message'; import { genId } from '../../../../../misc/gen-id'; import { types, bool } from '../../../../../misc/schema'; +import { User } from '../../../../../models/entities/user'; +import { UserGroup } from '../../../../../models/entities/user-group'; +import { Not } from 'typeorm'; export const meta = { desc: { - 'ja-JP': '指定したユーザーへMessagingのメッセージを送信します。', + 'ja-JP': 'トークメッセージを送信します。', 'en-US': 'Create a message of messaging.' }, @@ -25,13 +28,21 @@ export const meta = { params: { userId: { - validator: $.type(ID), + validator: $.optional.type(ID), desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' } }, + groupId: { + validator: $.optional.type(ID), + desc: { + 'ja-JP': '対象のグループのID', + 'en-US': 'Target group ID' + } + }, + text: { validator: $.optional.str.pipe(MessagingMessages.isValidText) }, @@ -60,6 +71,18 @@ export const meta = { id: '11795c64-40ea-4198-b06e-3c873ed9039d' }, + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: 'c94e2a5d-06aa-4914-8fa6-6a42e73d6537' + }, + + groupAccessDenied: { + message: 'You can not send messages to groups that you have not joined.', + code: 'GROUP_ACCESS_DENIED', + id: 'd96b3cca-5ad1-438b-ad8b-02f931308fbd' + }, + noSuchFile: { message: 'No such file.', code: 'NO_SUCH_FILE', @@ -75,16 +98,38 @@ export const meta = { }; export default define(meta, async (ps, user) => { - // Myself - if (ps.userId === user.id) { - throw new ApiError(meta.errors.recipientIsYourself); - } + let recipientUser: User | undefined; + let recipientGroup: UserGroup | undefined; - // Fetch recipient - const recipient = await getUser(ps.userId).catch(e => { - if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); - throw e; - }); + if (ps.userId != null) { + // Myself + if (ps.userId === user.id) { + throw new ApiError(meta.errors.recipientIsYourself); + } + + // Fetch recipient (user) + recipientUser = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + } else if (ps.groupId != null) { + // Fetch recipient (group) + recipientGroup = await UserGroups.findOne(ps.groupId); + + if (recipientGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + // check joined + const joining = await UserGroupJoinings.findOne({ + userId: user.id, + userGroupId: recipientGroup.id + }); + + if (joining == null) { + throw new ApiError(meta.errors.groupAccessDenied); + } + } let file = null; if (ps.fileId != null) { @@ -107,32 +152,49 @@ export default define(meta, async (ps, user) => { id: genId(), createdAt: new Date(), fileId: file ? file.id : null, - recipientId: recipient.id, + recipientId: recipientUser ? recipientUser.id : null, + groupId: recipientGroup ? recipientGroup.id : null, text: ps.text ? ps.text.trim() : null, userId: user.id, - isRead: false + isRead: false, + reads: [] as any[] } as MessagingMessage); const messageObj = await MessagingMessages.pack(message); - // 自分のストリーム - publishMessagingStream(message.userId, message.recipientId, 'message', messageObj); - publishMessagingIndexStream(message.userId, 'message', messageObj); - publishMainStream(message.userId, 'messagingMessage', messageObj); + if (recipientUser) { + // 自分のストリーム + publishMessagingStream(message.userId, recipientUser.id, 'message', messageObj); + publishMessagingIndexStream(message.userId, 'message', messageObj); + publishMainStream(message.userId, 'messagingMessage', messageObj); - // 相手のストリーム - publishMessagingStream(message.recipientId, message.userId, 'message', messageObj); - publishMessagingIndexStream(message.recipientId, 'message', messageObj); - publishMainStream(message.recipientId, 'messagingMessage', messageObj); + // 相手のストリーム + publishMessagingStream(recipientUser.id, message.userId, 'message', messageObj); + publishMessagingIndexStream(recipientUser.id, 'message', messageObj); + publishMainStream(recipientUser.id, 'messagingMessage', messageObj); + } else if (recipientGroup) { + // グループのストリーム + publishGroupMessagingStream(recipientGroup.id, 'message', messageObj); + + // メンバーのストリーム + const joinings = await UserGroupJoinings.find({ userGroupId: recipientGroup.id }); + for (const joining of joinings) { + publishMessagingIndexStream(joining.userId, 'message', messageObj); + publishMainStream(joining.userId, 'messagingMessage', messageObj); + } + } // 2秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する setTimeout(async () => { - const freshMessage = await MessagingMessages.findOne({ id: message.id }); + const freshMessage = await MessagingMessages.findOne(message.id); if (freshMessage == null) return; // メッセージが削除されている場合もある - if (!freshMessage.isRead) { + + if (recipientUser) { + if (freshMessage.isRead) return; // 既読 + //#region ただしミュートされているなら発行しない const mute = await Mutings.find({ - muterId: recipient.id, + muterId: recipientUser.id, }); const mutedUserIds = mute.map(m => m.muteeId.toString()); if (mutedUserIds.indexOf(user.id) != -1) { @@ -140,8 +202,15 @@ export default define(meta, async (ps, user) => { } //#endregion - publishMainStream(message.recipientId, 'unreadMessagingMessage', messageObj); - pushSw(message.recipientId, 'unreadMessagingMessage', messageObj); + publishMainStream(recipientUser.id, 'unreadMessagingMessage', messageObj); + pushSw(recipientUser.id, 'unreadMessagingMessage', messageObj); + } else if (recipientGroup) { + const joinings = await UserGroupJoinings.find({ userGroupId: recipientGroup.id, userId: Not(user.id) }); + for (const joining of joinings) { + if (freshMessage.reads.includes(joining.userId)) return; // 既読 + publishMainStream(joining.userId, 'unreadMessagingMessage', messageObj); + pushSw(joining.userId, 'unreadMessagingMessage', messageObj); + } } }, 2000); diff --git a/src/server/api/endpoints/messaging/messages/delete.ts b/src/server/api/endpoints/messaging/messages/delete.ts index 6a896cd8d..fb1bb42a5 100644 --- a/src/server/api/endpoints/messaging/messages/delete.ts +++ b/src/server/api/endpoints/messaging/messages/delete.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; import { ID } from '../../../../../misc/cafy-id'; import define from '../../../define'; -import { publishMessagingStream } from '../../../../../services/stream'; +import { publishMessagingStream, publishGroupMessagingStream } from '../../../../../services/stream'; import * as ms from 'ms'; import { ApiError } from '../../../error'; import { MessagingMessages } from '../../../../../models'; @@ -10,7 +10,7 @@ export const meta = { stability: 'stable', desc: { - 'ja-JP': '指定したメッセージを削除します。', + 'ja-JP': '指定したトークメッセージを削除します。', 'en-US': 'Delete a message.' }, @@ -57,6 +57,10 @@ export default define(meta, async (ps, user) => { await MessagingMessages.delete(message.id); - publishMessagingStream(message.userId, message.recipientId, 'deleted', message.id); - publishMessagingStream(message.recipientId, message.userId, 'deleted', message.id); + if (message.recipientId) { + publishMessagingStream(message.userId, message.recipientId, 'deleted', message.id); + publishMessagingStream(message.recipientId, message.userId, 'deleted', message.id); + } else if (message.groupId) { + publishGroupMessagingStream(message.groupId, 'deleted', message.id); + } }); diff --git a/src/server/api/endpoints/messaging/messages/read.ts b/src/server/api/endpoints/messaging/messages/read.ts index 50b7f3987..dd3449af1 100644 --- a/src/server/api/endpoints/messaging/messages/read.ts +++ b/src/server/api/endpoints/messaging/messages/read.ts @@ -1,13 +1,13 @@ import $ from 'cafy'; import { ID } from '../../../../../misc/cafy-id'; -import read from '../../../common/read-messaging-message'; import define from '../../../define'; import { ApiError } from '../../../error'; import { MessagingMessages } from '../../../../../models'; +import { readUserMessagingMessage, readGroupMessagingMessage } from '../../../common/read-messaging-message'; export const meta = { desc: { - 'ja-JP': '指定した自分宛てのメッセージを既読にします。', + 'ja-JP': '指定した自分宛てのトークメッセージを既読にします。', 'en-US': 'Mark as read a message of messaging.' }, @@ -39,12 +39,21 @@ export const meta = { export default define(meta, async (ps, user) => { const message = await MessagingMessages.findOne({ id: ps.messageId, - recipientId: user.id }); if (message == null) { throw new ApiError(meta.errors.noSuchMessage); } - read(user.id, message.userId, [message.id]); + if (message.recipientId) { + await readUserMessagingMessage(user.id, message.recipientId, [message.id]).catch(e => { + if (e.id === 'e140a4bf-49ce-4fb6-b67c-b78dadf6b52f') throw new ApiError(meta.errors.noSuchMessage); + throw e; + }); + } else if (message.groupId) { + await readGroupMessagingMessage(user.id, message.groupId, [message.id]).catch(e => { + if (e.id === '930a270c-714a-46b2-b776-ad27276dc569') throw new ApiError(meta.errors.noSuchMessage); + throw e; + }); + } }); diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 5667e7fbb..d18543f56 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -94,7 +94,7 @@ export const meta = { export default define(meta, async (ps, me) => { const instance = await fetchMeta(true); - const emojis = await Emojis.find({ host: null }); + const emojis = await Emojis.find({ where: { host: null }, cache: 3600000 }); // 1 hour const response: any = { maintainerName: instance.maintainerName, @@ -106,6 +106,9 @@ export default define(meta, async (ps, me) => { uri: config.url, description: instance.description, langs: instance.langs, + ToSUrl: instance.ToSUrl, + repositoryUrl: instance.repositoryUrl, + feedbackUrl: instance.feedbackUrl, secure: config.https != null, machine: os.hostname(), @@ -150,7 +153,7 @@ export default define(meta, async (ps, me) => { globalTimeLine: !instance.disableGlobalTimeline, elasticsearch: config.elasticsearch ? true : false, recaptcha: instance.enableRecaptcha, - objectStorage: config.drive && config.drive.storage === 'minio', + objectStorage: instance.useObjectStorage, twitter: instance.enableTwitterIntegration, github: instance.enableGithubIntegration, discord: instance.enableDiscordIntegration, @@ -162,6 +165,7 @@ export default define(meta, async (ps, me) => { response.useStarForReactionFallback = instance.useStarForReactionFallback; response.pinnedUsers = instance.pinnedUsers; response.hiddenTags = instance.hiddenTags; + response.blockedHosts = instance.blockedHosts; response.recaptchaSecretKey = instance.recaptchaSecretKey; response.proxyAccount = instance.proxyAccount; response.twitterConsumerKey = instance.twitterConsumerKey; @@ -178,6 +182,16 @@ export default define(meta, async (ps, me) => { response.smtpUser = instance.smtpUser; response.smtpPass = instance.smtpPass; response.swPrivateKey = instance.swPrivateKey; + response.useObjectStorage = instance.useObjectStorage; + response.objectStorageBaseUrl = instance.objectStorageBaseUrl; + response.objectStorageBucket = instance.objectStorageBucket; + response.objectStoragePrefix = instance.objectStoragePrefix; + response.objectStorageEndpoint = instance.objectStorageEndpoint; + response.objectStorageRegion = instance.objectStorageRegion; + response.objectStoragePort = instance.objectStoragePort; + response.objectStorageAccessKey = instance.objectStorageAccessKey; + response.objectStorageSecretKey = instance.objectStorageSecretKey; + response.objectStorageUseSSL = instance.objectStorageUseSSL; } return response; diff --git a/src/server/api/endpoints/notes/favorites/create.ts b/src/server/api/endpoints/notes/favorites/create.ts index bb0c9594b..e3a786fdb 100644 --- a/src/server/api/endpoints/notes/favorites/create.ts +++ b/src/server/api/endpoints/notes/favorites/create.ts @@ -14,7 +14,7 @@ export const meta = { 'en-US': 'Favorite a note.' }, - tags: ['favorites'], + tags: ['notes', 'favorites'], requireCredential: true, diff --git a/src/server/api/endpoints/notes/favorites/delete.ts b/src/server/api/endpoints/notes/favorites/delete.ts index 49f763177..eea35ef58 100644 --- a/src/server/api/endpoints/notes/favorites/delete.ts +++ b/src/server/api/endpoints/notes/favorites/delete.ts @@ -13,7 +13,7 @@ export const meta = { 'en-US': 'Unfavorite a note.' }, - tags: ['favorites'], + tags: ['notes', 'favorites'], requireCredential: true, diff --git a/src/server/api/endpoints/pages/like.ts b/src/server/api/endpoints/pages/like.ts new file mode 100644 index 000000000..5a50bd6c6 --- /dev/null +++ b/src/server/api/endpoints/pages/like.ts @@ -0,0 +1,79 @@ +import $ from 'cafy'; +import { ID } from '../../../../misc/cafy-id'; +import define from '../../define'; +import { ApiError } from '../../error'; +import { Pages, PageLikes } from '../../../../models'; +import { genId } from '../../../../misc/gen-id'; + +export const meta = { + desc: { + 'ja-JP': '指定したページを「いいね」します。', + }, + + tags: ['pages'], + + requireCredential: true, + + kind: 'write:page-likes', + + params: { + pageId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のページのID', + 'en-US': 'Target page ID.' + } + } + }, + + errors: { + noSuchPage: { + message: 'No such page.', + code: 'NO_SUCH_PAGE', + id: 'cc98a8a2-0dc3-4123-b198-62c71df18ed3' + }, + + yourPage: { + message: 'You cannot like your page.', + code: 'YOUR_PAGE', + id: '28800466-e6db-40f2-8fae-bf9e82aa92b8' + }, + + alreadyLiked: { + message: 'The page has already been liked.', + code: 'ALREADY_LIKED', + id: 'cc98a8a2-0dc3-4123-b198-62c71df18ed3' + }, + } +}; + +export default define(meta, async (ps, user) => { + const page = await Pages.findOne(ps.pageId); + if (page == null) { + throw new ApiError(meta.errors.noSuchPage); + } + + if (page.userId === user.id) { + throw new ApiError(meta.errors.yourPage); + } + + // if already liked + const exist = await PageLikes.findOne({ + pageId: page.id, + userId: user.id + }); + + if (exist != null) { + throw new ApiError(meta.errors.alreadyLiked); + } + + // Create like + await PageLikes.save({ + id: genId(), + createdAt: new Date(), + pageId: page.id, + userId: user.id + }); + + Pages.increment({ id: page.id }, 'likedCount', 1); +}); diff --git a/src/server/api/endpoints/pages/show.ts b/src/server/api/endpoints/pages/show.ts index dd1dc9f25..e3d6e6a15 100644 --- a/src/server/api/endpoints/pages/show.ts +++ b/src/server/api/endpoints/pages/show.ts @@ -70,5 +70,5 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.noSuchPage); } - return await Pages.pack(page); + return await Pages.pack(page, user); }); diff --git a/src/server/api/endpoints/pages/unlike.ts b/src/server/api/endpoints/pages/unlike.ts new file mode 100644 index 000000000..49ad999b3 --- /dev/null +++ b/src/server/api/endpoints/pages/unlike.ts @@ -0,0 +1,62 @@ +import $ from 'cafy'; +import { ID } from '../../../../misc/cafy-id'; +import define from '../../define'; +import { ApiError } from '../../error'; +import { Pages, PageLikes } from '../../../../models'; + +export const meta = { + desc: { + 'ja-JP': '指定したページの「いいね」を解除します。', + }, + + tags: ['pages'], + + requireCredential: true, + + kind: 'write:page-likes', + + params: { + pageId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のページのID', + 'en-US': 'Target page ID.' + } + } + }, + + errors: { + noSuchPage: { + message: 'No such page.', + code: 'NO_SUCH_PAGE', + id: 'a0d41e20-1993-40bd-890e-f6e560ae648e' + }, + + notLiked: { + message: 'You have not liked that page.', + code: 'NOT_LIKED', + id: 'f5e586b0-ce93-4050-b0e3-7f31af5259ee' + }, + } +}; + +export default define(meta, async (ps, user) => { + const page = await Pages.findOne(ps.pageId); + if (page == null) { + throw new ApiError(meta.errors.noSuchPage); + } + + const exist = await PageLikes.findOne({ + pageId: page.id, + userId: user.id + }); + + if (exist == null) { + throw new ApiError(meta.errors.notLiked); + } + + // Delete like + await PageLikes.delete(exist.id); + + Pages.decrement({ id: page.id }, 'likedCount', 1); +}); diff --git a/src/server/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts index f85109b4b..4dca62445 100644 --- a/src/server/api/endpoints/stats.ts +++ b/src/server/api/endpoints/stats.ts @@ -57,10 +57,10 @@ export default define(meta, async () => { driveUsageLocal, driveUsageRemote ] = await Promise.all([ - Notes.count(), - Notes.count({ userHost: null }), - Users.count(), - Users.count({ host: null }), + Notes.count({ cache: 3600000 }), // 1 hour + Notes.count({ where: { userHost: null }, cache: 3600000 }), + Users.count({ cache: 3600000 }), + Users.count({ where: { host: null }, cache: 3600000 }), federationChart.getChart('hour', 1).then(chart => chart.instance.total[0]), driveChart.getChart('hour', 1).then(chart => chart.local.totalSize[0]), driveChart.getChart('hour', 1).then(chart => chart.remote.totalSize[0]), diff --git a/src/server/api/endpoints/users/get-frequently-replied-users.ts b/src/server/api/endpoints/users/get-frequently-replied-users.ts index 420936c08..24d1bd194 100644 --- a/src/server/api/endpoints/users/get-frequently-replied-users.ts +++ b/src/server/api/endpoints/users/get-frequently-replied-users.ts @@ -4,7 +4,7 @@ import define from '../../define'; import { maximum } from '../../../../prelude/array'; import { ApiError } from '../../error'; import { getUser } from '../../common/getters'; -import { Not, In } from 'typeorm'; +import { Not, In, IsNull } from 'typeorm'; import { Notes, Users } from '../../../../models'; import { types, bool } from '../../../../misc/schema'; @@ -58,7 +58,7 @@ export default define(meta, async (ps, me) => { const recentNotes = await Notes.find({ where: { userId: user.id, - replyId: Not(null) + replyId: Not(IsNull()) }, order: { id: -1 diff --git a/src/server/api/endpoints/users/groups/create.ts b/src/server/api/endpoints/users/groups/create.ts new file mode 100644 index 000000000..ee6cade8d --- /dev/null +++ b/src/server/api/endpoints/users/groups/create.ts @@ -0,0 +1,51 @@ +import $ from 'cafy'; +import define from '../../../define'; +import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { genId } from '../../../../../misc/gen-id'; +import { UserGroup } from '../../../../../models/entities/user-group'; +import { types, bool } from '../../../../../misc/schema'; +import { UserGroupJoining } from '../../../../../models/entities/user-group-joining'; + +export const meta = { + desc: { + 'ja-JP': 'ユーザーグループを作成します。', + 'en-US': 'Create a user group.' + }, + + tags: ['groups'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + name: { + validator: $.str.range(1, 100) + } + }, + + res: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + }, +}; + +export default define(meta, async (ps, user) => { + const userGroup = await UserGroups.save({ + id: genId(), + createdAt: new Date(), + userId: user.id, + name: ps.name, + } as UserGroup); + + // Push the owner + await UserGroupJoinings.save({ + id: genId(), + createdAt: new Date(), + userId: user.id, + userGroupId: userGroup.id + } as UserGroupJoining); + + return await UserGroups.pack(userGroup); +}); diff --git a/src/server/api/endpoints/users/groups/delete.ts b/src/server/api/endpoints/users/groups/delete.ts new file mode 100644 index 000000000..4f89c324a --- /dev/null +++ b/src/server/api/endpoints/users/groups/delete.ts @@ -0,0 +1,49 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { UserGroups } from '../../../../../models'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループを削除します。', + 'en-US': 'Delete a user group' + }, + + tags: ['groups'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象となるユーザーグループのID', + 'en-US': 'ID of target user group' + } + } + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '63dbd64c-cd77-413f-8e08-61781e210b38' + } + } +}; + +export default define(meta, async (ps, user) => { + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: user.id + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + await UserGroups.delete(userGroup.id); +}); diff --git a/src/server/api/endpoints/users/groups/invitations/accept.ts b/src/server/api/endpoints/users/groups/invitations/accept.ts new file mode 100644 index 000000000..33779dd34 --- /dev/null +++ b/src/server/api/endpoints/users/groups/invitations/accept.ts @@ -0,0 +1,63 @@ +import $ from 'cafy'; +import { ID } from '../../../../../../misc/cafy-id'; +import define from '../../../../define'; +import { ApiError } from '../../../../error'; +import { UserGroupJoinings, UserGroupInvites } from '../../../../../../models'; +import { genId } from '../../../../../../misc/gen-id'; +import { UserGroupJoining } from '../../../../../../models/entities/user-group-joining'; + +export const meta = { + desc: { + 'ja-JP': 'ユーザーグループへの招待を承認します。', + 'en-US': 'Accept invite of a user group.' + }, + + tags: ['groups', 'users'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + inviteId: { + validator: $.type(ID), + desc: { + 'ja-JP': '招待ID', + 'en-US': 'The invite ID' + } + }, + }, + + errors: { + noSuchInvitation: { + message: 'No such invitation.', + code: 'NO_SUCH_INVITATION', + id: '98c11eca-c890-4f42-9806-c8c8303ebb5e' + }, + } +}; + +export default define(meta, async (ps, user) => { + // Fetch the invitation + const invite = await UserGroupInvites.findOne({ + id: ps.inviteId, + }); + + if (invite == null) { + throw new ApiError(meta.errors.noSuchInvitation); + } + + if (invite.userId !== user.id) { + throw new ApiError(meta.errors.noSuchInvitation); + } + + // Push the user + await UserGroupJoinings.save({ + id: genId(), + createdAt: new Date(), + userId: user.id, + userGroupId: invite.userGroupId + } as UserGroupJoining); + + UserGroupInvites.delete(invite.id); +}); diff --git a/src/server/api/endpoints/users/groups/invitations/reject.ts b/src/server/api/endpoints/users/groups/invitations/reject.ts new file mode 100644 index 000000000..e9e7bc8b4 --- /dev/null +++ b/src/server/api/endpoints/users/groups/invitations/reject.ts @@ -0,0 +1,53 @@ +import $ from 'cafy'; +import { ID } from '../../../../../../misc/cafy-id'; +import define from '../../../../define'; +import { ApiError } from '../../../../error'; +import { UserGroupInvites } from '../../../../../../models'; + +export const meta = { + desc: { + 'ja-JP': 'ユーザーグループへの招待を拒否します。', + 'en-US': 'Reject invite of a user group.' + }, + + tags: ['groups', 'users'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + inviteId: { + validator: $.type(ID), + desc: { + 'ja-JP': '招待ID', + 'en-US': 'The invite ID' + } + }, + }, + + errors: { + noSuchInvitation: { + message: 'No such invitation.', + code: 'NO_SUCH_INVITATION', + id: 'ad7471d4-2cd9-44b4-ac68-e7136b4ce656' + }, + } +}; + +export default define(meta, async (ps, user) => { + // Fetch the invitation + const invite = await UserGroupInvites.findOne({ + id: ps.inviteId, + }); + + if (invite == null) { + throw new ApiError(meta.errors.noSuchInvitation); + } + + if (invite.userId !== user.id) { + throw new ApiError(meta.errors.noSuchInvitation); + } + + await UserGroupInvites.delete(invite.id); +}); diff --git a/src/server/api/endpoints/users/groups/invite.ts b/src/server/api/endpoints/users/groups/invite.ts new file mode 100644 index 000000000..503184a92 --- /dev/null +++ b/src/server/api/endpoints/users/groups/invite.ts @@ -0,0 +1,104 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; +import { UserGroups, UserGroupJoinings, UserGroupInvites } from '../../../../../models'; +import { genId } from '../../../../../misc/gen-id'; +import { UserGroupInvite } from '../../../../../models/entities/user-group-invite'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループに指定したユーザーを招待します。', + 'en-US': 'Invite a user to a user group.' + }, + + tags: ['groups', 'users'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + }, + + userId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }, + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '583f8bc0-8eee-4b78-9299-1e14fc91e409' + }, + + noSuchUser: { + message: 'No such user.', + code: 'NO_SUCH_USER', + id: 'da52de61-002c-475b-90e1-ba64f9cf13a8' + }, + + alreadyAdded: { + message: 'That user has already been added to that group.', + code: 'ALREADY_ADDED', + id: '7e35c6a0-39b2-4488-aea6-6ee20bd5da2c' + }, + + alreadyInvited: { + message: 'That user has already been invited to that group.', + code: 'ALREADY_INVITED', + id: 'ee0f58b4-b529-4d13-b761-b9a3e69f97e6' + } + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: me.id, + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + // Fetch the user + const user = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + + const joining = await UserGroupJoinings.findOne({ + userGroupId: userGroup.id, + userId: user.id + }); + + if (joining) { + throw new ApiError(meta.errors.alreadyAdded); + } + + const invite = await UserGroupInvites.findOne({ + userGroupId: userGroup.id, + userId: user.id + }); + + if (invite) { + throw new ApiError(meta.errors.alreadyInvited); + } + + await UserGroupInvites.save({ + id: genId(), + createdAt: new Date(), + userId: user.id, + userGroupId: userGroup.id + } as UserGroupInvite); +}); diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts new file mode 100644 index 000000000..97d168e52 --- /dev/null +++ b/src/server/api/endpoints/users/groups/joined.ts @@ -0,0 +1,41 @@ +import define from '../../../define'; +import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; +import { Not, In } from 'typeorm'; + +export const meta = { + desc: { + 'ja-JP': '自分の所属するユーザーグループ一覧を取得します。' + }, + + tags: ['groups', 'account'], + + requireCredential: true, + + kind: 'read:user-groups', + + res: { + type: types.array, + optional: bool.false, nullable: bool.false, + items: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + } + }, +}; + +export default define(meta, async (ps, me) => { + const ownedGroups = await UserGroups.find({ + userId: me.id, + }); + + const joinings = await UserGroupJoinings.find({ + userId: me.id, + ...(ownedGroups.length > 0 ? { + userGroupId: Not(In(ownedGroups.map(x => x.id))) + } : {}) + }); + + return await Promise.all(joinings.map(x => UserGroups.pack(x.userGroupId))); +}); diff --git a/src/server/api/endpoints/users/groups/owned.ts b/src/server/api/endpoints/users/groups/owned.ts new file mode 100644 index 000000000..6cf39a142 --- /dev/null +++ b/src/server/api/endpoints/users/groups/owned.ts @@ -0,0 +1,33 @@ +import define from '../../../define'; +import { UserGroups } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; + +export const meta = { + desc: { + 'ja-JP': '自分の作成したユーザーグループ一覧を取得します。' + }, + + tags: ['groups', 'account'], + + requireCredential: true, + + kind: 'read:user-groups', + + res: { + type: types.array, + optional: bool.false, nullable: bool.false, + items: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + } + }, +}; + +export default define(meta, async (ps, me) => { + const userGroups = await UserGroups.find({ + userId: me.id, + }); + + return await Promise.all(userGroups.map(x => UserGroups.pack(x))); +}); diff --git a/src/server/api/endpoints/users/groups/pull.ts b/src/server/api/endpoints/users/groups/pull.ts new file mode 100644 index 000000000..3943560d7 --- /dev/null +++ b/src/server/api/endpoints/users/groups/pull.ts @@ -0,0 +1,78 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; +import { UserGroups, UserGroupJoinings } from '../../../../../models'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループから指定したユーザーを削除します。', + 'en-US': 'Remove a user to a user group.' + }, + + tags: ['groups', 'users'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + }, + + userId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }, + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '4662487c-05b1-4b78-86e5-fd46998aba74' + }, + + noSuchUser: { + message: 'No such user.', + code: 'NO_SUCH_USER', + id: '0b5cc374-3681-41da-861e-8bc1146f7a55' + }, + + isOwner: { + message: 'The user is the owner.', + code: 'IS_OWNER', + id: '1546eed5-4414-4dea-81c1-b0aec4f6d2af' + }, + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: me.id, + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + // Fetch the user + const user = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + + if (user.id === userGroup.userId) { + throw new ApiError(meta.errors.isOwner); + } + + // Pull the user + await UserGroupJoinings.delete({ userId: user.id }); +}); diff --git a/src/server/api/endpoints/users/groups/show.ts b/src/server/api/endpoints/users/groups/show.ts new file mode 100644 index 000000000..4f8374a22 --- /dev/null +++ b/src/server/api/endpoints/users/groups/show.ts @@ -0,0 +1,61 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループの情報を取得します。', + 'en-US': 'Show a user group.' + }, + + tags: ['groups', 'account'], + + requireCredential: true, + + kind: 'read:user-groups', + + params: { + groupId: { + validator: $.type(ID), + }, + }, + + res: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: 'ea04751e-9b7e-487b-a509-330fb6bd6b9b' + }, + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + const joining = await UserGroupJoinings.findOne({ + userId: me.id, + userGroupId: userGroup.id + }); + + if (joining == null && userGroup.userId !== me.id) { + throw new ApiError(meta.errors.noSuchGroup); + } + + return await UserGroups.pack(userGroup); +}); diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts new file mode 100644 index 000000000..b4284ab48 --- /dev/null +++ b/src/server/api/endpoints/users/groups/transfer.ts @@ -0,0 +1,93 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; +import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループを指定したユーザーグループ内のユーザーに譲渡します。', + 'en-US': 'Transfer user group ownership to another user in group.' + }, + + tags: ['groups', 'users'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + }, + + userId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }, + }, + + res: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '8e31d36b-2f88-4ccd-a438-e2d78a9162db' + }, + + noSuchUser: { + message: 'No such user.', + code: 'NO_SUCH_USER', + id: '711f7ebb-bbb9-4dfa-b540-b27809fed5e9' + }, + + noSuchGroupMember: { + message: 'No such group member.', + code: 'NO_SUCH_GROUP_MEMBER', + id: 'd31bebee-196d-42c2-9a3e-9474d4be6cc4' + }, + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: me.id, + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + // Fetch the user + const user = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + + const joining = await UserGroupJoinings.findOne({ + userGroupId: userGroup.id, + userId: user.id + }); + + if (joining == null) { + throw new ApiError(meta.errors.noSuchGroupMember); + } + + await UserGroups.update(userGroup.id, { + userId: ps.userId + }); + + return await UserGroups.pack(userGroup.id); +}); diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts new file mode 100644 index 000000000..bc974621a --- /dev/null +++ b/src/server/api/endpoints/users/groups/update.ts @@ -0,0 +1,69 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { UserGroups } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループを更新します。', + 'en-US': 'Update a user group' + }, + + tags: ['groups'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象となるユーザーグループのID', + 'en-US': 'ID of target user group' + } + }, + + name: { + validator: $.str.range(1, 100), + desc: { + 'ja-JP': 'このユーザーグループの名前', + 'en-US': 'name of this user group' + } + } + }, + + res: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '9081cda3-7a9e-4fac-a6ce-908d70f282f6' + }, + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: me.id + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + await UserGroups.update(userGroup.id, { + name: ps.name + }); + + return await UserGroups.pack(userGroup.id); +}); diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts index 2763b3a19..bdc840308 100644 --- a/src/server/api/endpoints/users/lists/push.ts +++ b/src/server/api/endpoints/users/lists/push.ts @@ -80,5 +80,5 @@ export default define(meta, async (ps, me) => { } // Push the user - pushUserToUserList(user, userList); + await pushUserToUserList(user, userList); }); diff --git a/src/server/api/kinds.ts b/src/server/api/kinds.ts index 99c379558..be3c30f7d 100644 --- a/src/server/api/kinds.ts +++ b/src/server/api/kinds.ts @@ -21,4 +21,8 @@ export const kinds = [ 'write:votes', 'read:pages', 'write:pages', + 'write:page-likes', + 'read:page-likes', + 'read:user-groups', + 'write:user-groups', ]; diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts index 628bba511..0a49607f0 100644 --- a/src/server/api/openapi/schemas.ts +++ b/src/server/api/openapi/schemas.ts @@ -13,6 +13,8 @@ import { packedBlockingSchema } from '../../../models/repositories/blocking'; import { packedNoteReactionSchema } from '../../../models/repositories/note-reaction'; import { packedHashtagSchema } from '../../../models/repositories/hashtag'; import { packedPageSchema } from '../../../models/repositories/page'; +import { packedUserGroupSchema } from '../../../models/repositories/user-group'; +import { packedNoteFavoriteSchema } from '../../../models/repositories/note-favorite'; export function convertSchemaToOpenApiSchema(schema: Schema) { const res: any = schema; @@ -66,16 +68,18 @@ export const schemas = { User: convertSchemaToOpenApiSchema(packedUserSchema), UserList: convertSchemaToOpenApiSchema(packedUserListSchema), + UserGroup: convertSchemaToOpenApiSchema(packedUserGroupSchema), App: convertSchemaToOpenApiSchema(packedAppSchema), MessagingMessage: convertSchemaToOpenApiSchema(packedMessagingMessageSchema), Note: convertSchemaToOpenApiSchema(packedNoteSchema), + NoteReaction: convertSchemaToOpenApiSchema(packedNoteReactionSchema), + NoteFavorite: convertSchemaToOpenApiSchema(packedNoteFavoriteSchema), Notification: convertSchemaToOpenApiSchema(packedNotificationSchema), DriveFile: convertSchemaToOpenApiSchema(packedDriveFileSchema), DriveFolder: convertSchemaToOpenApiSchema(packedDriveFolderSchema), Following: convertSchemaToOpenApiSchema(packedFollowingSchema), Muting: convertSchemaToOpenApiSchema(packedMutingSchema), Blocking: convertSchemaToOpenApiSchema(packedBlockingSchema), - NoteReaction: convertSchemaToOpenApiSchema(packedNoteReactionSchema), Hashtag: convertSchemaToOpenApiSchema(packedHashtagSchema), Page: convertSchemaToOpenApiSchema(packedPageSchema), }; diff --git a/src/server/api/stream/channels/messaging.ts b/src/server/api/stream/channels/messaging.ts index ce766e28e..1e5e94c1c 100644 --- a/src/server/api/stream/channels/messaging.ts +++ b/src/server/api/stream/channels/messaging.ts @@ -1,20 +1,39 @@ import autobind from 'autobind-decorator'; -import read from '../../common/read-messaging-message'; +import { readUserMessagingMessage, readGroupMessagingMessage } from '../../common/read-messaging-message'; import Channel from '../channel'; +import { UserGroupJoinings } from '../../../../models'; export default class extends Channel { public readonly chName = 'messaging'; public static shouldShare = false; public static requireCredential = true; - private otherpartyId: string; + private otherpartyId: string | null; + private groupId: string | null; @autobind public async init(params: any) { this.otherpartyId = params.otherparty as string; + this.groupId = params.group as string; + + // Check joining + if (this.groupId) { + const joining = await UserGroupJoinings.findOne({ + userId: this.user!.id, + userGroupId: this.groupId + }); + + if (joining == null) { + return; + } + } + + const subCh = this.otherpartyId + ? `messagingStream:${this.user!.id}-${this.otherpartyId}` + : `messagingStream:${this.groupId}`; // Subscribe messaging stream - this.subscriber.on(`messagingStream:${this.user!.id}-${this.otherpartyId}`, data => { + this.subscriber.on(subCh, data => { this.send(data); }); } @@ -23,7 +42,11 @@ export default class extends Channel { public onMessage(type: string, body: any) { switch (type) { case 'read': - read(this.user!.id, this.otherpartyId, [body.id]); + if (this.otherpartyId) { + readUserMessagingMessage(this.user!.id, this.otherpartyId, [body.id]); + } else if (this.groupId) { + readGroupMessagingMessage(this.user!.id, this.groupId, [body.id]); + } break; } } diff --git a/src/server/nodeinfo.ts b/src/server/nodeinfo.ts index d3ad90fab..da1e4e7b5 100644 --- a/src/server/nodeinfo.ts +++ b/src/server/nodeinfo.ts @@ -26,6 +26,9 @@ const nodeinfo2 = async () => { maintainerName, maintainerEmail, langs, + ToSUrl, + repositoryUrl, + feedbackUrl, announcements, disableRegistration, disableLocalTimeline, @@ -77,6 +80,9 @@ const nodeinfo2 = async () => { email: maintainerEmail }, langs, + ToSUrl, + repositoryUrl, + feedbackUrl, announcements, disableRegistration, disableLocalTimeline, diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index 357715bb9..e16665f6c 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as Koa from 'koa'; import { serverLogger } from '..'; -import { IImage, ConvertToPng, ConvertToJpeg } from '../../services/drive/image-processor'; +import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor'; import { createTemp } from '../../misc/create-temp'; import { downloadUrl } from '../../misc/donwload-url'; import { detectMine } from '../../misc/detect-mine'; @@ -20,9 +20,9 @@ export async function proxyMedia(ctx: Koa.BaseContext) { let image: IImage; if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) { - image = await ConvertToPng(path, 498, 280); + image = await convertToPng(path, 498, 280); } else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif'].includes(type)) { - image = await ConvertToJpeg(path, 200, 200); + image = await convertToJpeg(path, 200, 200); } else { image = { data: fs.readFileSync(path), diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 983c731a0..0580e959f 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -26,6 +26,9 @@ block meta meta(name='twitter:card' content='summary') // todo + if user.host + meta(name='robots' content='noindex') + if user.twitter meta(name='twitter:creator' content=`@${user.twitter.screenName}`) diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index bff98ba80..9b257afb7 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -24,6 +24,9 @@ block meta meta(name='twitter:card' content='summary') + if user.host + meta(name='robots' content='noindex') + if profile.twitter meta(name='twitter:creator' content=`@${profile.twitter.screenName}`) diff --git a/src/services/chart/charts/classes/drive.ts b/src/services/chart/charts/classes/drive.ts index ae52df19a..c3bcacb7d 100644 --- a/src/services/chart/charts/classes/drive.ts +++ b/src/services/chart/charts/classes/drive.ts @@ -2,7 +2,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { SchemaType } from '../../../../misc/schema'; import { DriveFiles } from '../../../../models'; -import { Not } from 'typeorm'; +import { Not, IsNull } from 'typeorm'; import { DriveFile } from '../../../../models/entities/drive-file'; import { name, schema } from '../schemas/drive'; @@ -31,7 +31,7 @@ export default class DriveChart extends Chart { protected async fetchActual(): Promise> { const [localCount, remoteCount, localSize, remoteSize] = await Promise.all([ DriveFiles.count({ userHost: null }), - DriveFiles.count({ userHost: Not(null) }), + DriveFiles.count({ userHost: Not(IsNull()) }), DriveFiles.clacDriveUsageOfLocal(), DriveFiles.clacDriveUsageOfRemote() ]); diff --git a/src/services/chart/charts/classes/notes.ts b/src/services/chart/charts/classes/notes.ts index 85ccf000d..815061c44 100644 --- a/src/services/chart/charts/classes/notes.ts +++ b/src/services/chart/charts/classes/notes.ts @@ -2,7 +2,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { SchemaType } from '../../../../misc/schema'; import { Notes } from '../../../../models'; -import { Not } from 'typeorm'; +import { Not, IsNull } from 'typeorm'; import { Note } from '../../../../models/entities/note'; import { name, schema } from '../schemas/notes'; @@ -29,7 +29,7 @@ export default class NotesChart extends Chart { protected async fetchActual(): Promise> { const [localCount, remoteCount] = await Promise.all([ Notes.count({ userHost: null }), - Notes.count({ userHost: Not(null) }) + Notes.count({ userHost: Not(IsNull()) }) ]); return { diff --git a/src/services/chart/charts/classes/per-user-following.ts b/src/services/chart/charts/classes/per-user-following.ts index f3809a7c9..8295c0cb0 100644 --- a/src/services/chart/charts/classes/per-user-following.ts +++ b/src/services/chart/charts/classes/per-user-following.ts @@ -2,7 +2,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { SchemaType } from '../../../../misc/schema'; import { Followings, Users } from '../../../../models'; -import { Not } from 'typeorm'; +import { Not, IsNull } from 'typeorm'; import { User } from '../../../../models/entities/user'; import { name, schema } from '../schemas/per-user-following'; @@ -45,8 +45,8 @@ export default class PerUserFollowingChart extends Chart { ] = await Promise.all([ Followings.count({ followerId: group, followeeHost: null }), Followings.count({ followeeId: group, followerHost: null }), - Followings.count({ followerId: group, followeeHost: Not(null) }), - Followings.count({ followeeId: group, followerHost: Not(null) }) + Followings.count({ followerId: group, followeeHost: Not(IsNull()) }), + Followings.count({ followeeId: group, followerHost: Not(IsNull()) }) ]); return { diff --git a/src/services/chart/charts/classes/users.ts b/src/services/chart/charts/classes/users.ts index eec30de8d..47e4caa1b 100644 --- a/src/services/chart/charts/classes/users.ts +++ b/src/services/chart/charts/classes/users.ts @@ -2,7 +2,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { SchemaType } from '../../../../misc/schema'; import { Users } from '../../../../models'; -import { Not } from 'typeorm'; +import { Not, IsNull } from 'typeorm'; import { User } from '../../../../models/entities/user'; import { name, schema } from '../schemas/users'; @@ -29,7 +29,7 @@ export default class UsersChart extends Chart { protected async fetchActual(): Promise> { const [localCount, remoteCount] = await Promise.all([ Users.count({ host: null }), - Users.count({ host: Not(null) }) + Users.count({ host: Not(IsNull()) }) ]); return { diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index c67ee475a..d21c67d18 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -7,12 +7,11 @@ import * as uuid from 'uuid'; import * as sharp from 'sharp'; import { publishMainStream, publishDriveStream } from '../stream'; -import delFile from './delete-file'; -import config from '../../config'; +import { deleteFile } from './delete-file'; import { fetchMeta } from '../../misc/fetch-meta'; import { GenerateVideoThumbnail } from './generate-video-thumbnail'; import { driveLogger } from './logger'; -import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor'; +import { IImage, convertToJpeg, convertToWebp, convertToPng, convertToGif, convertToApng } from './image-processor'; import { contentDisposition } from '../../misc/content-disposition'; import { detectMine } from '../../misc/detect-mine'; import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '../../models'; @@ -37,7 +36,9 @@ async function save(file: DriveFile, path: string, name: string, type: string, h // thunbnail, webpublic を必要なら生成 const alts = await generateAlts(path, type, !file.uri); - if (config.drive && config.drive.storage == 'minio') { + const meta = await fetchMeta(); + + if (meta.useObjectStorage) { //#region ObjectStorage params let [ext] = (name.match(/\.([a-zA-Z0-9_-]+)$/) || ['']); @@ -47,11 +48,11 @@ async function save(file: DriveFile, path: string, name: string, type: string, h if (type === 'image/webp') ext = '.webp'; } - const baseUrl = config.drive.baseUrl - || `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`; + const baseUrl = meta.objectStorageBaseUrl + || `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`; // for original - const key = `${config.drive.prefix}/${uuid.v4()}${ext}`; + const key = `${meta.objectStoragePrefix}/${uuid.v4()}${ext}`; const url = `${ baseUrl }/${ key }`; // for alts @@ -68,7 +69,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h ]; if (alts.webpublic) { - webpublicKey = `${config.drive.prefix}/${uuid.v4()}.${alts.webpublic.ext}`; + webpublicKey = `${meta.objectStoragePrefix}/${uuid.v4()}.${alts.webpublic.ext}`; webpublicUrl = `${ baseUrl }/${ webpublicKey }`; logger.info(`uploading webpublic: ${webpublicKey}`); @@ -76,7 +77,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h } if (alts.thumbnail) { - thumbnailKey = `${config.drive.prefix}/${uuid.v4()}.${alts.thumbnail.ext}`; + thumbnailKey = `${meta.objectStoragePrefix}/${uuid.v4()}.${alts.thumbnail.ext}`; thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`; logger.info(`uploading thumbnail: ${thumbnailKey}`); @@ -149,11 +150,15 @@ export async function generateAlts(path: string, type: string, generateWeb: bool logger.info(`creating web image`); if (['image/jpeg'].includes(type)) { - webpublic = await ConvertToJpeg(path, 2048, 2048); + webpublic = await convertToJpeg(path, 2048, 2048); } else if (['image/webp'].includes(type)) { - webpublic = await ConvertToWebp(path, 2048, 2048); + webpublic = await convertToWebp(path, 2048, 2048); } else if (['image/png'].includes(type)) { - webpublic = await ConvertToPng(path, 2048, 2048); + webpublic = await convertToPng(path, 2048, 2048); + } else if (['image/apng', 'image/vnd.mozilla.apng'].includes(type)) { + webpublic = await convertToApng(path); + } else if (['image/gif'].includes(type)) { + webpublic = await convertToGif(path); } else { logger.info(`web image not created (not an image)`); } @@ -166,9 +171,11 @@ export async function generateAlts(path: string, type: string, generateWeb: bool let thumbnail: IImage | null = null; if (['image/jpeg', 'image/webp'].includes(type)) { - thumbnail = await ConvertToJpeg(path, 498, 280); + thumbnail = await convertToJpeg(path, 498, 280); } else if (['image/png'].includes(type)) { - thumbnail = await ConvertToPng(path, 498, 280); + thumbnail = await convertToPng(path, 498, 280); + } else if (['image/gif'].includes(type)) { + thumbnail = await convertToGif(path); } else if (type.startsWith('video/')) { try { thumbnail = await GenerateVideoThumbnail(path); @@ -188,7 +195,16 @@ export async function generateAlts(path: string, type: string, generateWeb: bool * Upload to ObjectStorage */ async function upload(key: string, stream: fs.ReadStream | Buffer, type: string, filename?: string) { - const minio = new Minio.Client(config.drive!.config); + const meta = await fetchMeta(); + + const minio = new Minio.Client({ + endPoint: meta.objectStorageEndpoint!, + region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined, + port: meta.objectStoragePort ? meta.objectStoragePort : undefined, + useSSL: meta.objectStorageUseSSL, + accessKey: meta.objectStorageAccessKey!, + secretKey: meta.objectStorageSecretKey!, + }); const metadata = { 'Content-Type': type, @@ -197,7 +213,7 @@ async function upload(key: string, stream: fs.ReadStream | Buffer, type: string, if (filename) metadata['Content-Disposition'] = contentDisposition('inline', filename); - await minio.putObject(config.drive!.bucket!, key, stream, undefined, metadata); + await minio.putObject(meta.objectStorageBucket!, key, stream, undefined, metadata); } async function deleteOldFile(user: IRemoteUser) { @@ -217,7 +233,7 @@ async function deleteOldFile(user: IRemoteUser) { const oldFile = await q.getOne(); if (oldFile) { - delFile(oldFile, true); + deleteFile(oldFile, true); } } diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index f1280822a..258c0853f 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -1,11 +1,10 @@ -import * as Minio from 'minio'; -import config from '../../config'; import { DriveFile } from '../../models/entities/drive-file'; import { InternalStorage } from './internal-storage'; import { DriveFiles, Instances, Notes } from '../../models'; import { driveChart, perUserDriveChart, instanceChart } from '../chart'; +import { createDeleteObjectStorageFileJob } from '../../queue'; -export default async function(file: DriveFile, isExpired = false) { +export async function deleteFile(file: DriveFile, isExpired = false) { if (file.storedInternal) { InternalStorage.del(file.accessKey!); @@ -17,16 +16,14 @@ export default async function(file: DriveFile, isExpired = false) { InternalStorage.del(file.webpublicAccessKey!); } } else if (!file.isLink) { - const minio = new Minio.Client(config.drive!.config); - - await minio.removeObject(config.drive!.bucket!, file.accessKey!); + createDeleteObjectStorageFileJob(file.accessKey!); if (file.thumbnailUrl) { - await minio.removeObject(config.drive!.bucket!, file.thumbnailAccessKey!); + createDeleteObjectStorageFileJob(file.thumbnailAccessKey!); } if (file.webpublicUrl) { - await minio.removeObject(config.drive!.bucket!, file.webpublicAccessKey!); + createDeleteObjectStorageFileJob(file.webpublicAccessKey!); } } @@ -35,8 +32,8 @@ export default async function(file: DriveFile, isExpired = false) { DriveFiles.update(file.id, { isLink: true, url: file.uri, - thumbnailUrl: null, - webpublicUrl: null + thumbnailUrl: file.uri, + webpublicUrl: file.uri }); } else { DriveFiles.delete(file.id); diff --git a/src/services/drive/generate-video-thumbnail.ts b/src/services/drive/generate-video-thumbnail.ts index 5d7efff27..c2646182d 100644 --- a/src/services/drive/generate-video-thumbnail.ts +++ b/src/services/drive/generate-video-thumbnail.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as tmp from 'tmp'; -import { IImage, ConvertToJpeg } from './image-processor'; +import { IImage, convertToJpeg } from './image-processor'; const ThumbnailGenerator = require('video-thumbnail-generator').default; export async function GenerateVideoThumbnail(path: string): Promise { @@ -23,7 +23,7 @@ export async function GenerateVideoThumbnail(path: string): Promise { const outPath = `${outDir}/output.png`; - const thumbnail = await ConvertToJpeg(outPath, 498, 280); + const thumbnail = await convertToJpeg(outPath, 498, 280); // cleanup fs.unlinkSync(outPath); diff --git a/src/services/drive/image-processor.ts b/src/services/drive/image-processor.ts index 89ac331ca..4b8db0e0c 100644 --- a/src/services/drive/image-processor.ts +++ b/src/services/drive/image-processor.ts @@ -1,4 +1,5 @@ import * as sharp from 'sharp'; +import * as fs from 'fs'; export type IImage = { data: Buffer; @@ -10,7 +11,7 @@ export type IImage = { * Convert to JPEG * with resize, remove metadata, resolve orientation, stop animation */ -export async function ConvertToJpeg(path: string, width: number, height: number): Promise { +export async function convertToJpeg(path: string, width: number, height: number): Promise { const data = await sharp(path) .resize(width, height, { fit: 'inside', @@ -34,7 +35,7 @@ export async function ConvertToJpeg(path: string, width: number, height: number) * Convert to WebP * with resize, remove metadata, resolve orientation, stop animation */ -export async function ConvertToWebp(path: string, width: number, height: number): Promise { +export async function convertToWebp(path: string, width: number, height: number): Promise { const data = await sharp(path) .resize(width, height, { fit: 'inside', @@ -57,7 +58,7 @@ export async function ConvertToWebp(path: string, width: number, height: number) * Convert to PNG * with resize, remove metadata, resolve orientation, stop animation */ -export async function ConvertToPng(path: string, width: number, height: number): Promise { +export async function convertToPng(path: string, width: number, height: number): Promise { const data = await sharp(path) .resize(width, height, { fit: 'inside', @@ -73,3 +74,29 @@ export async function ConvertToPng(path: string, width: number, height: number): type: 'image/png' }; } + +/** + * Convert to GIF (Actually just NOP) + */ +export async function convertToGif(path: string): Promise { + const data = await fs.promises.readFile(path); + + return { + data, + ext: 'gif', + type: 'image/gif' + }; +} + +/** + * Convert to APNG (Actually just NOP) + */ +export async function convertToApng(path: string): Promise { + const data = await fs.promises.readFile(path); + + return { + data, + ext: 'apng', + type: 'image/apng' + }; +} diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index c03c742ee..95776f728 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -8,7 +8,6 @@ import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; import { User } from '../../models/entities/user'; import { Note } from '../../models/entities/note'; import { Notes, Users, Followings, Instances } from '../../models'; -import { Not } from 'typeorm'; import { notesChart, perUserNotesChart, instanceChart } from '../chart'; /** @@ -38,13 +37,21 @@ export default async function(user: User, note: Note, quiet = false) { if (Users.isLocalUser(user)) { const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note.id}`), user)); - const followings = await Followings.find({ - followeeId: user.id, - followerHost: Not(null) + const queue: string[] = []; + + const followers = await Followings.find({ + followeeId: note.userId }); - for (const following of followings) { - deliver(user, content, following.followerInbox); + for (const following of followers) { + if (Followings.isRemoteFollower(following)) { + const inbox = following.followerSharedInbox || following.followerInbox; + if (!queue.includes(inbox)) queue.push(inbox); + } + } + + for (const inbox of queue) { + deliver(user as any, content, inbox); } } //#endregion diff --git a/src/services/send-email.ts b/src/services/send-email.ts new file mode 100644 index 000000000..8818c5fcd --- /dev/null +++ b/src/services/send-email.ts @@ -0,0 +1,36 @@ +import * as nodemailer from 'nodemailer'; +import { fetchMeta } from '../misc/fetch-meta'; +import Logger from './logger'; + +export const logger = new Logger('email'); + +export async function sendEmail(to: string, subject: string, text: string) { + const meta = await fetchMeta(true); + + const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; + + const transporter = nodemailer.createTransport({ + host: meta.smtpHost, + port: meta.smtpPort, + secure: meta.smtpSecure, + ignoreTLS: !enableAuth, + auth: enableAuth ? { + user: meta.smtpUser, + pass: meta.smtpPass + } : undefined + } as any); + + try { + const info = await transporter.sendMail({ + from: meta.email!, + to: to, + subject: subject || 'Misskey', + text: text + }); + + logger.info('Message sent: %s', info.messageId); + } catch (e) { + logger.error(e); + throw e; + } +} diff --git a/src/services/stream.ts b/src/services/stream.ts index 28cb2057e..a47798eef 100644 --- a/src/services/stream.ts +++ b/src/services/stream.ts @@ -3,6 +3,7 @@ import { User } from '../models/entities/user'; import { Note } from '../models/entities/note'; import { UserList } from '../models/entities/user-list'; import { ReversiGame } from '../models/entities/games/reversi/game'; +import { UserGroup } from '../models/entities/user-group'; class Publisher { private publish = (channel: string, type: string | null, value?: any): void => { @@ -39,6 +40,10 @@ class Publisher { this.publish(`messagingStream:${userId}-${otherpartyId}`, type, typeof value === 'undefined' ? null : value); } + public publishGroupMessagingStream = (groupId: UserGroup['id'], type: string, value?: any): void => { + this.publish(`messagingStream:${groupId}`, type, typeof value === 'undefined' ? null : value); + } + public publishMessagingIndexStream = (userId: User['id'], type: string, value?: any): void => { this.publish(`messagingIndexStream:${userId}`, type, typeof value === 'undefined' ? null : value); } @@ -74,6 +79,7 @@ export const publishNoteStream = publisher.publishNoteStream; export const publishNotesStream = publisher.publishNotesStream; export const publishUserListStream = publisher.publishUserListStream; export const publishMessagingStream = publisher.publishMessagingStream; +export const publishGroupMessagingStream = publisher.publishGroupMessagingStream; export const publishMessagingIndexStream = publisher.publishMessagingIndexStream; export const publishReversiStream = publisher.publishReversiStream; export const publishReversiGameStream = publisher.publishReversiGameStream; diff --git a/src/services/update-hashtag.ts b/src/services/update-hashtag.ts index 8dbbf04cb..3482b9ef0 100644 --- a/src/services/update-hashtag.ts +++ b/src/services/update-hashtag.ts @@ -64,6 +64,7 @@ export async function updateHashtag(user: User, tag: string, isUserAttached = fa } if (Object.keys(set).length > 0) { + q.set(set); q.execute(); } } else { diff --git a/src/tools/clean-remote-files.ts b/src/tools/clean-remote-files.ts deleted file mode 100644 index e722552e1..000000000 --- a/src/tools/clean-remote-files.ts +++ /dev/null @@ -1,26 +0,0 @@ -import * as promiseLimit from 'promise-limit'; -import del from '../services/drive/delete-file'; -import { DriveFiles } from '../models'; -import { Not } from 'typeorm'; -import { DriveFile } from '../models/entities/drive-file'; -import { ensure } from '../prelude/ensure'; - -const limit = promiseLimit(16); - -DriveFiles.find({ - userHost: Not(null) -}).then(async files => { - console.log(`there is ${files.length} files`); - - await Promise.all(files.map(file => limit(() => job(file)))); - - console.log('ALL DONE'); -}); - -async function job(file: DriveFile): Promise { - file = await DriveFiles.findOne(file.id).then(ensure); - - await del(file, true); - - console.log('done', file.id); -}