suspend周りの改修 #14409

syuilo · 2024-08-14T13:36:31Z

What

Why

Additional info (optional)

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

github-actions · 2024-08-14T13:38:08Z

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

差分はこちら

Get diff files from Workflow Page

codecov · 2024-08-14T13:40:06Z

Codecov Report

Attention: Patch coverage is 24.30556% with 109 lines in your changes missing coverage. Please review.

Project coverage is 41.65%. Comparing base (45d8857) to head (daeab84).
Report is 2 commits behind head on develop.

Files	Patch %	Lines
packages/backend/src/core/UserSuspendService.ts	21.05%	60 Missing ⚠️
packages/backend/src/core/DeleteAccountService.ts	21.15%	41 Missing ⚠️
...ackages/frontend/src/pages/admin/modlog.ModLog.vue	0.00%	4 Missing ⚠️
.../src/server/api/endpoints/admin/accounts/delete.ts	33.33%	2 Missing ⚠️
...end/src/server/api/endpoints/admin/suspend-user.ts	50.00%	1 Missing ⚠️
...d/src/server/api/endpoints/admin/unsuspend-user.ts	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #14409      +/-   ##
===========================================
+ Coverage    39.91%   41.65%   +1.73%     
===========================================
  Files         1545     1549       +4     
  Lines       190506   196605    +6099     
  Branches      3506     3573      +67     
===========================================
+ Hits         76046    81892    +5846     
- Misses      113869   114150     +281     
+ Partials       591      563      -28

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

syuilo · 2024-08-15T11:06:29Z

pnpm build-misskey-js-with-types
すると

Oops! Something went wrong! :(

ESLint: 9.8.0

SyntaxError: Unexpected identifier 'assert'
    at compileSourceTextModule (node:internal/modules/esm/utils:337:16)
    at ModuleLoader.moduleStrategy (node:internal/modules/esm/translators:166:18)
    at callTranslator (node:internal/modules/esm/loader:436:14)
    at ModuleLoader.moduleProvider (node:internal/modules/esm/loader:442:30)

syuilo · 2024-08-15T11:06:34Z

tasukete

syuilo · 2024-08-15T11:15:54Z

依存関係更新したら出なくなったけど
Unsupported schema format, expected openapi: 3.x
と言われる

syuilo · 2024-08-15T11:29:40Z

直った

syuilo · 2024-08-15T11:29:53Z

今度は

✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.
 ✘  Every operation must have a unique `operationId`.

syuilo · 2024-08-15T11:30:02Z

tasukete

syuilo · 2024-08-15T11:32:44Z

// misskey-jsはPOST固定で送っているので、こちらも決め打ちする。別メソッドに対応することがあればこちらも直す必要あり

が関係している？

kakkokari-gtyih · 2024-08-15T12:20:49Z

pnpm --filter misskey-js api （api extractor生成物の再生成）する必要がありそう（build-misskey-js-with-typesをすれば普通は自動で生成されるけど）

samunohito · 2024-08-16T00:40:15Z

Every operation must have a unique operationId.

getとpostがあるエンドポイントに同一のoperationidがあてがわれていることが原因と推測します。
この辺と関連ありそう #13498

samunohito · 2024-08-16T00:45:01Z

（というかなんの対応を行うprなんだろう…）

packages/backend/src/server/api/endpoints/admin/suspend-user.ts

KisaragiEffective · 2024-08-16T00:47:07Z

（というかなんの対応を行うprなんだろう…）

物理削除に対してモデログを残す対応っぽい？

syuilo · 2024-08-16T02:03:48Z

（というかなんの対応を行うprなんだろう…）

物理削除に対してモデログを残す対応っぽい？

なんかいろいろやる

samunohito · 2024-08-16T02:19:56Z

コード以外にも何したかわかるような情報を残してくれるとちぇりぴする時とかに嬉しいかも

syuilo · 2024-08-16T04:22:57Z

語彙力がないから説明できないわね

syuilo · 2024-08-16T05:56:57Z

SyntaxError: Unexpected identifier 'assert' が再発した

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

syuilo · 2024-08-16T05:59:09Z

eslint ./built/**/*.ts --fix って要る？？

syuilo · 2024-08-16T06:08:38Z

/home/runner/work/misskey/misskey/packages/misskey-js/generator/built/autogen/types.ts
4:8 error Parsing error: ',' expected

nani

samunohito · 2024-08-16T06:10:31Z

misskey-jsまわりのupdate deps、必須でないのであれば後回しが丸いのでは…

syuilo · 2024-08-16T06:14:55Z

必須っぽそう

syuilo · 2024-08-16T06:15:16Z

自分のnodeを20に下げれば良いかもしれないけど

anatawa12 · 2024-08-16T07:06:42Z

packages/misskey-js/generator/package.json

-		"@typescript-eslint/eslint-plugin": "6.11.0",
-		"@typescript-eslint/parser": "6.11.0",
+		"@readme/openapi-parser": "2.6.0",
+		"@types/node": "22.3.0",


ここをbumpすると新しいほうしかないAPIを誤って使って20で動かなくなるが有り得そうだから上げたくない気持ちが少しある (他パッケージにもtypes/nodeのbumpがあればそれも同じく)

anatawa12 · 2024-08-16T07:23:47Z

SyntaxError: Unexpected identifier 'assert'

eslint周りのどっかのパッケージが node v22 で廃止された import asserts を使ってそう。てもとでもnode v22だと再現した

anatawa12 · 2024-08-16T07:26:06Z

/home/runner/work/misskey/misskey/packages/misskey-js/generator/built/autogen/types.ts
4:8 error Parsing error: ',' expected

nani

types.tsがこうなってたのでジェネレータのどっかがおかしい。openapi-typescriptのmajor更新が原因そう

/* eslint @typescript-eslint/naming-convention: 0 */
/* eslint @typescript-eslint/no-explicit-any: 0 */

[object Object],[object Object],[object Object],[object Object],[object Object]

anatawa12 · 2024-08-16T07:30:24Z

misskey-dev/eslint-pluginがimport assert使ってるからそれじゃないかな

syuilo · 2024-08-16T07:31:08Z

🙏🏿🙏🏿🙏🏿

anatawa12 · 2024-08-16T07:32:07Z

misskey-dev/eslint-pluginがimport assert使ってるからそれじゃないかな

とりあえず issueだけ misskey-dev/eslint-plugin-misskey-dev#4

anatawa12 · 2024-08-16T07:43:17Z

misskey-dev/eslint-plugin を直せば misskey js 周りの変更を全体的に戻しても node v22 でも問題なく動きそうとりあえず戻すPRと、eslint-plugin側の修正を準備します

anatawa12 · 2024-08-16T07:44:28Z

当面は node v20 で作業していただけると多分ありがたいです

syuilo · 2024-08-16T07:45:17Z

近いうちにやらなきゃいけないし戻さなくても良さそう

anatawa12 · 2024-08-16T07:45:37Z

一つのPRにまとめるとわけがわからなくなるので分けてほしい気持ち

syuilo · 2024-08-16T07:46:10Z

難しい

syuilo · 2024-08-16T07:46:59Z

PR形式でやるとこうなっちゃうからdevelopに直接入れようと思ったけどテストの様子を見たいからPR形式にした

syuilo · 2024-08-16T07:48:16Z

どかっとなんかいろいろな言葉にできないような変更を一括的に行いたいときの良い方法がなさそう

anatawa12 · 2024-08-16T07:49:45Z

どかっとなんかいろいろな言葉にできないような変更を一括的に行いたいとき

分割できない範囲はまぁまとまっててもいいと思いますが分割できる範囲は別にしてて欲しい...

あとはSquashせずにPRにして、Mergeまえにrebase iで適宜reward . fixupするとかがあとから遡るときにわかりやすくていいと思ってます

syuilo · 2024-08-17T00:57:32Z

🙏🏻

* enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように * Update CHANGELOG.md * wip * Update gen-spec.ts * Update packages/backend/src/server/api/endpoints/admin/suspend-user.ts Co-authored-by: Kisaragi <[email protected]> * owa- * revert misskey-js related changes (misskey-dev#14414) --------- Co-authored-by: Kisaragi <[email protected]> Co-authored-by: anatawa12 <[email protected]>

syuilo added 2 commits August 14, 2024 20:51

enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように

5dd0a44

Update CHANGELOG.md

acb6d5a

github-actions bot added packages/frontend Client side specific issue/PR packages/backend Server side specific issue/PR packages/misskey-js labels Aug 14, 2024

Merge branch 'develop' into nanka-iroiro-2024-08-14

c7b9556

wip

2e24e2e

KisaragiEffective reviewed Aug 16, 2024

View reviewed changes

packages/backend/src/server/api/endpoints/admin/suspend-user.ts Outdated Show resolved Hide resolved

Update gen-spec.ts

8e2cf28

Update packages/backend/src/server/api/endpoints/admin/suspend-user.ts

07c160a

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

owa-

a18bf4b

anatawa12 reviewed Aug 16, 2024

View reviewed changes

anatawa12 and others added 2 commits August 16, 2024 20:59

revert misskey-js related changes (#14414)

daeab84

Merge branch 'develop' into nanka-iroiro-2024-08-14

f94f732

syuilo marked this pull request as ready for review August 17, 2024 00:56

syuilo merged commit ef950a3 into develop Aug 17, 2024
33 of 34 checks passed

syuilo deleted the nanka-iroiro-2024-08-14 branch August 17, 2024 00:57

zyoshoka mentioned this pull request Oct 10, 2024

リモートユーザーが削除できない #14728

Open

1 task

suspend周りの改修 #14409

suspend周りの改修 #14409

Conversation

syuilo commented Aug 14, 2024

What

Why

Additional info (optional)

Checklist

github-actions bot commented Aug 14, 2024 • edited Loading

codecov bot commented Aug 14, 2024 • edited Loading

Codecov Report

syuilo commented Aug 15, 2024

syuilo commented Aug 15, 2024

syuilo commented Aug 15, 2024

syuilo commented Aug 15, 2024

syuilo commented Aug 15, 2024

syuilo commented Aug 15, 2024

syuilo commented Aug 15, 2024

kakkokari-gtyih commented Aug 15, 2024 • edited Loading

samunohito commented Aug 16, 2024

samunohito commented Aug 16, 2024

KisaragiEffective commented Aug 16, 2024

syuilo commented Aug 16, 2024

samunohito commented Aug 16, 2024

syuilo commented Aug 16, 2024

syuilo commented Aug 16, 2024

syuilo commented Aug 16, 2024

syuilo commented Aug 16, 2024

samunohito commented Aug 16, 2024

syuilo commented Aug 16, 2024

syuilo commented Aug 16, 2024

anatawa12 Aug 16, 2024

Choose a reason for hiding this comment

anatawa12 commented Aug 16, 2024

anatawa12 commented Aug 16, 2024

anatawa12 commented Aug 16, 2024

syuilo commented Aug 16, 2024

anatawa12 commented Aug 16, 2024

anatawa12 commented Aug 16, 2024

anatawa12 commented Aug 16, 2024

syuilo commented Aug 16, 2024

anatawa12 commented Aug 16, 2024 • edited Loading

syuilo commented Aug 16, 2024

syuilo commented Aug 16, 2024

syuilo commented Aug 16, 2024

anatawa12 commented Aug 16, 2024

syuilo commented Aug 17, 2024

github-actions bot commented Aug 14, 2024 •

edited

Loading

codecov bot commented Aug 14, 2024 •

edited

Loading

kakkokari-gtyih commented Aug 15, 2024 •

edited

Loading

anatawa12 commented Aug 16, 2024 •

edited

Loading