Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.13.0 #557

Merged
merged 183 commits into from
Nov 24, 2024
Merged

Merge 4.13.0 #557

merged 183 commits into from
Nov 24, 2024

Conversation

kozakura913
Copy link
Collaborator

Conflicts:

locales/en-US.yml
locales/index.d.ts
locales/ja-JP.yml
locales/ug-CN.yml
package.json
packages/backend/package.json
packages/backend/src/core/FlashService.ts
packages/backend/src/core/entities/NotificationEntityService.ts
packages/backend/src/models/Notification.ts
packages/backend/src/models/json-schema/meta.ts
packages/backend/src/models/json-schema/notification.ts
packages/backend/src/models/json-schema/user.ts
packages/backend/src/server/api/endpoints/notes/create.ts
packages/backend/src/types.ts
packages/cherrypick-js/etc/cherrypick-js.api.md
packages/cherrypick-js/package.json
packages/cherrypick-js/src/autogen/types.ts
packages/frontend/src/components/MkNoteSimple.vue
packages/frontend/src/components/MkNotification.vue
packages/frontend/src/components/MkPoll.vue
packages/frontend/src/components/global/MkMfm.ts
packages/frontend/src/pages/channel.vue
packages/frontend/src/pages/search.note.vue
packages/frontend/src/pages/settings/general.vue
packages/frontend/src/pages/settings/profile.vue
packages/frontend/src/pages/user/home.vue
pnpm-lock.yaml

misskey-release-bot bot and others added 30 commits September 29, 2024 11:42
* fix(frontend): Make post form attachments accessible

Adds a role="button", tabindex, and @keydown to MkPostFormAttaches in
order to make it accessible to keyboard users.

* Fix for linter

* Add spacing in type signature
* fix(frontend-embed): ビルド時にsassのmodern-compilerを使うように

* fix(frontend): ビルド時にsassのmodern-compilerを使うように
* ci: Make failure if misskey js autogen detected changes

* ci: set persist-credentials
* wip

* Update MkSignin.vue

* Update MkSignin.vue

* wip

* Update CHANGELOG.md
* wip

* Update CHANGELOG.md

* wip

* fix

* Update index.d.ts

* Update SigninService.ts

* Update MkNotification.vue
* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

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

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

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Greek)

* New translations ja-jp.yml (Hungarian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Norwegian)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Ukrainian)

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

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uyghur)

* New translations ja-jp.yml (Sinhala)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Kannada)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))
* fix(backend): 連合限定先が間違って連合しない先に代入されているのを修正

* build: fix property typo
* feat: サーバー初期設定時専用の初期パスワードを設定できるように

* 無いのに入力された場合もエラーにする

* 🎨

* 🎨

* cypress-devcontainerにもpassを設定(テストが失敗するため)

* [ci skip] 🎨

* ✌️

* test: please revert this commit before merge

* Revert "test: please revert this commit before merge"

This reverts commit 66b2b48f66830d2450d8cda03955c143feba76c7.

* Update locales/ja-JP.yml

Co-authored-by: syuilo <[email protected]>

* build assets

* Update Changelog

* fix condition

* fix condition

* add comment

* change error code

* 他のエラーコードと合わせる

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <[email protected]>
* fix: 初期パスワードをコメントアウト

* 🎨

* fix indent
* wip

* Update MkSignin.vue

* Update MkSignin.vue

* wip

* Update CHANGELOG.md

* enhance(frontend): サインイン画面の改善

* Update Changelog

* 14655の変更取り込み

* spdx

* fix

* fix

* fix

* 🎨

* 🎨

* 🎨

* 🎨

* Captchaがリセットされない問題を修正

* 次の処理をsignin apiから読み取るように

* Add Comments

* fix

* fix test

* attempt to fix test

* fix test

* fix test

* fix test

* fix

* fix test

* fix: 一部のエラーがちゃんと出るように

* Update Changelog

* 🎨

* 🎨

* remove border

---------

Co-authored-by: syuilo <[email protected]>
noridev and others added 15 commits November 12, 2024 17:02
  - 대부분의 소프트웨어에서 이 설정은 기본적으로 비활성화되어 있습니다.
  - 또한, 이 설정은 대부분의 사용자가 반드시 캡션을 설정할 필요는 없으므로 기본적으로 비활성화 됩니다.
# Conflicts:
#	locales/en-US.yml
#	locales/index.d.ts
#	locales/ja-JP.yml
#	locales/ug-CN.yml
#	package.json
#	packages/backend/package.json
#	packages/backend/src/core/FlashService.ts
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/models/Notification.ts
#	packages/backend/src/models/json-schema/meta.ts
#	packages/backend/src/models/json-schema/notification.ts
#	packages/backend/src/models/json-schema/user.ts
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/backend/src/types.ts
#	packages/cherrypick-js/etc/cherrypick-js.api.md
#	packages/cherrypick-js/package.json
#	packages/cherrypick-js/src/autogen/types.ts
#	packages/frontend/src/components/MkNoteSimple.vue
#	packages/frontend/src/components/MkNotification.vue
#	packages/frontend/src/components/MkPoll.vue
#	packages/frontend/src/components/global/MkMfm.ts
#	packages/frontend/src/pages/channel.vue
#	packages/frontend/src/pages/search.note.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/settings/profile.vue
#	packages/frontend/src/pages/user/home.vue
#	pnpm-lock.yaml
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

devskim found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

codecov bot commented Nov 24, 2024

Codecov Report

Attention: Patch coverage is 44.14616% with 1498 lines in your changes missing coverage. Please review.

Project coverage is 40.08%. Comparing base (d479c51) to head (b3ab835).
Report is 184 commits behind head on develop.

Files with missing lines Patch % Lines
.../src/server/api/endpoints/notes/polls/translate.ts 28.94% 162 Missing ⚠️
...s/frontend/src/components/MkExtensionInstaller.vue 0.00% 145 Missing and 1 partial ⚠️
packages/frontend/src/components/MkAbuseReport.vue 0.00% 116 Missing ⚠️
...ackages/backend/src/server/api/SigninApiService.ts 5.55% 85 Missing ⚠️
...rc/components/MkExtensionInstaller.stories.impl.ts 0.00% 82 Missing and 1 partial ⚠️
packages/backend/src/core/AbuseReportService.ts 10.44% 60 Missing ⚠️
packages/backend/src/core/NoteUpdateService.ts 10.44% 60 Missing ⚠️
...cessors/CheckModeratorsActivityProcessorService.ts 86.93% 52 Missing ⚠️
...ackages/backend/src/queue/QueueProcessorService.ts 27.45% 37 Missing ⚠️
packages/backend/src/core/UserFollowingService.ts 9.37% 29 Missing ⚠️
... and 82 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #557      +/-   ##
===========================================
+ Coverage    38.58%   40.08%   +1.50%     
===========================================
  Files         1682     1695      +13     
  Lines       226429   235572    +9143     
  Branches      3839     3930      +91     
===========================================
+ Hits         87364    94428    +7064     
- Misses      138407   140519    +2112     
+ Partials       658      625      -33     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

@kozakura913 kozakura913 added this to the yojo1.2.0 milestone Nov 24, 2024
Copy link
Contributor

이 PR에 의한 api.json 차이

차이점은 여기에서 볼 수 있음
--- base
+++ head
@@ -1,7 +1,7 @@
 {
   "openapi": "3.1.0",
   "info": {
-    "version": "4.12.1-yojo1.2.0 (2024.9.0)",
+    "version": "4.13.0-yojo1.2.0 (2024.10.1)",
     "title": "CherryPick API"
   },
   "externalDocs": {
@@ -90,6 +90,9 @@
                         "null"
                       ]
                     },
+                    "enableTestcaptcha": {
+                      "type": "boolean"
+                    },
                     "swPublickey": {
                       "type": [
                         "string",
@@ -208,6 +211,12 @@
                         "type": "string"
                       }
                     },
+                    "prohibitedWordsForNameOfUser": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    },
                     "bannedEmailDomains": {
                       "type": "array",
                       "items": {
@@ -458,6 +467,9 @@
                     "enableChartsForFederatedInstances": {
                       "type": "boolean"
                     },
+                    "enableStatsForFederatedInstances": {
+                      "type": "boolean"
+                    },
                     "enableServerMachineStats": {
                       "type": "boolean"
                     },
@@ -681,6 +693,12 @@
                       "items": {
                         "type": "string"
                       }
+                    },
+                    "disableRegistrationWhenInactive": {
+                      "type": "boolean"
+                    },
+                    "disablePublicNoteWhenInactive": {
+                      "type": "boolean"
                     }
                   },
                   "required": [
@@ -696,6 +714,7 @@
                     "recaptchaSiteKey",
                     "enableTurnstile",
                     "turnstileSiteKey",
+                    "enableTestcaptcha",
                     "swPublickey",
                     "mascotImageUrl",
                     "bannerUrl",
@@ -716,6 +735,7 @@
                     "blockedHosts",
                     "sensitiveWords",
                     "prohibitedWords",
+                    "prohibitedWordsForNameOfUser",
                     "preservedUsernames",
                     "hcaptchaSecretKey",
                     "mcaptchaSecretKey",
@@ -766,6 +786,7 @@
                     "truemailAuthKey",
                     "enableChartsForRemoteUser",
                     "enableChartsForFederatedInstances",
+                    "enableStatsForFederatedInstances",
                     "enableServerMachineStats",
                     "enableIdenticonGeneration",
                     "manifestJsonOverride",
@@ -814,7 +835,9 @@
                     "enableReceivePrerelease",
                     "skipVersion",
                     "trustedLinkUrlPatterns",
-                    "customSplashText"
+                    "customSplashText",
+                    "disableRegistrationWhenInactive",
+                    "disablePublicNoteWhenInactive"
                   ]
                 }
               }
@@ -1825,10 +1848,6 @@
                       "remote"
                     ],
                     "default": "combined"
-                  },
-                  "forwarded": {
-                    "type": "boolean",
-                    "default": false
                   }
                 }
               }
@@ -1894,6 +1913,23 @@
                             "$ref": "#/components/schemas/UserDetailedNotMe"
                           }
                         ]
+                      },
+                      "forwarded": {
+                        "type": "boolean"
+                      },
+                      "resolvedAs": {
+                        "type": [
+                          "string",
+                          "null"
+                        ],
+                        "enum": [
+                          "accept",
+                          "reject",
+                          null
+                        ]
+                      },
+                      "moderationNote": {
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -1905,7 +1941,11 @@
                       "targetUserId",
                       "assigneeId",
                       "reporter",
-                      "targetUser"
+                      "targetUser",
+                      "assignee",
+                      "forwarded",
+                      "resolvedAs",
+                      "moderationNote"
                     ]
                   }
                 }
@@ -2942,6 +2982,12 @@
                   "password": {
                     "type": "string",
                     "minLength": 1
+                  },
+                  "setupPassword": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "required": [
@@ -2980,6 +3026,24 @@
                   "$ref": "#/components/schemas/Error"
                 },
                 "examples": {
+                  "ACCESS_DENIED": {
+                    "value": {
+                      "error": {
+                        "message": "Access denied.",
+                        "code": "ACCESS_DENIED",
+                        "id": "1fb7cb09-d46a-4fff-b8df-057708cce513"
+                      }
+                    }
+                  },
+                  "INCORRECT_INITIAL_PASSWORD": {
+                    "value": {
+                      "error": {
+                        "message": "Initial password is incorrect.",
+                        "code": "INCORRECT_INITIAL_PASSWORD",
+                        "id": "97147c55-1ae1-4f6f-91d6-e1c3e0e76d62"
+                      }
+                    }
+                  },
                   "INVALID_PARAM": {
                     "value": {
                       "error": {
@@ -12860,9 +12924,16 @@
                     "type": "string",
                     "format": "misskey:id"
                   },
-                  "forward": {
-                    "type": "boolean",
-                    "default": false
+                  "resolvedAs": {
+                    "type": [
+                      "string",
+                      "null"
+                    ],
+                    "enum": [
+                      "accept",
+                      "reject",
+                      null
+                    ]
                   }
                 },
                 "required": [
@@ -12995,6 +13066,327 @@
         }
       }
     },
+    "/admin/forward-abuse-user-report": {
+      "post": {
+        "operationId": "admin___forward-abuse-user-report",
+        "summary": "admin/forward-abuse-user-report",
+        "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:admin:resolve-abuse-user-report*",
+        "externalDocs": {
+          "description": "Source code",
+          "url": "https://github.com/kokonect-link/cherrypick/blob/develop/packages/backend/src/server/api/endpoints/admin/forward-abuse-user-report.ts"
+        },
+        "tags": [
+          "admin"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "reportId": {
+                    "type": "string",
+                    "format": "misskey:id"
+                  }
+                },
+                "required": [
+                  "reportId"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "OK (without any results)"
+          },
+          "400": {
+            "description": "Client error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "NO_SUCH_ABUSE_REPORT": {
+                    "value": {
+                      "error": {
+                        "message": "No such abuse report.",
+                        "code": "NO_SUCH_ABUSE_REPORT",
+                        "id": "8763e21b-d9bc-40be-acf6-54c1a6986493",
+                        "kind": "server",
+                        "httpStatusCode": 404
+                      }
+                    }
+                  },
+                  "INVALID_PARAM": {
+                    "value": {
+                      "error": {
+                        "message": "Invalid param.",
+                        "code": "INVALID_PARAM",
+                        "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "CREDENTIAL_REQUIRED": {
+                    "value": {
+                      "error": {
+                        "message": "Credential required.",
+                        "code": "CREDENTIAL_REQUIRED",
+                        "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "AUTHENTICATION_FAILED": {
+                    "value": {
+                      "error": {
+                        "message": "Authentication failed. Please ensure your token is correct.",
+                        "code": "AUTHENTICATION_FAILED",
+                        "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "418": {
+            "description": "I'm Ai",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "I_AM_AI": {
+                    "value": {
+                      "error": {
+                        "message": "You sent a request to Ai-chan, CherryPick's showgirl, instead of the server.",
+                        "code": "I_AM_AI",
+                        "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal server error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "INTERNAL_ERROR": {
+                    "value": {
+                      "error": {
+                        "message": "Internal error occurred. Please contact us if the error persists.",
+                        "code": "INTERNAL_ERROR",
+                        "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/admin/update-abuse-user-report": {
+      "post": {
+        "operationId": "admin___update-abuse-user-report",
+        "summary": "admin/update-abuse-user-report",
+        "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:admin:resolve-abuse-user-report*",
+        "externalDocs": {
+          "description": "Source code",
+          "url": "https://github.com/kokonect-link/cherrypick/blob/develop/packages/backend/src/server/api/endpoints/admin/update-abuse-user-report.ts"
+        },
+        "tags": [
+          "admin"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "reportId": {
+                    "type": "string",
+                    "format": "misskey:id"
+                  },
+                  "moderationNote": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "reportId"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "OK (without any results)"
+          },
+          "400": {
+            "description": "Client error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "NO_SUCH_ABUSE_REPORT": {
+                    "value": {
+                      "error": {
+                        "message": "No such abuse report.",
+                        "code": "NO_SUCH_ABUSE_REPORT",
+                        "id": "15f51cf5-46d1-4b1d-a618-b35bcbed0662",
+                        "kind": "server",
+                        "httpStatusCode": 404
+                      }
+                    }
+                  },
+                  "INVALID_PARAM": {
+                    "value": {
+                      "error": {
+                        "message": "Invalid param.",
+                        "code": "INVALID_PARAM",
+                        "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "CREDENTIAL_REQUIRED": {
+                    "value": {
+                      "error": {
+                        "message": "Credential required.",
+                        "code": "CREDENTIAL_REQUIRED",
+                        "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "AUTHENTICATION_FAILED": {
+                    "value": {
+                      "error": {
+                        "message": "Authentication failed. Please ensure your token is correct.",
+                        "code": "AUTHENTICATION_FAILED",
+                        "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "418": {
+            "description": "I'm Ai",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "I_AM_AI": {
+                    "value": {
+                      "error": {
+                        "message": "You sent a request to Ai-chan, CherryPick's showgirl, instead of the server.",
+                        "code": "I_AM_AI",
+                        "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal server error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "INTERNAL_ERROR": {
+                    "value": {
+                      "error": {
+                        "message": "Internal error occurred. Please contact us if the error persists.",
+                        "code": "INTERNAL_ERROR",
+                        "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/admin/send-email": {
       "post": {
         "operationId": "admin___send-email",
@@ -15400,6 +15792,15 @@
                       "type": "string"
                     }
                   },
+                  "prohibitedWordsForNameOfUser": {
+                    "type": [
+                      "array",
+                      "null"
+                    ],
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "themeColor": {
                     "type": [
                       "string",
@@ -15578,6 +15979,9 @@
                       "null"
                     ]
                   },
+                  "enableTestcaptcha": {
+                    "type": "boolean"
+                  },
                   "sensitiveMediaDetection": {
                     "type": "string",
                     "enum": [
@@ -15928,6 +16332,9 @@
                   "enableChartsForFederatedInstances": {
                     "type": "boolean"
                   },
+                  "enableStatsForFederatedInstances": {
+                    "type": "boolean"
+                  },
                   "enableServerMachineStats": {
                     "type": "boolean"
                   },
@@ -16083,6 +16490,18 @@
                     "items": {
                       "type": "string"
                     }
+                  },
+                  "disableRegistrationWhenInactive": {
+                    "type": [
+                      "boolean",
+                      "null"
+                    ]
+                  },
+                  "disablePublicNoteWhenInactive": {
+                    "type": [
+                      "boolean",
+                      "null"
+                    ]
                   }
                 }
               }
@@ -18152,7 +18571,10 @@
                       "enum": [
                         "abuseReport",
                         "abuseReportResolved",
-                        "userCreated"
+                        "userCreated",
+                        "inactiveModeratorsWarning",
+                        "inactiveModeratorsInvitationOnlyChanged",
+                        "inactiveModeratorsDisablePublicNoteChanged"
                       ]
                     }
                   },
@@ -18480,7 +18902,10 @@
                       "enum": [
                         "abuseReport",
                         "abuseReportResolved",
-                        "userCreated"
+                        "userCreated",
+                        "inactiveModeratorsWarning",
+                        "inactiveModeratorsInvitationOnlyChanged",
+                        "inactiveModeratorsDisablePublicNoteChanged"
                       ]
                     }
                   }
@@ -18822,7 +19247,10 @@
                       "enum": [
                         "abuseReport",
                         "abuseReportResolved",
-                        "userCreated"
+                        "userCreated",
+                        "inactiveModeratorsWarning",
+                        "inactiveModeratorsInvitationOnlyChanged",
+                        "inactiveModeratorsDisablePublicNoteChanged"
                       ]
                     }
                   },
@@ -19002,7 +19430,10 @@
                     "enum": [
                       "abuseReport",
                       "abuseReportResolved",
-                      "userCreated"
+                      "userCreated",
+                      "inactiveModeratorsWarning",
+                      "inactiveModeratorsInvitationOnlyChanged",
+                      "inactiveModeratorsDisablePublicNoteChanged"
                     ]
                   },
                   "override": {
@@ -46394,6 +46825,7 @@
                         "roleAssigned",
                         "achievementEarned",
                         "exportCompleted",
+                        "login",
                         "scheduleNote",
                         "app",
                         "test",
@@ -46420,6 +46852,7 @@
                         "roleAssigned",
                         "achievementEarned",
                         "exportCompleted",
+                        "login",
                         "scheduleNote",
                         "app",
                         "test",
@@ -46637,6 +47070,7 @@
                         "roleAssigned",
                         "achievementEarned",
                         "exportCompleted",
+                        "login",
                         "scheduleNote",
                         "app",
                         "test",
@@ -46666,6 +47100,7 @@
                         "roleAssigned",
                         "achievementEarned",
                         "exportCompleted",
+                        "login",
                         "scheduleNote",
                         "app",
                         "test",
@@ -51331,6 +51766,16 @@
                       }
                     }
                   },
+                  "YOUR_NAME_CONTAINS_PROHIBITED_WORDS": {
+                    "value": {
+                      "error": {
+                        "message": "Your new name contains prohibited words.",
+                        "code": "YOUR_NAME_CONTAINS_PROHIBITED_WORDS",
+                        "id": "0b3f9f6a-2f4d-4b1f-9fb4-49d3a2fd7191",
+                        "httpStatusCode": 422
+                      }
+                    }
+                  },
                   "INVALID_PARAM": {
                     "value": {
                       "error": {
@@ -58126,6 +58571,15 @@
                       }
                     }
                   },
+                  "CANNOT_CREATE_ALREADY_EXPIRED_EVENT": {
+                    "value": {
+                      "error": {
+                        "message": "Event is already expired.",
+                        "code": "CANNOT_CREATE_ALREADY_EXPIRED_EVENT",
+                        "id": "a80c5545-5126-421e-969b-35c3eb2c3646"
+                      }
+                    }
+                  },
                   "NO_SUCH_CHANNEL": {
                     "value": {
                       "error": {
@@ -58515,6 +58969,27 @@
                         "type": "integer"
                       }
                     }
+                  },
+                  "scheduledDelete": {
+                    "type": [
+                      "object",
+                      "null"
+                    ],
+                    "properties": {
+                      "deleteAt": {
+                        "type": [
+                          "integer",
+                          "null"
+                        ]
+                      },
+                      "deleteAfter": {
+                        "type": [
+                          "integer",
+                          "null"
+                        ],
+                        "minimum": 1
+                      }
+                    }
                   }
                 },
                 "anyOf": [
@@ -58626,6 +59101,15 @@
                       }
                     }
                   },
+                  "CANNOT_CREATE_ALREADY_EXPIRED_EVENT": {
+                    "value": {
+                      "error": {
+                        "message": "Event is already expired.",
+                        "code": "CANNOT_CREATE_ALREADY_EXPIRED_EVENT",
+                        "id": "a80c5545-5126-421e-969b-35c3eb2c3646"
+                      }
+                    }
+                  },
                   "CANNOT_CREATE_ALREADY_EXPIRED_SCHEDULE": {
                     "value": {
                       "error": {
@@ -58653,6 +59137,15 @@
                       }
                     }
                   },
+                  "CANNOT_SCHEDULE_DELETE_EARLIER_THAN_NOW": {
+                    "value": {
+                      "error": {
+                        "message": "Cannot specify delete time earlier than now.",
+                        "code": "CANNOT_SCHEDULE_DELETE_EARLIER_THAN_NOW",
+                        "id": "9f04994a-3aa2-11ef-a495-177eea74788f"
+                      }
+                    }
+                  },
                   "YOU_HAVE_BEEN_BLOCKED": {
                     "value": {
                       "error": {
@@ -59541,6 +60034,31 @@
                       "choices"
                     ]
                   },
+                  "event": {
+                    "type": [
+                      "object",
+                      "null"
+                    ],
+                    "properties": {
+                      "title": {
+                        "type": "string",
+                        "minLength": 1,
+                        "maxLength": 128
+                      },
+                      "start": {
+                        "type": "integer"
+                      },
+                      "end": {
+                        "type": [
+                          "integer",
+                          "null"
+                        ]
+                      },
+                      "metadata": {
+                        "type": "object"
+                      }
+                    }
+                  },
                   "cw": {
                     "type": [
                       "string",
@@ -59551,6 +60069,27 @@
                   "disableRightClick": {
                     "type": "boolean",
                     "default": false
+                  },
+                  "scheduledDelete": {
+                    "type": [
+                      "object",
+                      "null"
+                    ],
+                    "properties": {
+                      "deleteAt": {
+                        "type": [
+                          "integer",
+                          "null"
+                        ]
+                      },
+                      "deleteAfter": {
+                        "type": [
+                          "integer",
+                          "null"
+                        ],
+                        "minimum": 1
+                      }
+                    }
                   }
                 },
                 "required": [
@@ -59601,6 +60140,24 @@
                       }
                     }
                   },
+                  "CANNOT_CREATE_ALREADY_EXPIRED_EVENT": {
+                    "value": {
+                      "error": {
+                        "message": "Event is already expired.",
+                        "code": "CANNOT_CREATE_ALREADY_EXPIRED_EVENT",
+                        "id": "a80c5545-5126-421e-969b-35c3eb2c3646"
+                      }
+                    }
+                  },
+                  "CANNOT_SCHEDULE_DELETE_EARLIER_THAN_NOW": {
+                    "value": {
+                      "error": {
+                        "message": "Cannot specify delete time earlier than now.",
+                        "code": "CANNOT_SCHEDULE_DELETE_EARLIER_THAN_NOW",
+                        "id": "9f04994a-3aa2-11ef-a495-177eea74788f"
+                      }
+                    }
+                  },
                   "INVALID_PARAM": {
                     "value": {
                       "error": {
@@ -61355,6 +61912,201 @@
         }
       }
     },
+    "/notes/polls/translate": {
+      "post": {
+        "operationId": "notes___polls___translate",
+        "summary": "notes/polls/translate",
+        "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *read:account*",
+        "externalDocs": {
+          "description": "Source code",
+          "url": "https://github.com/kokonect-link/cherrypick/blob/develop/packages/backend/src/server/api/endpoints/notes/polls/translate.ts"
+        },
+        "tags": [
+          "notes"
+        ],
+        "security": [
+          {
+            "bearerAuth": []
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "noteId": {
+                    "type": "string",
+                    "format": "misskey:id"
+                  },
+                  "targetLang": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "noteId",
+                  "targetLang"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK (with results)",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "sourceLang": {
+                      "type": "string"
+                    },
+                    "text": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "required": [
+                    "sourceLang",
+                    "text"
+                  ]
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "OK (without any results)"
+          },
+          "400": {
+            "description": "Client error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "UNAVAILABLE": {
+                    "value": {
+                      "error": {
+                        "message": "Translate of polls unavailable.",
+                        "code": "UNAVAILABLE",
+                        "id": "dc5ba5b7-0d50-4dcd-80f5-910f16a56b40"
+                      }
+                    }
+                  },
+                  "NO_TRANSLATE_SERVICE": {
+                    "value": {
+                      "error": {
+                        "message": "Translate service is not available.",
+                        "code": "NO_TRANSLATE_SERVICE",
+                        "id": "bef6e895-c05d-4499-9815-035ed18b0e31"
+                      }
+                    }
+                  },
+                  "INVALID_PARAM": {
+                    "value": {
+                      "error": {
+                        "message": "Invalid param.",
+                        "code": "INVALID_PARAM",
+                        "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "CREDENTIAL_REQUIRED": {
+                    "value": {
+                      "error": {
+                        "message": "Credential required.",
+                        "code": "CREDENTIAL_REQUIRED",
+                        "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "AUTHENTICATION_FAILED": {
+                    "value": {
+                      "error": {
+                        "message": "Authentication failed. Please ensure your token is correct.",
+                        "code": "AUTHENTICATION_FAILED",
+                        "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "418": {
+            "description": "I'm Ai",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "I_AM_AI": {
+                    "value": {
+                      "error": {
+                        "message": "You sent a request to Ai-chan, CherryPick's showgirl, instead of the server.",
+                        "code": "I_AM_AI",
+                        "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal server error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                },
+                "examples": {
+                  "INTERNAL_ERROR": {
+                    "value": {
+                      "error": {
+                        "message": "Internal error occurred. Please contact us if the error persists.",
+                        "code": "INTERNAL_ERROR",
+                        "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/notes/polls/vote": {
       "post": {
         "operationId": "notes___polls___vote",
@@ -68072,6 +68824,29 @@
         "tags": [
           "flash"
         ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "offset": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "default": 0
+                  },
+                  "limit": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 100,
+                    "default": 10
+                  }
+                }
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "OK (with results)",
@@ -84007,6 +84782,21 @@
             "type": "boolean",
             "example": false
           },
+          "isIndexable": {
+            "type": "boolean"
+          },
+          "searchableBy": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "enum": [
+              "public",
+              "followersAndReacted",
+              "reactedOnly",
+              "private"
+            ]
+          },
           "description": {
             "type": [
               "string",
@@ -84119,18 +84909,6 @@
               "private"
             ]
           },
-          "twoFactorEnabled": {
-            "type": "boolean",
-            "default": false
-          },
-          "usePasswordLessLogin": {
-            "type": "boolean",
-            "default": false
-          },
-          "securityKeys": {
-            "type": "boolean",
-            "default": false
-          },
           "roles": {
             "type": "array",
             "items": {
@@ -84153,6 +84931,15 @@
           "moderationNote": {
             "type": "string"
           },
+          "twoFactorEnabled": {
+            "type": "boolean"
+          },
+          "usePasswordLessLogin": {
+            "type": "boolean"
+          },
+          "securityKeys": {
+            "type": "boolean"
+          },
           "mutualLinkSections": {
             "type": "array",
             "items": {
@@ -84254,6 +85041,8 @@
           "isLocked",
           "isSilenced",
           "isSuspended",
+          "isIndexable",
+          "searchableBy",
           "description",
           "location",
           "birthday",
@@ -84270,9 +85059,6 @@
           "publicReactions",
           "followingVisibility",
           "followersVisibility",
-          "twoFactorEnabled",
-          "usePasswordLessLogin",
-          "securityKeys",
           "roles",
           "memo",
           "mutualLinkSections"
@@ -85096,6 +85882,18 @@
             "type": "object",
             "$ref": "#/components/schemas/RolePolicies"
           },
+          "twoFactorEnabled": {
+            "type": "boolean",
+            "default": false
+          },
+          "usePasswordLessLogin": {
+            "type": "boolean",
+            "default": false
+          },
+          "securityKeys": {
+            "type": "boolean",
+            "default": false
+          },
           "email": {
             "type": [
               "string",
@@ -85169,7 +85967,10 @@
           "emailNotificationTypes",
           "achievements",
           "loggedInDays",
-          "policies"
+          "policies",
+          "twoFactorEnabled",
+          "usePasswordLessLogin",
+          "securityKeys"
         ]
       },
       "UserDetailedNotMe": {
@@ -86539,6 +87340,34 @@
               "type": {
                 "type": "string",
                 "enum": [
+                  "login"
+                ]
+              },
+              "ip": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "createdAt",
+              "type",
+              "ip"
+            ]
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "format": "id"
+              },
+              "createdAt": {
+                "type": "string",
+                "format": "date-time"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
                   "scheduleNote"
                 ]
               },
@@ -89135,6 +89964,9 @@
               "null"
             ]
           },
+          "enableTestcaptcha": {
+            "type": "boolean"
+          },
           "swPublickey": {
             "type": [
               "string",
@@ -89307,6 +90139,12 @@
           "maxFileSize": {
             "type": "number"
           },
+          "disableRegistrationWhenInactive": {
+            "type": "boolean"
+          },
+          "disablePublicNoteWhenInactive": {
+            "type": "boolean"
+          },
           "reversiVersion": {
             "type": "string"
           }
@@ -89339,6 +90177,7 @@
           "recaptchaSiteKey",
           "enableTurnstile",
           "turnstileSiteKey",
+          "enableTestcaptcha",
           "swPublickey",
           "mascotImageUrl",
           "bannerUrl",
@@ -89367,6 +90206,8 @@
           "policies",
           "noteSearchableScope",
           "maxFileSize",
+          "disableRegistrationWhenInactive",
+          "disablePublicNoteWhenInactive",
           "reversiVersion"
         ]
       },
@@ -89493,7 +90334,10 @@
               "enum": [
                 "abuseReport",
                 "abuseReportResolved",
-                "userCreated"
+                "userCreated",
+                "inactiveModeratorsWarning",
+                "inactiveModeratorsInvitationOnlyChanged",
+                "inactiveModeratorsDisablePublicNoteChanged"
               ]
             }
           },

Get diff files from Workflow Page

@kozakura913 kozakura913 merged commit ea225d0 into yojo-art:develop Nov 24, 2024
35 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.