update

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-beta1-mattyatea5",
+	"version": "2024.5.0-beta1-mattyatea6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/migration/1715787239605-loginbonus.js

@@ -1,11 +0,0 @@
-import {Column} from "typeorm";
-
-export class Loginbonus1715787239605 {
-    name = 'Loginbonus1715787239605'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "getPoints"`);    }
-
-    async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user_profile" ADD "getPoints" integer NOT NULL DEFAULT '0'`);     }
-}

packages/frontend/src/components/MkEmojiEditDialog.vue

@@ -75,7 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						{{ i18n.ts.isNotifyIsHome }}
 					</MkSwitch>
 				</div>
-				<div v-if="imgUrl">
+				<div v-if="imgUrl" style="width: 30%">
 					<MkInput v-model="text">
 						<template #label>テスト文章</template>
 					</MkInput><br/>

packages/frontend/src/scripts/get-user-menu.ts

@@ -81,6 +81,18 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 		});
 	}
 
+	async function toggleBlockAndMute() {
+		if (user.isBlocking && user.isMuted || !user.isBlocking && !user.isMuted) {
+			toggleMute();
+			toggleBlock();
+		}
+		if (user.isMuted && !user.isBlocking) {
+			toggleMute();
+		} else if (!user.isMuted && user.isBlocking) {
+			toggleBlock();
+		}
+	}
+
 	async function toggleWithReplies() {
 		os.apiWithDialog('following/update', {
 			userId: user.id,
@@ -327,6 +339,10 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 			icon: 'ti ti-ban',
 			text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block,
 			action: toggleBlock,
+		}, {
+			icon: 'ti ti-user-off',
+			text: user.isBlocking || user.isMuted ? i18n.ts.unblock + '&' + i18n.ts.unmute : i18n.ts.block + '&' + i18n.ts.mute,
+			action: toggleBlockAndMute,
 		}]);
 
 		if (user.isFollowed) {