Merge 12a0e1e433 into 763c708253

Fix(backend): アカウント削除のモデレーションログが動作していないのを修正 (#14996 ) (#14997 )
* アカウント削除のモデレーションログが動作していないのを修正 * update CHANGELOG
2024-11-19 22:24:28 +09:00 · 2024-11-19 21:12:40 +09:00 · 2024-01-24 12:38:32 +09:00 · 2024-01-08 15:07:53 +09:00 · 2024-01-02 22:39:25 +09:00 · 2023-12-31 11:57:46 +09:00
4 changed files with 10 additions and 11 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -64,6 +64,7 @@
 - Fix: FTT無効時にユーザーリストタイムラインが使用できない問題を修正  
  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/709)
 - Fix: User Webhookテスト機能のMock Payloadを修正  
+- Fix: アカウント削除のモデレーションログが動作していないのを修正 (#14996)  

 ### Misskey.js
 - Fix: Stream初期化時、別途WebSocketを指定する場合の型定義を修正
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@ -46,7 +46,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('cannot delete a root account');
 			}

-			await this.deleteAccoountService.deleteAccount(user);
+			await this.deleteAccoountService.deleteAccount(user, me);
 		});
 	}
 }
--- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts
+++ b/packages/backend/src/server/api/endpoints/admin/delete-account.ts
@ -33,13 +33,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-

 		private deleteAccountService: DeleteAccountService,
 	) {
-		super(meta, paramDef, async (ps) => {
+		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneByOrFail({ id: ps.userId });
 			if (user.isDeleted) {
 				return;
 			}

-			await this.deleteAccountService.deleteAccount(user);
+			await this.deleteAccountService.deleteAccount(user, me);
 		});
 	}
 }
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@ -1319,19 +1319,16 @@ html[data-color-scheme=light] .preview {

 .footerLeft {
 	flex: 1;
-	display: grid;
-	grid-auto-flow: row;
-	grid-template-columns: repeat(auto-fill, minmax(42px, 1fr));
-	grid-auto-rows: 40px;
+	display: flex;
+	height: 40px;
+	overflow: auto;
 }

 .footerRight {
 	flex: 0;
 	margin-left: auto;
-	display: grid;
-	grid-auto-flow: row;
-	grid-template-columns: repeat(auto-fill, minmax(42px, 1fr));
-	grid-auto-rows: 40px;
+	display: flex;
+	height: 40px;
 	direction: rtl;
 }

@ -1341,6 +1338,7 @@ html[data-color-scheme=light] .preview {
 	margin: 0;
 	font-size: 1em;
 	width: auto;
+	min-width: 42px;
 	height: 100%;
 	border-radius: 6px;
Author	SHA1	Message	Date
1Step621	925313c926	Merge `12a0e1e433` into `763c708253`	2024-11-19 22:24:28 +09:00
zawa-ch.	763c708253	Fix(backend): アカウント削除のモデレーションログが動作していないのを修正 (#14996 ) (#14997 ) * アカウント削除のモデレーションログが動作していないのを修正 * update CHANGELOG	2024-11-19 21:12:40 +09:00
1Step621	12a0e1e433	Merge branch 'develop' of github.com:misskey-dev/misskey into fix/postform-footer-button-overflow	2024-01-24 12:38:32 +09:00
1Step621	b5d676ae7b	Merge branch 'develop' into fix/postform-footer-button-overflow	2024-01-08 15:07:53 +09:00
1Step621	bc66732e07	Merge branch 'develop' into fix/postform-footer-button-overflow	2024-01-02 22:39:25 +09:00
1Step621	968e56ad4b	Merge branch 'develop' into fix/postform-footer-button-overflow	2023-12-31 11:57:46 +09:00
1Step621	deef213855	Merge branch 'develop' of github.com:misskey-dev/misskey into fix/postform-footer-button-overflow	2023-12-28 15:23:27 +09:00
1Step621	b77b564fa1	幅の狭い端末でMkPostFormの下部ボタンがオーバーフローするのを修正	2023-12-28 15:23:03 +09:00