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 upstream 11 #107

Merged
merged 60 commits into from
Nov 10, 2024
Merged

Merge upstream 11 #107

merged 60 commits into from
Nov 10, 2024

Conversation

kakkokari-gtyih
Copy link

@kakkokari-gtyih kakkokari-gtyih commented Oct 25, 2024

What

Why

Additional info (optional)

squashなし

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

kakkokari-gtyih and others added 17 commits October 21, 2024 11:44
* fix(frontend): Captcha のエラーハンドリングを修正 (MisskeyIO#768)

(cherry picked from commit 88912d0)

* Update Changelog

* typo

---------

Co-authored-by: riku6460 <[email protected]>
* wip

* wip

* wip

* Update packages/frontend/src/pages/note.vue

Co-authored-by: かっこかり <[email protected]>

* wip

* Update WebhookTestService.ts

* Update privacy.vue

* wip

* rename

* Update locales/ja-JP.yml

Co-authored-by: Sayamame-beans <[email protected]>

* 🎨

* wip

---------

Co-authored-by: かっこかり <[email protected]>
Co-authored-by: Sayamame-beans <[email protected]>
…4772)

* fix(frontend): デッキのタイムラインカラムでwithSensitiveが利用できない問題を修正

* Update Changelog

* Update Changelog

* Update packages/frontend/src/ui/deck/tl-column.vue
* enhance(frontend): 「単なるラッキー」の調整

* refactor

* comment

* Update Changelog

---------

Co-authored-by: syuilo <[email protected]>
* enhance(frontend): 外部アプリ認証画面の改良

* 🎨

* lint

* Update Changelog

* indent

* lint

* enhance: miauthのリダイレクト先をUI内でも表示するように

* 🎨

* fix

* fix
* fix(frontend): 管理画面のリンク切れを修正

* Update Changelog
* fix: should use invite limit cycle to calculate invite/limit

* Update Changelog

* Update changelog

---------

Co-authored-by: Lhc_fl <[email protected]>
misskey-dev#14828 のデザイン修正
Copy link

github-actions bot commented Oct 25, 2024

このPRによるapi.jsonの差分

差分はこちら
--- base
+++ head
@@ -1,7 +1,7 @@
 {
   "openapi": "3.1.0",
   "info": {
-    "version": "2024.10.1",
+    "version": "2024.11.0-alpha.0",
     "title": "Misskey API"
   },
   "externalDocs": {
@@ -4064,8 +4064,57 @@
           }
         },
         "responses": {
-          "204": {
-            "description": "OK (without any results)"
+          "200": {
+            "description": "OK (with results)",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "format": "id"
+                    },
+                    "createdAt": {
+                      "type": "string",
+                      "format": "date-time"
+                    },
+                    "updatedAt": {
+                      "type": [
+                        "string",
+                        "null"
+                      ],
+                      "format": "date-time"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "description": {
+                      "type": "string"
+                    },
+                    "url": {
+                      "type": "string"
+                    },
+                    "roleIdsThatCanBeUsedThisDecoration": {
+                      "type": "array",
+                      "items": {
+                        "type": "string",
+                        "format": "id"
+                      }
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "createdAt",
+                    "updatedAt",
+                    "name",
+                    "description",
+                    "url",
+                    "roleIdsThatCanBeUsedThisDecoration"
+                  ]
+                }
+              }
+            }
           },
           "400": {
             "description": "Client error",
@@ -51039,6 +51088,21 @@
                   "preventAiLearning": {
                     "type": "boolean"
                   },
+                  "requireSigninToViewContents": {
+                    "type": "boolean"
+                  },
+                  "makeNotesFollowersOnlyBefore": {
+                    "type": [
+                      "integer",
+                      "null"
+                    ]
+                  },
+                  "makeNotesHiddenBefore": {
+                    "type": [
+                      "integer",
+                      "null"
+                    ]
+                  },
                   "isBot": {
                     "type": "boolean"
                   },
@@ -61047,6 +61111,15 @@
                       }
                     }
                   },
+                  "SIGNIN_REQUIRED": {
+                    "value": {
+                      "error": {
+                        "message": "Signin required.",
+                        "code": "SIGNIN_REQUIRED",
+                        "id": "8e75455b-738c-471d-9f80-62693f33372e"
+                      }
+                    }
+                  },
                   "INVALID_PARAM": {
                     "value": {
                       "error": {
@@ -72918,6 +72991,15 @@
                       }
                     }
                   },
+                  "SIGNIN_REQUIRED": {
+                    "value": {
+                      "error": {
+                        "message": "Signin required.",
+                        "code": "SIGNIN_REQUIRED",
+                        "id": "d1588a9e-4b4d-4c07-807f-16f1486577a2"
+                      }
+                    }
+                  },
                   "INVALID_PARAM": {
                     "value": {
                       "error": {
@@ -77959,6 +78041,21 @@
           "isInHanaMode": {
             "type": "boolean"
           },
+          "requireSigninToViewContents": {
+            "type": "boolean"
+          },
+          "makeNotesFollowersOnlyBefore": {
+            "type": [
+              "number",
+              "null"
+            ]
+          },
+          "makeNotesHiddenBefore": {
+            "type": [
+              "number",
+              "null"
+            ]
+          },
           "instance": {
             "type": "object",
             "properties": {

Get diff files from Workflow Page

github-actions bot and others added 12 commits October 25, 2024 13:16
* enhance(frontend): Self-XSS防止用のメッセージを追加

* Update Changelog

* embedにも同様の記述を追加
…-dev#14850)

* fix(misskey-js): WebSocketの型定義をReconnectingWebsocketに依存するように

* Update Changelog

* run api extractor

* fix

* fix
* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

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

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

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

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

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Catalan)

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

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

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

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

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

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Indonesian)

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

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

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Hungarian)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

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

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)
* enhance(i18n): 対応言語の追加

* 翻訳進捗が70%に満たないものを除外

* Update Changelog

* 翻訳進捗が70%を超えたら導入の旨を明記

* typo

---------

Co-authored-by: syuilo <[email protected]>
kakkokari-gtyih and others added 28 commits October 30, 2024 09:57
* refactor(frontend): できるだけanyを除去

* refactor

* lint

* fix

* remove unused

* Update packages/frontend/src/components/MkReactionsViewer.details.vue

* Update packages/frontend/src/components/MkUsersTooltip.vue

---------

Co-authored-by: syuilo <[email protected]>
* fix(frontend): withSensitiveフィルタ周りの挙動修正

* Update MkNote.vue
…ev#14880)

* fix: make sure outgoing remote mentions get resolved correctly if referenced with non-canonical casing (resolves misskey-dev#646)

* Update Changelog

* Update Changelog

* indent

---------

Co-authored-by: Laura Hausmann <[email protected]>
* fix(frontend): ノート投稿ボタンにホバー時のスタイルが適用されていない (misskey-dev#305)

(cherry picked from commit 711ab84)

* Update Changelog

---------

Co-authored-by: taiy <[email protected]>
* fix: return getfromdb when FanoutTimeline is not enabled

* Update Changelog

* fix

---------

Co-authored-by: Lhc_fl <[email protected]>
Make `makeGetterSetter` take the correct type associated with getter and setter
* Fix code scanning alert no. 28: Incomplete string escaping or encoding (MisskeyIO#800)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 443335c)

* ✌️

---------

Co-authored-by: あわわわとーにゅ <[email protected]>
* Fix code scanning alert no. 25: Incomplete URL scheme check (MisskeyIO#799)

* Fix code scanning alert no. 26: Incomplete URL scheme check

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Fix code scanning alert no. 25: Incomplete URL scheme check

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 7d7552e)

* ✌️

---------

Co-authored-by: あわわわとーにゅ <[email protected]>
* enhance(frontend): 個別お知らせページではmetaタグを出力するように

* Update Changelog
…isskey-dev#14897)

* enhance(backend) : リモートユーザーの照会をオリジナルにリダイレクトするように (misskey-dev#12892)

* オリジンリダイレクトのテストをtodoとして追加。

e2eテストにリモートユーザー考慮のテストがなさそうなので。

次のコマンドで動くことは確認済みです。
curl "http://localhost:3000/@foo@bar" -H "accept: application/activity+json" -L

* Acctのパースを既存のパーサーでするように修正

* lint
* refactor(frontend): フルスクリーン周りの調整

(cherry picked from commit 783032c)

* refactor(frontend): deviceKindの循環参照を除去

(cherry picked from commit 1ca471f)

* fix

---------

Co-authored-by: taiyme <[email protected]>
…isskey-dev#14879)

* fix: make sure mentions of local users get rendered correctly during AP delivery (resolves misskey-dev#645)

* Update Changelog

* indent

---------

Co-authored-by: Laura Hausmann <[email protected]>
Co-authored-by: syuilo <[email protected]>
たぶんリリースワークフローはこうしないと認識してくれない
@kanarikanaru kanarikanaru merged commit 304a903 into hanami Nov 10, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.