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

packages/backend/src/server/api/endpoints/i/notifications.ts

@@ -13,7 +13,7 @@ export const meta = {
 
 	limit: {
 		duration: 60000,
-		max: 10,
+		max: 15,
 	},
 
 	kind: 'read:notifications',

packages/client/src/components/renote-button.vue

@@ -1,5 +1,6 @@
 <template>
-<button v-if="canRenote"
+<button
+	v-if="canRenote"
 	ref="buttonRef"
 	class="eddddedb _button canRenote"
 	@click="renote()"
@@ -12,8 +13,9 @@
 </button>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, ref } from 'vue';
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import * as misskey from 'misskey-js';
 import XDetails from '@/components/users-tooltip.vue';
 import { pleaseLogin } from '@/scripts/please-login';
 import * as os from '@/os';
@@ -21,19 +23,11 @@ import { $i } from '@/account';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { i18n } from '@/i18n';
 
-export default defineComponent({
-	props: {
-		count: {
-			type: Number,
-			required: true,
-		},
-		note: {
-			type: Object,
-			required: true,
-		},
-	},
+const props = defineProps<{
+	note: misskey.entities.Note;
+	count: number;
+}>();
 
-	setup(props) {
 const buttonRef = ref<HTMLElement>();
 
 const canRenote = computed(() => ['public', 'home'].includes(props.note.visibility) || props.note.userId === $i.id);
@@ -41,7 +35,7 @@ export default defineComponent({
 useTooltip(buttonRef, async (showing) => {
 	const renotes = await os.api('notes/renotes', {
 		noteId: props.note.id,
-				limit: 11
+		limit: 11,
 	});
 
 	const users = renotes.map(x => x.user);
@@ -52,7 +46,7 @@ export default defineComponent({
 		showing,
 		users,
 		count: props.count,
-				targetElement: buttonRef.value
+		targetElement: buttonRef.value,
 	}, {}, 'closed');
 });
 
@@ -63,9 +57,9 @@ export default defineComponent({
 		icon: 'fas fa-retweet',
 		action: () => {
 			os.api('notes/create', {
-						renoteId: props.note.id
+				renoteId: props.note.id,
 			});
-				}
+		},
 	}, {
 		text: i18n.ts.quote,
 		icon: 'fas fa-quote-right',
@@ -73,19 +67,11 @@ export default defineComponent({
 			os.post({
 				renote: props.note,
 			});
-				}
-			}], buttonRef.value, {
-				viaKeyboard
-			});
-		};
-
-		return {
-			buttonRef,
-			canRenote,
-			renote,
-		};
 		},
+	}], buttonRef.value, {
+		viaKeyboard,
 	});
+};
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/sparkle.vue

@@ -63,17 +63,14 @@
 </span>
 </template>
 
-<script lang="ts">
-import { defineComponent, onMounted, onUnmounted, ref } from 'vue';
-import * as os from '@/os';
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
 
-export default defineComponent({
-	setup() {
 const particles = ref([]);
 const el = ref<HTMLElement>();
 const width = ref(0);
 const height = ref(0);
-		const colors = ['#eb6f92', '#9ccfd8', '#f6c177', '#f6c177', '#ebbcba'];
+const colors = ['#eb6f92', '#9ccfd8', '#f6c177', '#f6c177', '#f6c177'];
 let stop = false;
 let ro: ResizeObserver | undefined;
 
@@ -112,15 +109,6 @@ export default defineComponent({
 	if (ro) ro.disconnect();
 	stop = true;
 });
-
-		return {
-			el,
-			width,
-			height,
-			particles,
-		};
-	},
-});
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/tab.vue

@@ -18,13 +18,13 @@ export default defineComponent({
 			disabled: this.modelValue === option.props.value,
 			onClick: () => {
 				this.$emit('update:modelValue', option.props.value);
-			}
+			},
 		}, option.children), [
-			[resolveDirective('click-anime')]
+			[resolveDirective('click-anime')],
 		]))), [
-			[resolveDirective('size'), { max: [500] }]
+			[resolveDirective('size'), { max: [500] }],
 		]);
-	}
+	},
 });
 </script>
 

packages/client/src/components/ui/button.vue

@@ -141,7 +141,7 @@ export default defineComponent({
 	display: block;
 	min-width: 100px;
 	width: max-content;
-	padding: 8px 14px;
+	padding: 8px 16px;
 	text-align: center;
 	font-weight: normal;
 	font-size: 1em;

packages/client/src/pages/share.vue

@@ -1,7 +1,7 @@
 <template>
-<div class="">
-	<section class="_section">
-		<div class="_content">
+<MkStickyContainer>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<MkSpacer :content-max="800">
 		<XPostForm
 			v-if="state === 'writing'"
 			fixed
@@ -17,9 +17,8 @@
 			@posted="state = 'posted'"
 		/>
 		<MkButton v-else-if="state === 'posted'" primary class="close" @click="close()">{{ i18n.ts.close }}</MkButton>
-		</div>
-	</section>
-</div>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>

packages/client/src/pages/tag.vue

@@ -1,7 +1,10 @@
 <template>
-<div class="_section">
+<MkStickyContainer>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<MkSpacer :content-max="800">
 		<XNotes class="_content" :pagination="pagination"/>
-</div>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>

packages/client/src/ui/universal.vue

@@ -70,6 +70,7 @@ import { $i } from '@/account';
 import { Router } from '@/nirax';
 import { mainRouter } from '@/router';
 import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
+import { deviceKind } from '@/scripts/device-kind';
 const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
 const XSidebar = defineAsyncComponent(() => import('@/ui/_common_/navbar.vue'));
 const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
@@ -77,10 +78,11 @@ const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.
 const DESKTOP_THRESHOLD = 1100;
 const MOBILE_THRESHOLD = 500;
 
+// デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
 const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
-const isMobile = ref(window.innerWidth <= MOBILE_THRESHOLD);
+const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
 window.addEventListener('resize', () => {
-	isMobile.value = window.innerWidth <= MOBILE_THRESHOLD;
+	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();