Commit graph

55 commits

Author SHA1 Message Date
Hazelnoot
a4dd19fdd4 merge upstream again 2025-04-24 14:23:45 -04:00
syuilo
ff85eff209 🎨 2025-04-19 14:32:19 +09:00
Hazelnoot
40975719ec Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
#	package.json
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/types.ts
#	packages/frontend/src/pages/admin/modlog.ModLog.vue
#	packages/misskey-js/src/consts.ts
#	packages/misskey-js/src/entities.ts
2025-03-25 16:17:34 -04:00
Hazelnoot
d8908ef2d8 merge upstream 2025-03-25 16:14:53 -04:00
syuilo
a01ae38a07 enhance: モデレーターがチャットルームの内容を確認・削除できるように 2025-03-25 15:51:45 +09:00
Hazelnoot
9fdb68d568 remove fileId from importCustomEmojis log 2025-03-02 13:47:02 -05:00
Hazelnoot
e5b8fc3c80 add missing modlog render blocks 2025-03-02 13:38:35 -05:00
Hazelnoot
27d43879a2 add moderation logs for many endpoints
- `/admin/delete-all-files-of-a-user`
- `/admin/nsfw-user`
- `/admin/unnsfw-user`
- `/admin/silence-user`
- `/admin/unsilence-user`
- `/admin/accounts/create`
- `/admin/drive/clean-remote-files`
- `/admin/drive/cleanup`
- `/admin/emoji/set-category-bulk`
- `/admin/emoji/set-license-bulk`
- `/admin/emoji/set-aliases-bulk`
- `/admin/emoji/add-aliases-bulk`
- `/admin/emoji/remove-aliases-bulk`
- `/admin/emoji/import-zip`
- `/admin/federation/delete-all-files`
- `/admin/federation/remove-all-following`
- `/admin/promo/create`
- `/admin/relay/add`
- `/admin/relay/remove`
2025-03-02 13:38:02 -05:00
syuilo
616cccf251
enhance(backend): refine system account (#15530)
* wip

* wip

* wip

* Update SystemAccountService.ts

* Update 1740121393164-system-accounts.js

* Update DeleteAccountService.ts

* wip

* wip

* wip

* wip

* Update 1740121393164-system-accounts.js

* Update RepositoryModule.ts

* wip

* wip

* wip

* Update ApRendererService.ts

* wip

* wip

* Update SystemAccountService.ts

* fix tests

* fix tests

* fix tests

* fix tests

* fix tests

* fix tests

* add print logs

* ログが長すぎて出てないかもしれない

* fix migration

* refactor

* fix fed-tests

* Update RelayService.ts

* merge

* Update user.test.ts

* chore: emit log

* fix: tweak sleep duration

* fix: exit 1

* fix: wait for misskey processes to become healthy

* fix: longer sleep for user deletion

* fix: make sleep longer again

* デッドロック解消の試み

https://github.com/misskey-dev/misskey/issues/15005

* Revert "デッドロック解消の試み"

This reverts commit 266141f66fb584371bbb56ef7eba04e14bcff94d.

* wip

* Update SystemAccountService.ts

---------

Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2025-03-02 20:06:20 +09:00
Hazelnoot
292d3b9229 add "reject quotes" toggle at user and instance level
+ improve, cleanup, and de-duplicate quote resolution
+ add warning message when quote cannot be loaded
+ add "process error" framework to display warnings when a note cannot be correctly loaded from another instance
2025-02-20 09:57:48 -05:00
Hazelnoot
568d82a974 record ModLog entry when setting a user's content warning 2025-02-16 19:20:41 -05:00
Hazelnoot
4f79f85703 fix TypeScript errors in modlog.MogLog.vue 2025-02-16 19:20:41 -05:00
dakkar
a930fd9758 probably fix most renamed CSS variables 2024-11-08 17:33:04 +00:00
dakkar
f079edaf3c Merge tag '2024.10.1' into feature/2024.10 2024-11-08 15:52:37 +00:00
Marie
1d9cb4fad9
upd: add decline endpoint and free up username on decline 2024-10-17 20:11:10 +02:00
かっこかり
b668d161a9
refactor(frontend): prefix css variables (UI) (#14739)
* refactor(frontend): prefix css variables

* `MI_UI` -> `MI`

* fix

* `stickyBottom`

* stickyTop
2024-10-10 16:12:16 +09:00
syuilo
4a356f1ba7
refactor(frontend): prefix css variables (#14725)
* wip

* Update index.d.ts

* remove unnecessary codes
2024-10-09 18:08:14 +09:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
syuilo
d8cb7305ef
feat: 通報の強化 (#14704)
* wip

* Update CHANGELOG.md

* lint

* Update types.ts

* wip

* ✌️

* Update MkAbuseReport.vue

* tweak
2024-10-05 16:20:15 +09:00
dakkar
6151099f5b Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8 2024-08-30 12:08:31 +01:00
zyoshoka
fd744f44c1
enhance(backend): ページ、ギャラリー、Playのモデレーション強化 (#13523)
* enhance(backend): Page、ギャラリー、Playのモデレーション強化

* Update CHANGELOG.md

* fix: update misskey-js

* refactor(frontend): use `MkA`

* Update CHANGELOG.md

* fix(i18n): Page -> ページ
2024-08-17 15:01:08 +09:00
syuilo
ef950a345b
suspend周りの改修 (#14409)
* 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 <48310258+KisaragiEffective@users.noreply.github.com>

* owa-

* revert misskey-js related changes (#14414)

---------

Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Co-authored-by: anatawa12 <anatawa12@icloud.com>
2024-08-17 09:57:28 +09:00
dakkar
cfa9b852df Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07 2024-08-02 12:25:58 +01:00
dakkar
fccfde8f2b replaced many more ti-* 2024-06-22 15:53:36 +01:00
dakkar
79df8774da replaced ti-arrow-right 2024-06-22 15:53:12 +01:00
おさむのひと
61fae45390
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする (#13758)
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする

* モデログに対応&エンドポイントを単一オブジェクトでのサポートに変更(API経由で大量に作るシチュエーションもないと思うので)

* fix spdx

* fix migration

* fix migration

* fix models

* add e2e webhook

* tweak

* fix modlog

* fix bugs

* add tests and fix bugs

* add tests and fix bugs

* add tests

* fix path

* regenerate locale

* 混入除去

* 混入除去

* add abuseReportResolved

* fix pnpm-lock.yaml

* add abuseReportResolved test

* fix bugs

* fix ui

* add tests

* fix CHANGELOG.md

* add tests

* add RoleService.getModeratorIds tests

* WebhookServiceをUserとSystemに分割

* fix CHANGELOG.md

* fix test

* insertOneを使う用に

* fix

* regenerate locales

* revert version

* separate webhook job queue

* fix

* 🎨

* Update QueueProcessorService.ts

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-06-08 15:34:19 +09:00
Marie
15d2319011
merge: upstream 2024-02-23 13:42:52 +01:00
syuilo
26c8b53f70 enhance: サーバーごとにモデレーションノートを残せるように 2024-02-22 20:59:52 +09:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
tamaina
c1514ce91d (re) update SPDX-FileCopyrightText
Fix  #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7 Revert "update SPDX-FileCopyrightText"
This reverts commit 9b5aeb76d8.
2024-02-13 15:50:11 +00:00
syuilo
9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +09:00
Sayamame-beans
adf13f79bd
fix(frontend): モデログ表示の"logYellow"が機能していない問題を修正 (#12794)
* fix: logYellow of moderation log was not working

* docs(changelog): Fix: 一部のモデログ(logYellowでの表示対象)について、表示の色が変わらない問題を修正
2023-12-28 09:43:12 +01:00
Sayamame-beans
8ed7c7486c
fix(frontend): モデログ表示の"logYellow"が機能していない問題を修正 (#12794)
* fix: logYellow of moderation log was not working

* docs(changelog): Fix: 一部のモデログ(logYellowでの表示対象)について、表示の色が変わらない問題を修正
2023-12-25 14:49:06 +09:00
Marie
5db583a3eb merge: upstream 2023-12-23 02:09:23 +01:00
woxtu
c92508a575
Remove unused imports (#12730) 2023-12-21 11:36:45 +09:00
Acid Chicken (硫酸鶏)
2217d0c050
refactor(frontend): remove redundant class names (#12618) 2023-12-10 17:53:38 +09:00
ShittyKopper
ae5d052274 upd: implement radius setting
to keep things manageable i merged a lot of one off values into just a
handful of common sizes, so some parts of the ui will look different than
upstream even with the "Misskey" rounding mode
2023-11-01 21:43:26 +03:00
ShittyKopper
72204d9294 Revert "prototype: decreased rounding"
This reverts commit 7a51e2d404.
2023-11-01 21:43:26 +03:00
Mar0xy
4dd23a3793
merge: upstream 2023-10-31 19:33:24 +01:00
syuilo
2c0a139da6
feat: Avatar decoration (#12096)
* wip

* Update ja-JP.yml

* Update profile.vue

* .js

* Update home.test.ts
2023-10-21 18:38:07 +09:00
Mar0xy
2f2d88dcfc
add: Require Approval for Signup 2023-10-18 02:41:36 +02:00
Mar0xy
f8f128b347
merge: all upstream changes 2023-10-13 19:01:17 +02:00
syuilo
0dbf5175df enhance: improve moderation log 2023-10-04 19:55:35 +09:00
Mar0xy
38e35e1472
merge: upstream 2023-10-03 15:20:49 +02:00
Insert5StarName
7a51e2d404 prototype: decreased rounding 2023-10-01 01:20:20 +02:00
syuilo
cc6a96e1c9 enhance(front)end: improve moderation log 2023-09-30 07:42:38 +09:00
syuilo
9771f1c435 enhance: improve moderation log 2023-09-29 13:26:11 +09:00
syuilo
b2fb8d9f0e enhance(frontend): improve moderation log 2023-09-28 12:35:40 +02:00