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 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								304d0eb83b 
								
							 
						 
						
							
							
								
								enhance: チャットルームに招待されたときの通知を追加  
							
							
							
						 
						
							2025-03-25 15:25:43 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f1f24e39d2 
								
							 
						 
						
							
							
								
								Feat: Chat ( #15686 )  
							
							... 
							
							
							
							* wip
* wip
* wip
* wip
* wip
* wip
* Update types.ts
* Create 1742203321812-chat.js
* wip
* wip
* Update room.vue
* Update home.vue
* Update home.vue
* Update ja-JP.yml
* Update index.d.ts
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
* wip
* Update home.vue
* clean up
* Update misskey-js.api.md
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* lint fixes
* lint
* Update UserEntityService.ts
* search
* wip
* 🎨 
* wip
* Update home.ownedRooms.vue
* wip
* Update CHANGELOG.md
* Update style.scss
* wip
* improve performance
* improve performance
* Update timeline.test.ts 
							
						 
						
							2025-03-24 21:32:46 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								9fdb68d568 
								
							 
						 
						
							
							
								
								remove fileId from importCustomEmojis log  
							
							
							
						 
						
							2025-03-02 13:47:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								86a7d33f3f 
								
							 
						 
						
							
							
								
								fix rebase error  
							
							
							
						 
						
							2025-03-02 13:46:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								e030facaa9 
								
							 
						 
						
							
							
								
								don't record deleted note, flash, page, or gallery post in modlog  
							
							
							
						 
						
							2025-03-02 13:38:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								c44c59e9ae 
								
							 
						 
						
							
							
								
								remove embedded Note from "createPromo" mod logs  
							
							
							
						 
						
							2025-03-02 13:38:32 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								ea89348b62 
								
							 
						 
						
							
							
								
								add user-level "force content warning" moderation feature  
							
							
							
						 
						
							2025-02-16 19:20:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								6d4ae93592 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.10  
							
							
							
						 
						
							2024-12-12 13:04:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1d3c825398 
								
							 
						 
						
							
							
								
								upd: add notification for when scheduled note gets posted  
							
							
							
						 
						
							2024-12-09 05:33:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc9d777dc3 
								
							 
						 
						
							
							
								
								upd: add notification for failures, add reasons for failure, apply suggestions  
							
							
							
						 
						
							2024-12-09 05:32:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									NoriDev 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2528508cff 
								
							 
						 
						
							
							
								
								feat: 노트 게시를 예약할 수 있음 ( yojo-art/cherrypick#483 , [ Type4ny-Project/Type4ny@271c872c ]( 271c872c97))  
							
							
							
						 
						
							2024-12-09 05:31:03 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83c04c55ad 
								
							 
						 
						
							
							
								
								fix(misskey-js): eliminate any (follow-up of  #13523 ) ( #14422 )  
							
							
							
						 
						
							2024-08-17 18:15:46 +09: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8810af8d9 
								
							 
						 
						
							
							
								
								fix(backend): リバーシの設定変更が反映されないのを修正 ( #14404 )  
							
							... 
							
							
							
							* fix(backend): リバーシの設定変更が反映されないのを修正
* Update Changelog
* add bindthis 
							
						 
						
							2024-08-16 21:02:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa9b852df 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07  
							
							
							
						 
						
							2024-08-02 12:25:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									おさむのひと 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bae2ecabd 
								
							 
						 
						
							
							
								
								fix(misskey-js): モデログのフィルタに追加漏れがあったのを修正 ( #14328 )  
							
							
							
						 
						
							2024-07-30 18:37:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sayamame-beans 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d8eda14a2 
								
							 
						 
						
							
							
								
								[Re] refactor(misskey-js): 警告をすべて解決 ( #14277 )  
							
							... 
							
							
							
							* chore(misskey-js): Unchanged files with check annotationsで紛らわしい部分の警告を抑制 ロジック面は後で直す
* dummy change to see if the feature do not report them (to be reverted after the check)
* refactor: 型合わせ
* refactor: fix warnings from c22dd6358ba4e068c49be033a07d9fbb001f2347
* lint
* 型合わせ
* キャスト
* pnpm build-misskey-js-with-types
* Revert "dummy change to see if the feature do not report them (to be reverted after the check)"
This reverts commit 67072e3ca6e3e16342ca3b35feadcb41afcbe04f.
* eliminate reversiGame any
* move reversiGame types
* lint
* Update packages/misskey-js/src/streaming.ts
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
* Update acct.ts
* run api extractor
* re-run api extractor
---------
Co-authored-by: Kisaragi Marine <kisaragi.effective@gmail.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> 
							
						 
						
							2024-07-25 16:40:14 +09: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								3372e0ffe1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/release/2024.5.0' into future  
							
							
							
						 
						
							2024-05-31 12:26:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0b47999fa 
								
							 
						 
						
							
							
								
								fix(backend): read:admin:show-user と read:admin:show-users を統合 ( #13798 )  
							
							... 
							
							
							
							* fix(frontend): 同じdisplayNameの権限があるのを修正
* read:admin:show-user と read:admin:show-users を統合
* Update Changelog 
							
						 
						
							2024-05-23 17:29:59 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								4a13508da0 
								
							 
						 
						
							
							
								
								Note Edited notification type  
							
							
							
						 
						
							2024-02-20 15:10:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a9f61a6c0 
								
							 
						 
						
							
							
								
								fix: typecheck  
							
							
							
						 
						
							2023-12-28 12:52:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chocolate Pie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82822e29d9 
								
							 
						 
						
							
							
								
								Merge pull request from GHSA-7pxq-6xx9-xpgm  
							
							... 
							
							
							
							* fix: fix improper authorization when accessing with third-party application
* refactor: refactor type definitions
* fix: get rid of unnecessary access limitation
* enhance: サードパーティアプリケーションがWebsocket APIを使えるように
* fix: add missing parentheses
* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"
This reverts commit 5150053275 
							
						 
						
							2023-12-28 09:45:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chocolate Pie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c96bc36fed 
								
							 
						 
						
							
							
								
								Merge pull request from GHSA-7pxq-6xx9-xpgm  
							
							... 
							
							
							
							* fix: fix improper authorization when accessing with third-party application
* refactor: refactor type definitions
* fix: get rid of unnecessary access limitation
* enhance: サードパーティアプリケーションがWebsocket APIを使えるように
* fix: add missing parentheses
* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"
This reverts commit 5150053275 
							
						 
						
							2023-12-27 15:08:59 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								5db583a3eb 
								
							 
						 
						
							
							
								
								merge: upstream  
							
							
							
						 
						
							2023-12-23 02:09:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15b0d2aff2 
								
							 
						 
						
							
							
								
								enhance: ロールにアサインされたときの通知 ( #12607 )  
							
							... 
							
							
							
							* wip
* Update misskey-js.api.md
* Update CHANGELOG.md
* Update RoleService.ts
* Update locales/ja-JP.yml
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* Update UserListService.ts
* Update misskey-js.api.md
* fix (#12724 )
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com> 
							
						 
						
							2023-12-21 10:39:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zawa-ch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e2d802967 
								
							 
						 
						
							
							
								
								enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように ( #12702 )  
							
							... 
							
							
							
							* Enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12072 )
* refactor: crowdin 編集部分のコミットを打ち消し
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158 
* refactor: オブジェクトの名前修正
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158 
* fix: 設定項目の説明を削除
名称が具体的になって必要なくなったため
https://github.com/misskey-dev/misskey/pull/12702#discussion_r1429932463  
							
						 
						
							2023-12-18 20:59:20 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								b65fd34981 
								
							 
						 
						
							
							
								
								tweak of  2b6f789a5b 
							
							
							
						 
						
							2023-11-19 10:18:57 +09: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 
								
							 
						 
						
							
							
							
							
								
							
							
								4f20c87186 
								
							 
						 
						
							
							
								
								lint fixes  
							
							
							
						 
						
							2023-10-09 13:32:41 +09: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								9771f1c435 
								
							 
						 
						
							
							
								
								enhance: improve moderation log  
							
							
							
						 
						
							2023-09-29 13:26:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								19a643ac70 
								
							 
						 
						
							
							
								
								enhance: improve moderation log  
							
							
							
						 
						
							2023-09-28 12:35:40 +02:00