Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	package.json
#	packages/frontend/src/components/MkDrive.file.vue
#	packages/frontend/src/components/MkNote.vue

packages/frontend/src/components/MkCwButton.vue

@@ -4,10 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<button class="_button" :class="$style.root" @mousedown="toggle">
-	<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
-	<span v-if="!modelValue" :class="$style.label">{{ label }}</span>
-</button>
+<MkButton rounded full small @click="toggle"><b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b><span v-if="!modelValue" :class="$style.label">{{ label }}</span></MkButton>
 </template>
 
 <script lang="ts" setup>
@@ -15,6 +12,7 @@ import { computed } from 'vue';
 import * as Misskey from 'misskey-js';
 import { concat } from '@/scripts/array.js';
 import { i18n } from '@/i18n.js';
+import MkButton from '@/components/MkButton.vue';
 
 const props = defineProps<{
 	modelValue: boolean;
@@ -33,25 +31,12 @@ const label = computed(() => {
 	] as string[][]).join(' / ');
 });
 
-const toggle = () => {
+function toggle() {
 	emit('update:modelValue', !props.modelValue);
-};
+}
 </script>
 
 <style lang="scss" module>
-.root {
-	display: inline-block;
-	padding: 4px 8px;
-	font-size: 0.7em;
-	color: var(--cwFg);
-	background: var(--cwBg);
-	border-radius: 2px;
-
-	&:hover {
-		background: var(--cwHoverBg);
-	}
-}
-
 .label {
 	margin-left: 4px;
 

packages/frontend/src/components/MkDrive.file.vue

@@ -45,9 +45,12 @@ import bytes from '@/filters/bytes.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/account.js';
+import { useRouter } from '@/router.js';
 import { getDriveFileMenu, getDriveMultiFileMenu } from '@/scripts/get-drive-file-menu.js';
 import { isTouchUsing } from '@/scripts/touch.js';
 
+const router = useRouter();
+
 const props = withDefaults(defineProps<{
 	file: Misskey.entities.DriveFile;
 	folder: Misskey.entities.DriveFolder | null;
@@ -84,6 +87,8 @@ function onClick(ev: MouseEvent) {
 		os.popupMenu(getDriveMultiFileMenu(props.SelectFiles), (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
 	} else if (isTouchUsing && !isSelectedFile.value && props.SelectFiles.length === 0) {
     os.popupMenu(getDriveFileMenu(props.file, props.folder), (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
+	}else {
+		router.push(`/my/drive/file/${props.file.id}`);
 	}
 }
 

packages/frontend/src/components/MkNote.vue

@@ -65,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p v-if="appearNote.cw != null" :class="$style.cw">
 						<Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user"
 								 :i="$i"/>
-						<MkCwButton v-model="showContent" :note="appearNote"/>
+						<MkCwButton v-model="showContent" :note="appearNote" style="margin: 4px 0;"/>
 					</p>
 					<div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
 						<div :class="$style.text">
@@ -190,7 +190,6 @@ const props = defineProps<{
 
 const inChannel = inject('inChannel', null);
 const currentClip = inject<Ref<Misskey.entities.Clip> | null>('currentClip', null);
-;
 let note = $ref(deepClone(props.note));
 
 // plugin