Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts: # packages/backend/src/core/QueueModule.ts # packages/backend/src/core/QueueService.ts # packages/backend/src/core/chart/charts/federation.ts # packages/backend/src/models/RepositoryModule.ts # packages/backend/src/models/_.ts # packages/backend/src/queue/types.ts # packages/backend/src/server/api/EndpointsModule.ts # packages/backend/src/server/api/endpoints.ts # packages/backend/src/server/api/endpoints/admin/queue/stats.ts # packages/backend/src/server/api/endpoints/users/report-abuse.ts # packages/backend/src/server/web/ClientServerService.ts # packages/frontend/src/components/MkButton.vue # packages/frontend/src/components/MkChannelFollowButton.vue # packages/frontend/src/components/MkClickerGame.vue # packages/frontend/src/components/MkSwitch.vue
This commit is contained in:
commit
833031ee60
155 changed files with 8161 additions and 773 deletions
94
locales/index.d.ts
vendored
94
locales/index.d.ts
vendored
|
|
@ -9715,6 +9715,10 @@ export interface Locale extends ILocale {
|
|||
* Webhookを作成
|
||||
*/
|
||||
"createWebhook": string;
|
||||
/**
|
||||
* Webhookを編集
|
||||
*/
|
||||
"modifyWebhook": string;
|
||||
/**
|
||||
* 名前
|
||||
*/
|
||||
|
|
@ -9761,6 +9765,72 @@ export interface Locale extends ILocale {
|
|||
*/
|
||||
"mention": string;
|
||||
};
|
||||
"_systemEvents": {
|
||||
/**
|
||||
* ユーザーから通報があったとき
|
||||
*/
|
||||
"abuseReport": string;
|
||||
/**
|
||||
* ユーザーからの通報を処理したとき
|
||||
*/
|
||||
"abuseReportResolved": string;
|
||||
};
|
||||
/**
|
||||
* Webhookを削除しますか?
|
||||
*/
|
||||
"deleteConfirm": string;
|
||||
};
|
||||
"_abuseReport": {
|
||||
"_notificationRecipient": {
|
||||
/**
|
||||
* 通報の通知先を追加
|
||||
*/
|
||||
"createRecipient": string;
|
||||
/**
|
||||
* 通報の通知先を編集
|
||||
*/
|
||||
"modifyRecipient": string;
|
||||
/**
|
||||
* 通知先の種類
|
||||
*/
|
||||
"recipientType": string;
|
||||
"_recipientType": {
|
||||
/**
|
||||
* メール
|
||||
*/
|
||||
"mail": string;
|
||||
/**
|
||||
* Webhook
|
||||
*/
|
||||
"webhook": string;
|
||||
"_captions": {
|
||||
/**
|
||||
* モデレーター権限を持つユーザーのメールアドレスに通知を送ります(通報を受けた時のみ)
|
||||
*/
|
||||
"mail": string;
|
||||
/**
|
||||
* 指定したSystemWebhookに通知を送ります(通報を受けた時と通報を解決した時にそれぞれ発信)
|
||||
*/
|
||||
"webhook": string;
|
||||
};
|
||||
};
|
||||
/**
|
||||
* キーワード
|
||||
*/
|
||||
"keywords": string;
|
||||
/**
|
||||
* 通知先ユーザー
|
||||
*/
|
||||
"notifiedUser": string;
|
||||
/**
|
||||
* 使用するWebhook
|
||||
*/
|
||||
"notifiedWebhook": string;
|
||||
/**
|
||||
* 通知先を削除しますか?
|
||||
*/
|
||||
"deleteConfirm": string;
|
||||
};
|
||||
};
|
||||
"_moderationLogTypes": {
|
||||
/**
|
||||
|
|
@ -9907,6 +9977,30 @@ export interface Locale extends ILocale {
|
|||
* ユーザーのバナーを解除
|
||||
*/
|
||||
"unsetUserBanner": string;
|
||||
/**
|
||||
* SystemWebhookを作成
|
||||
*/
|
||||
"createSystemWebhook": string;
|
||||
/**
|
||||
* SystemWebhookを更新
|
||||
*/
|
||||
"updateSystemWebhook": string;
|
||||
/**
|
||||
* SystemWebhookを削除
|
||||
*/
|
||||
"deleteSystemWebhook": string;
|
||||
/**
|
||||
* 通報の通知先を作成
|
||||
*/
|
||||
"createAbuseReportNotificationRecipient": string;
|
||||
/**
|
||||
* 通報の通知先を更新
|
||||
*/
|
||||
"updateAbuseReportNotificationRecipient": string;
|
||||
/**
|
||||
* 通報の通知先を削除
|
||||
*/
|
||||
"deleteAbuseReportNotificationRecipient": string;
|
||||
};
|
||||
"_fileViewer": {
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue