Merge remote-tracking branch 'upstream/develop' into Dockerfile-optimization

.woodpecker/dockerHubRelease.yml

@@ -11,10 +11,5 @@ pipeline:
       password:
         # Secret 'docker_password' needs to be set in the CI settings
         from_secret: docker_password
-    when:
-      # Push new version of tag latest if new push on main-branch
-      event: push
-      branch: main
 
-depends_on:
+branch: main
-  - prSecurityCheck

.woodpecker/dockerHubTag.yml

@@ -17,5 +17,3 @@ pipeline:
       event: tag
       tag: v*
 
-depends_on:
-  - prSecurityCheck

README.md

@@ -11,7 +11,7 @@
 [![translate-badge](https://hosted.weblate.org/widgets/calckey/-/svg-badge.svg)](https://hosted.weblate.org/engage/calckey/)
 [![docker badge](https://img.shields.io/docker/pulls/thatonecalculator/calckey?logo=docker)](https://hub.docker.com/r/thatonecalculator/calckey)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](./CODE_OF_CONDUCT.md)
-[![lavaforge badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-lavaforge-FF8066.svg?logo=lavaforge&logoColor=white)](https://codeberg.org/calckey/calckey/)
+[![Codeberg badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-codeberg-4793CC.svg?logo=codeberg&logoColor=white)](https://codeberg.org/calckey/calckey/)
 
 </div>
 
@@ -45,7 +45,7 @@
 
 - 💸 Liberapay: <https://liberapay.com/ThatOneCalculator>
   - Donate publicly to get your name on the Patron list!
-- 🚢 Flagship instance: <https://i.calckey.cloud>
+- 🚢 Flagship instance: <https://calckey.social>
 - 📣 Official account: <https://i.calckey.cloud/@calckey>
 - 💁 Matrix support room: <https://matrix.to/#/#calckey:matrix.fedibird.com>
 - 📜 Instance list: <https://calckey.fediverse.observer/list>

locales/de-DE.yml

@@ -1,7 +1,7 @@
 ---
 _lang_: "Deutsch"
-headlineMisskey: "Ein durch Notizen verbundenes Netzwerk"
+headlineMisskey: "Ein durch Posts verbundenes Netzwerk"
-introMisskey: "Willkommen! Misskey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Notizen“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Notizen anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
+introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
 monthAndDay: "{day}.{month}."
 search: "Suchen"
 notifications: "Benachrichtigungen"

locales/en-US.yml

@@ -816,6 +816,7 @@ lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
 breakFollow: "Remove follower"
+breakFollowConfirm: "Are you sure want to remove follower?"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"

locales/ja-JP.yml

@@ -816,6 +816,7 @@ lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
 breakFollow: "フォロワーを解除"
+breakFollowConfirm: "フォロワー解除しますか？"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "calckey",
-	"version": "13.0.9-rc",
+	"version": "13.1.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@7.26.0",
+	"packageManager": "pnpm@7.26.3",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

packages/backend/src/misc/nyaize.ts

@@ -2,9 +2,9 @@ export function nyaize(text: string): string {
 	return (
 		text
 			// ja-JP
-			.replace(/な/g, "にゃ")
+			.replaceAll("な", "にゃ")
-			.replace(/ナ/g, "ニャ")
+			.replaceAll("ナ", "ニャ")
-			.replace(/ﾅ/g, "ﾆｬ")
+			.replaceAll("ﾅ", "ﾆｬ")
 			// en-US
 			.replace(/(?<=n)a/gi, (x) => (x === "A" ? "YA" : "ya"))
 			.replace(/(?<=morn)ing/gi, (x) => (x === "ING" ? "YAN" : "yan"))

packages/backend/src/misc/reaction-lib.ts

@@ -35,6 +35,12 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
 			} else {
 				_reactions[legacies[reaction]] = reactions[reaction];
 			}
+		} else if (reaction === "♥️") {
+			if (_reactions["❤️"]) {
+				_reactions["❤️"] += reactions[reaction];
+			} else {
+				_reactions["❤️"] = reactions[reaction];
+			}
 		} else {
 			if (_reactions[reaction]) {
 				_reactions[reaction] += reactions[reaction];
@@ -61,14 +67,16 @@ export async function toDbReaction(
 
 	reacterHost = toPunyNullable(reacterHost);
 
-	// 文字列タイプのリアクションを絵文字に変換
+	// Convert string-type reactions to unicode
 	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
+	// Convert old heart to new
+	if (reaction === "♥️") return "❤️";
 
-	// Unicode絵文字
+	// Allow unicode reactions
 	const match = emojiRegex.exec(reaction);
 	if (match) {
 		const unicode = match[0];
-		return unicode.match("\u200d") ? unicode : unicode.replace(/\ufe0f/g, "");
+		return unicode;
 	}
 
 	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);

packages/backend/src/server/api/endpoints/notes/search-by-tag.ts

@@ -93,7 +93,7 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	try {
 		if (ps.tag) {
-			if (!safeForSql(ps.tag)) throw new Error("Injection");
+			if (!safeForSql(normalizeForSearch(ps.tag))) throw "Injection";
 			query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
 		} else {
 			query.andWhere(
@@ -102,7 +102,8 @@ export default define(meta, paramDef, async (ps, me) => {
 						qb.orWhere(
 							new Brackets((qb) => {
 								for (const tag of tags) {
-									if (!safeForSql(tag)) throw new Error("Injection");
+									if (!safeForSql(normalizeForSearch(ps.tag)))
+										throw "Injection";
 									qb.andWhere(`'{"${normalizeForSearch(tag)}"}' <@ note.tags`);
 								}
 							}),

packages/backend/src/server/file/send-drive-file.ts

@@ -11,11 +11,7 @@ import { InternalStorage } from "@/services/drive/internal-storage.js";
 import { createTemp } from "@/misc/create-temp.js";
 import { downloadUrl } from "@/misc/download-url.js";
 import { detectType } from "@/misc/get-file-info.js";
-import {
+import { convertToWebp } from "@/services/drive/image-processor.js";
-	convertToWebp,
-	convertToJpeg,
-	convertToPng,
-} from "@/services/drive/image-processor.js";
 import { GenerateVideoThumbnail } from "@/services/drive/generate-video-thumbnail.js";
 import { StatusError } from "@/misc/fetch.js";
 import { FILE_TYPE_BROWSERSAFE } from "@/const.js";
@@ -77,7 +73,7 @@ export default async function (ctx: Koa.Context) {
 								"image/avif",
 							].includes(mime)
 						) {
-							return await convertToWebp(path, 498, 280);
+							return await convertToWebp(path, 996, 560);
 						} else if (mime.startsWith("video/")) {
 							return await GenerateVideoThumbnail(path);
 						}
@@ -85,7 +81,7 @@ export default async function (ctx: Koa.Context) {
 
 					if (isWebpublic) {
 						if (["image/svg+xml"].includes(mime)) {
-							return await convertToPng(path, 2048, 2048);
+							return await convertToWebp(path, 2048, 2048, 100);
 						}
 					}
 

packages/backend/src/server/proxy/proxy-media.ts

@@ -31,9 +31,9 @@ export async function proxyMedia(ctx: Koa.Context) {
 		let image: IImage;
 
 		if ("static" in ctx.query && isConvertibleImage) {
-			image = await convertToWebp(path, 498, 280);
+			image = await convertToWebp(path, 996, 560);
 		} else if ("preview" in ctx.query && isConvertibleImage) {
-			image = await convertToWebp(path, 200, 200);
+			image = await convertToWebp(path, 400, 400);
 		} else if ("badge" in ctx.query) {
 			if (!isConvertibleImage) {
 				// 画像でないなら404でお茶を濁す

packages/backend/src/server/web/views/note.pug

@@ -5,6 +5,9 @@ block vars
 	- const title = privateMode ? instanceName : (user.name ? `${user.name} (@${user.username})` : `@${user.username}`);
 	- const url = `${config.url}/notes/${note.id}`;
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
+	- const isImage = note.files.length !== 0 && note.files[0].type.startsWith('image');
+	- const isVideo = note.files.length !== 0 && note.files[0].type.startsWith('video');
+	- const imageUrl = isImage ? note.files[0].url : isVideo ? note.files[0].thumbnailUrl : avatarUrl; 
 
 block title
 	= `${title} | ${instanceName}`
@@ -19,7 +22,15 @@ block og
 		meta(property='og:title'       content= title)
 		meta(property='og:description' content= summary)
 		meta(property='og:url'         content= url)
-		meta(property='og:image'       content= avatarUrl)
+		meta(property='og:image'       content= imageUrl)
+		if isImage 
+			meta(property='og:image:width'     content=note.files[0].properties.width)
+			meta(property='og:image:height'    content=note.files[0].properties.height)
+			meta(property='og:image:type'      content=note.files[0].type)
+			meta(property='twitter:card'       content="summary_large_image")
+		if isVideo
+			meta(property='og:video:type'      content=note.files[0].type)
+			meta(property='og:video'           content=note.files[0].url)
 
 block meta
 	unless privateMode

packages/backend/src/services/drive/add-file.ts

@@ -30,11 +30,7 @@ import { IdentifiableError } from "@/misc/identifiable-error.js";
 import { getS3 } from "./s3.js";
 import { InternalStorage } from "./internal-storage.js";
 import type { IImage } from "./image-processor.js";
-import {
+import { convertSharpToWebp } from "./image-processor.js";
-	convertSharpToJpeg,
-	convertSharpToWebp,
-	convertSharpToPng,
-} from "./image-processor.js";
 import { driveLogger } from "./logger.js";
 import { GenerateVideoThumbnail } from "./generate-video-thumbnail.js";
 import { deleteFile } from "./delete-file.js";
@@ -75,8 +71,8 @@ async function save(
 			if (type === "image/vnd.mozilla.apng") ext = ".apng";
 		}
 
-		// 拡張子からContent-Typeを設定してそうな挙動を示すオブジェクトストレージ (upcloud?) も存在するので、
+		// Some cloud providers (notably upcloud) will infer the content-type based
-		// 許可されているファイル形式でしか拡張子をつけない
+		// on extension, so we remove extensions from non-browser-safe types.
 		if (!FILE_TYPE_BROWSERSAFE.includes(type)) {
 			ext = "";
 		}
@@ -282,13 +278,13 @@ export async function generateAlts(
 
 		try {
 			if (["image/jpeg"].includes(type)) {
-				webpublic = await convertSharpToJpeg(img, 2048, 2048);
+				webpublic = await convertSharpToWebp(img, 2048, 2048);
 			} else if (["image/webp"].includes(type)) {
-				webpublic = await convertSharpToPng(img, 2048, 2048);
+				webpublic = await convertSharpToWebp(img, 2048, 2048);
 			} else if (["image/png"].includes(type)) {
-				webpublic = await convertSharpToPng(img, 2048, 2048);
+				webpublic = await convertSharpToWebp(img, 2048, 2048, 100);
 			} else if (["image/svg+xml"].includes(type)) {
-				webpublic = await convertSharpToPng(img, 2048, 2048);
+				webpublic = await convertSharpToWebp(img, 2048, 2048);
 			} else {
 				logger.debug("web image not created (not an required image)");
 			}
@@ -315,7 +311,7 @@ export async function generateAlts(
 				"image/avif",
 			].includes(type)
 		) {
-			thumbnail = await convertSharpToWebp(img, 498, 280);
+			thumbnail = await convertSharpToWebp(img, 996, 560);
 		} else {
 			logger.debug("thumbnail not created (not an required file)");
 		}

packages/backend/src/services/drive/generate-video-thumbnail.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
 import { createTempDir } from "@/misc/create-temp.js";
 import type { IImage } from "./image-processor.js";
-import { convertToJpeg } from "./image-processor.js";
+import { convertToWebp } from "./image-processor.js";
 import FFmpeg from "fluent-ffmpeg";
 
 export async function GenerateVideoThumbnail(source: string): Promise<IImage> {
@@ -22,8 +22,7 @@ export async function GenerateVideoThumbnail(source: string): Promise<IImage> {
 				});
 		});
 
-		// JPEGに変換 (Webpでもいいが、MastodonはWebpをサポートせず表示できなくなる)
+		return await convertToWebp(`${dir}/out.png`, 996, 560);
-		return await convertToJpeg(`${dir}/out.png`, 498, 280);
 	} finally {
 		cleanup();
 	}

packages/backend/src/services/drive/image-processor.ts

@@ -6,42 +6,6 @@ export type IImage = {
 	type: string;
 };
 
-/**
- * Convert to JPEG
- *   with resize, remove metadata, resolve orientation, stop animation
- */
-export async function convertToJpeg(
-	path: string,
-	width: number,
-	height: number,
-): Promise<IImage> {
-	return convertSharpToJpeg(await sharp(path), width, height);
-}
-
-export async function convertSharpToJpeg(
-	sharp: sharp.Sharp,
-	width: number,
-	height: number,
-): Promise<IImage> {
-	const data = await sharp
-		.resize(width, height, {
-			fit: "inside",
-			withoutEnlargement: true,
-		})
-		.rotate()
-		.jpeg({
-			quality: 85,
-			progressive: true,
-		})
-		.toBuffer();
-
-	return {
-		data,
-		ext: "jpg",
-		type: "image/jpeg",
-	};
-}
-
 /**
  * Convert to WebP
  *   with resize, remove metadata, resolve orientation, stop animation
@@ -78,36 +42,3 @@ export async function convertSharpToWebp(
 		type: "image/webp",
 	};
 }
-
-/**
- * Convert to PNG
- *   with resize, remove metadata, resolve orientation, stop animation
- */
-export async function convertToPng(
-	path: string,
-	width: number,
-	height: number,
-): Promise<IImage> {
-	return convertSharpToPng(await sharp(path), width, height);
-}
-
-export async function convertSharpToPng(
-	sharp: sharp.Sharp,
-	width: number,
-	height: number,
-): Promise<IImage> {
-	const data = await sharp
-		.resize(width, height, {
-			fit: "inside",
-			withoutEnlargement: true,
-		})
-		.rotate()
-		.png()
-		.toBuffer();
-
-	return {
-		data,
-		ext: "png",
-		type: "image/png",
-	};
-}

packages/backend/src/services/following/create.ts

@@ -209,12 +209,12 @@ export default async function (
 		await Blockings.delete(blocking.id);
 	} else {
 		// それ以外は単純に例外
-		if (blocking != null)
+		if (blocking)
 			throw new IdentifiableError(
 				"710e8fb0-b8c3-4922-be49-d5d93d8e6a6e",
 				"blocking",
 			);
-		if (blocked != null)
+		if (blocked)
 			throw new IdentifiableError(
 				"3338392a-f764-498d-8855-db939dcf8c48",
 				"blocked",

packages/backend/src/services/following/requests/create.ts

@@ -38,8 +38,8 @@ export default async function (
 		}),
 	]);
 
-	if (blocking != null) throw new Error("blocking");
+	if (blocking) throw new Error("blocking");
-	if (blocked != null) throw new Error("blocked");
+	if (blocked) throw new Error("blocked");
 
 	const followRequest = await FollowRequests.insert({
 		id: genId(),

packages/client/package.json

@@ -75,7 +75,7 @@
 		"twemoji-parser": "14.0.0",
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
-		"vite": "^4.0.4",
+		"vite": "^4.1.0-beta.1",
 		"vue": "3.2.45",
 		"vue-isyourpasswordsafe": "^2.0.0",
 		"vue-plyr": "^7.0.0",

packages/client/src/components/MkCheatSheetDialog.vue

@@ -0,0 +1,46 @@
+<template>
+<XModalWindow
+	ref="dialog"
+	:width="600"
+	@close="dialog?.close()"
+	@closed="$emit('closed')"
+>
+	<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
+
+	<div class="_monolithic_">
+		<div class="_section">
+			<XCheatSheet/>
+		</div>
+	</div>
+</XModalWindow>
+</template>
+
+<script lang="ts" setup>
+import XModalWindow from '@/components/MkModalWindow.vue';
+import XCheatSheet from '@/pages/mfm-cheat-sheet.vue';
+import { i18n } from '@/i18n';
+
+const emit = defineEmits<{
+	(ev: 'done'): void;
+	(ev: 'closed'): void;
+}>();
+
+const dialog = $ref<InstanceType<typeof XModalWindow>>();
+
+function close(res) {
+	dialog.close();
+}
+</script>
+
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.2s ease-in-out;
+}
+.fade-enter-from,
+.fade-leave-to {
+	opacity: 0;
+}
+
+</style>
+

packages/client/src/components/MkEmojiPicker.vue

@@ -316,7 +316,7 @@ function done(query?: any): boolean | void {
 	if (query == null) query = q.value;
 	if (query == null || typeof query !== 'string') return;
 
-	const q2 = query.replace(/:/g, '');
+	const q2 = query.replaceAll(':', '');
 	const exactMatchCustom = customEmojis.find(emoji => emoji.name === q2);
 	if (exactMatchCustom) {
 		chosen(exactMatchCustom);

packages/client/src/components/MkImgWithBlurhash.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="xubzgfgb" :class="{ cover }" :title="title">
 	<canvas v-if="!loaded" ref="canvas" :width="size" :height="size" :title="title"/>
-	<img v-if="src" :src="src" :title="title" :alt="alt" @load="onLoad"/>
+	<img v-if="src" :src="src" :title="title" :type="type" :alt="alt" @load="onLoad"/>
 </div>
 </template>
 
@@ -13,11 +13,13 @@ const props = withDefaults(defineProps<{
 	src?: string | null;
 	hash?: string;
 	alt?: string;
+	type?: string | null;
 	title?: string | null;
 	size?: number;
 	cover?: boolean;
 }>(), {
 	src: null,
+	type: null,
 	alt: '',
 	title: null,
 	size: 64,

packages/client/src/components/MkInstanceTicker.vue

@@ -31,7 +31,7 @@ const computedStyle = getComputedStyle(document.documentElement);
 const themeColor = instance.themeColor ?? computedStyle.getPropertyValue('--bg');
 
 const bg = {
-	background: `linear-gradient(90deg, ${themeColor}, ${themeColor}33)`,
+	background: `linear-gradient(90deg, ${themeColor}, ${themeColor}55)`,
 };
 
 function getInstanceIcon(instance): string {
@@ -41,11 +41,15 @@ function getInstanceIcon(instance): string {
 
 <style lang="scss" scoped>
 .hpaizdrt {
+	display: flex;
+	align-items: center;
+	height: 1.1em;
 	display: flex;
 	align-items: center;
 	height: 1.1em;
 	justify-self: flex-end;
 	padding: .2em .4em;
+	padding: .2em .4em;
 	border-radius: 100px;
 	font-size: .8em;
 	text-shadow: 0 2px 2px var(--shadow);
@@ -54,6 +58,10 @@ function getInstanceIcon(instance): string {
 		width: max-content;
 		max-width: 100%;
 	}
+	.header > .body & {
+		width: max-content;
+		max-width: 100%;
+	}
 
 	> .icon {
 		height: 100%;
@@ -61,17 +69,24 @@ function getInstanceIcon(instance): string {
 	}
 
 	> .name {
+		display: none;
 		display: none;
 		margin-left: 4px;
 		font-size: 0.85em;
+		font-size: 0.85em;
 		vertical-align: top;
 		font-weight: bold;
 		text-overflow: ellipsis;
 		white-space: nowrap;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 		text-shadow: -1px -1px 0 var(--bg), 1px -1px 0 var(--bg), -1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
 		.article > .main &, .header > .body & {
 			display: unset;
 		}
+		.article > .main &, .header > .body & {
+			display: unset;
+		}
 	}
 }
 </style>

packages/client/src/components/MkMediaImage.vue

@@ -13,7 +13,7 @@
 		:href="image.url"
 		:title="image.name"
 	>
-		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :title="image.comment" :cover="false"/>
+		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :type="image.type" :title="image.comment" :cover="false"/>
 		<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
 	</a>
 	<button v-tooltip="i18n.ts.hide" class="_button hide" @click="hide = true"><i class="ph-eye-slash-bold ph-lg"></i></button>

packages/client/src/components/MkMediaList.vue

@@ -143,6 +143,8 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 		position: relative;
 		width: 100%;
 		margin-top: 4px;
+		border-radius: var(--radius);
+		overflow: hidden;
 
 		&:before {
 			content: '';

packages/client/src/components/MkNote.vue

@@ -10,32 +10,35 @@
 	:class="{ renote: isRenote }"
 >
 	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" class="reply-to"/>
-	<div v-if="pinned" class="info"><i class="ph-push-pin-bold ph-lg"></i> {{ i18n.ts.pinnedNote }}</div>
+	<div class="note-context">
-	<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x-bold ph-lg"></i></button></div>
+		<div class="line"></div>
-	<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts.featured }}</div>
+		<div v-if="appearNote._prId_" class="info"><i class="ph-megaphone-simple-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x-bold ph-lg"></i></button></div>
-	<div v-if="isRenote" class="renote">
+		<div v-if="appearNote._featuredId_" class="info"><i class="ph-lightning-bold ph-lg"></i> {{ i18n.ts.featured }}</div>
-		<!-- <MkAvatar class="avatar" :user="note.user"/> -->
+		<div v-if="pinned" class="info"><i class="ph-push-pin-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}</div>
-		<i class="ph-repeat-bold ph-lg"></i>
+		<div v-if="isRenote" class="renote">
-		<I18n :src="i18n.ts.renotedBy" tag="span">
+			<i class="ph-repeat-bold ph-lg"></i>
-			<template #user>
+			<I18n :src="i18n.ts.renotedBy" tag="span">
-				<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
+				<template #user>
-					<MkUserName :user="note.user"/>
+					<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)">
-				</MkA>
+						<MkUserName :user="note.user"/>
-			</template>
+					</MkA>
-		</I18n>
+				</template>
-		<div class="info">
+			</I18n>
-			<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
+			<div class="info">
-				<i v-if="isMyRenote" class="ph-dots-three-outline-bold ph-lg dropdownIcon"></i>
+				<button ref="renoteTime" class="_button time" @click="showRenoteMenu()">
-				<MkTime :time="note.createdAt"/>
+					<i v-if="isMyRenote" class="ph-dots-three-outline-bold ph-lg dropdownIcon"></i>
-			</button>
+					<MkTime :time="note.createdAt"/>
-			<MkVisibility :note="note"/>
+				</button>
+				<MkVisibility :note="note"/>
+			</div>
 		</div>
 	</div>
 	<article class="article" @contextmenu.stop="onContextmenu" @click.self="router.push(notePage(appearNote))">
-		<MkAvatar class="avatar" :user="appearNote.user"/>
 		<div class="main" @click.self="router.push(notePage(appearNote))">
-			<XNoteHeader class="header" :note="appearNote" :mini="true"/>
+			<div class="header-container">
-			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
+				<MkAvatar class="avatar" :user="appearNote.user"/>
+				<XNoteHeader class="header" :note="appearNote" :mini="true"/>
+			</div>
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
@@ -43,7 +46,6 @@
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content" :class="{ collapsed, isLong }">
 					<div class="text" @click.self="router.push(notePage(appearNote))">
-						<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
 						<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
 						<div v-if="translating || translation" class="translation">
@@ -344,146 +346,138 @@ function readPromo() {
 		opacity: 1;
 	}
 
-	> .info {
-		display: flex;
-		align-items: center;
-		padding: 16px 32px 8px 32px;
-		line-height: 24px;
-		font-size: 90%;
-		white-space: pre;
-		color: #f6c177;
-
-		> i {
-			margin-right: 4px;
-		}
-
-		> .hide {
-			margin-left: auto;
-			color: inherit;
-		}
-	}
-
-	> .info + .article {
-		padding-top: 8px;
-	}
-
 	> .reply-to {
-		opacity: 0.7;
+		& + .note-context {
-		padding-bottom: 0;
+			.line::before {
+				content: "";
+				display: block;
+				margin-bottom: -10px;
+				width: 2px;
+				background-color: var(--divider);
+				margin-inline: auto;
+			}
+		}
 	}
 
-	> .renote {
+	.note-context {
+		padding: 0 32px 0 32px;
 		display: flex;
-		align-items: center;
+		&:first-child {
-		padding: 16px 32px 8px 32px;
+			margin-top: 20px;
-		line-height: 28px;
-		white-space: pre;
-		color: var(--renote);
-
-		> .avatar {
-			flex-shrink: 0;
-			display: inline-block;
-			width: 28px;
-			height: 28px;
-			margin: 0 8px 0 0;
-			border-radius: 6px;
 		}
-
+		> :not(.line) {
-		> i {
+			width: 0;
-			margin-right: 4px;
+			flex-grow: 1;
+			position: relative;
+			margin-bottom: -10px;
+			line-height: 28px;
 		}
+		> .line {
+			width: var(--avatarSize);
+			display: flex;
+			margin-right: 14px;
+			margin-top: 0;
+			flex-grow: 0;
+		}
+		
+		> div > i {
+			margin-left: -.5px;
+		}
+		> .info {
+			display: flex;
+			align-items: center;
+			font-size: 90%;
+			white-space: pre;
+			color: #f6c177;
 
-		> span {
+			> i {
-			overflow: hidden;
+				margin-right: 4px;
-			flex-shrink: 1;
+			}
-			text-overflow: ellipsis;
-			white-space: nowrap;
 
-			> .name {
+			> .hide {
-				font-weight: bold;
+				margin-left: auto;
+				color: inherit;
 			}
 		}
 
-		> .info {
-			margin-left: auto;
-			font-size: 0.9em;
 
-			> .time {
+		> .renote {
-				flex-shrink: 0;
+			display: flex;
-				color: inherit;
+			align-items: center;
+			white-space: pre;
+			color: var(--renote);
 
-				> .dropdownIcon {
+			
-					margin-right: 4px;
+			> i {
+				margin-right: 4px;
+			}
+
+			> span {
+				overflow: hidden;
+				flex-shrink: 1;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				
+				> .name {
+					font-weight: bold;
+				}
+			}
+
+			> .info {
+				margin-left: auto;
+				font-size: 0.9em;
+				display: flex;
+
+				> .time {
+					flex-shrink: 0;
+					color: inherit;
+					display: inline-flex;
+					align-items: center;
+					> .dropdownIcon {
+						margin-right: 4px;
+					}
 				}
 			}
 		}
-	}
 
-	> .renote + .article {
+		& + .article {
-		padding-top: 8px;
+			padding-top: 10px !important;
+		}
+
 	}
 
 	> .article {
-		padding: 28px 32px 18px;
+		padding: 28px 32px 16px;
 		cursor: pointer;
-		display: grid;
-		align-items: center;
-		grid-template-columns: 58px;
 
 		@media (pointer: coarse) {
 			cursor: default;
 		}
 
-		> .avatar {
+		.header-container {
-			flex-shrink: 0;
+			display: flex;
-			display: block;
+			> .avatar {
-			margin: 0 14px 8px 0;
+				flex-shrink: 0;
-			grid-row: 1 / span 2;
+				display: block;
-			width: 48px;
+				margin: 0 14px 0 0;
-			height: 48px;
+				width: var(--avatarSize);
-			position: relative;
+				height: var(--avatarSize);
-			top: 0;
+				position: relative;
-			left: 0;
+				top: 0;
+				left: 0;
+			}
+			> .header {
+				width: 0;
+				flex-grow: 1;
+			}
 		}
-
 		> .main {
 			flex: 1;
 			min-width: 0;
-			display: contents;
-
-			> header.header {
-				display: contents;
-			
-				> .name, .info {
-					grid-row: 1;
-				}
-			}
-
-			> :not(.ticker) {
-				grid-column: 1 / span 3;
-				width: 100%;
-				max-width: 100%;
-			}
-
-			> .name, .info {
-				grid-row: 1;
-			}
-
-			> .ticker {
-				grid-row: 2;
-				align-self: flex-start;
-				margin-left: auto;
-			}
-
-			> .ticker {
-				font-size: 0.9em;
-			}
 
 			> .body {
-				margin-top: .2em;
+				margin-top: .7em;
 				overflow: hidden;
-				margin-inline: -100px;
-				padding-inline: 100px;
 
 				> .cw {
 					cursor: default;
@@ -520,7 +514,11 @@ function readPromo() {
 						position: relative;
 						max-height: 9em;
 						overflow: hidden;
-
+						> .text {
+							max-height: 9em;
+							mask: linear-gradient(black calc(100% - 64px), transparent);
+							-webkit-mask: linear-gradient(black calc(100% - 64px), transparent);
+						}
 						> .fade {
 							display: block;
 							position: absolute;
@@ -528,7 +526,6 @@ function readPromo() {
 							left: 0;
 							width: 100%;
 							height: 64px;
-							background: linear-gradient(0deg, var(--panel), var(--X15));
 
 							> span {
 								display: inline-block;
@@ -569,6 +566,10 @@ function readPromo() {
 						}
 					}
 
+					> .files {
+						margin-top: .4em;
+						margin-bottom: .4em;
+					}
 					> .url-preview {
 						margin-top: 8px;
 					}
@@ -595,15 +596,19 @@ function readPromo() {
 			}
 
 			> .footer {
+				display: flex;
+				flex-wrap: wrap;
 				> .button {
 					margin: 0;
 					padding: 8px;
 					opacity: 0.7;
-
+					flex-grow: 1;
-					&:not(:last-child) {
+					max-width: 3.5em;
-						margin-right: 16px;
+					width: max-content;
+					min-width: max-content;
+					&:first-of-type {
+						margin-left: -.5em;
 					}
-
 					&:hover {
 						color: var(--fgHighlighted);
 					}
@@ -628,67 +633,35 @@ function readPromo() {
 
 	&.max-width_500px {
 		font-size: 0.9em;
-
-		> .article {
-			> .avatar {
-				width: 50px;
-				height: 50px;
-			}
-		}
 	}
 
 	&.max-width_450px {
-		> .renote {
+		--avatarSize: 46px;
-			padding: 8px 16px 0 16px;
+		padding-top: 6px;
+		> .note-context {
+			padding-inline: 16px;
+			margin-top: 0;
+			> :not(.line) {
+				margin-top: 5px;
+			}
+			> .line {
+				margin-right: 10px;
+			}
 		}
-
-		> .info {
-			padding: 8px 16px 0 16px;
-		}
-
 		> .article {
-			padding: 14px 16px 9px;
+			padding: 16px 16px 9px;
 
-			> .avatar {
+			> .main > .header-container > .avatar {
-				margin: 0 10px 8px 0;
+				margin-right: 10px;
-				width: 46px;
-				height: 46px;
 				// top: calc(14px + var(--stickyTop, 0px));
 			}
 		}
 	}
 
-	&.max-width_350px {
+
-		> .article {
-			> .main {
-				> .footer {
-					> .button {
-						&:not(:last-child) {
-							margin-right: 18px;
-						}
-					}
-				}
-			}
-		}
-	}
 
 	&.max-width_300px {
-		> .article {
+		--avatarSize: 40px;
-			> .avatar {
-				width: 44px;
-				height: 44px;
-			}
-
-			> .main {
-				> .footer {
-					> .button {
-						&:not(:last-child) {
-							margin-right: 12px;
-						}
-					}
-				}
-			}
-		}
 	}
 }
 

packages/client/src/components/MkNoteDetailed.vue

@@ -54,9 +54,7 @@
 				</p>
 				<div v-show="appearNote.cw == null || showContent" class="content">
 					<div class="text" @click.self="router.push(notePage(appearNote))">
-						<MkA v-if="appearNote.replyId" class="reply" :to="`/notes/${appearNote.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 						<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
-						<!-- <a v-if="appearNote.renote != null" class="rp">RN:</a> -->
 						<div v-if="translating || translation" class="translation">
 							<MkLoading v-if="translating" mini/>
 							<div v-else class="translated">
@@ -338,14 +336,12 @@ if (appearNote.replyId) {
 	&:hover > .article > .main > .footer > .button {
 		opacity: 1;
 	}
-
 	> .reply-to {
-		opacity: 0.7;
+		margin-bottom: -16px;
-		padding-bottom: 0;
 	}
 
 	> .reply-to-more {
-		opacity: 0.7;
+		// opacity: 0.7;
 		cursor: pointer;
 
 		@media (pointer: coarse) {
@@ -416,21 +412,26 @@ if (appearNote.replyId) {
 			> .avatar {
 				display: block;
 				flex-shrink: 0;
-				width: 52px;
+				width: var(--avatarSize);
-				height: 52px;
+				height: var(--avatarSize);
 			}
 
 			> .body {
+				width: 0;
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				justify-content: center;
-				padding-left: 16px;
+				padding-left: 14px;
 				font-size: 0.95em;
 
 				> .top {
+					display: flex;
+					align-items: center;
 					> .name {
 						font-weight: bold;
+						overflow: hidden;
+						text-overflow: ellipsis;
 					}
 
 					> .is-bot {
@@ -557,7 +558,7 @@ if (appearNote.replyId) {
 
 	> .reply, .reply-to, .reply-to-more {
 		transition: background-color 0.25s ease-in-out;
-
+		
 		&:hover {
 			background-color: var(--panelHighlight);
 		}
@@ -568,18 +569,18 @@ if (appearNote.replyId) {
 	}
 
 	&.max-width_450px {
+
+		> .reply-to-more:first-child {
+			padding-top: 14px;
+		}
 		> .renote {
 			padding: 8px 16px 0 16px;
 		}
 
 		> .article {
 			padding: 16px;
-
+			> .header > .body {
-			> .header {
+				padding-left: 10px;
-				> .avatar {
-					width: 50px;
-					height: 50px;
-				}
 			}
 		}
 	}
@@ -602,12 +603,6 @@ if (appearNote.replyId) {
 		font-size: 0.825em;
 
 		> .article {
-			> .header {
-				> .avatar {
-					width: 50px;
-					height: 50px;
-				}
-			}
 
 			> .main {
 				> .footer {

packages/client/src/components/MkNoteHeader.vue

@@ -1,16 +1,23 @@
 <template>
 <header class="kkwtjztg">
-	<MkA v-user-preview="note.user.id" class="name" :to="userPage(note.user)">
+	<div class="user-info">
-		<MkUserName :user="note.user" class="mkusername">
+		<div>
-			<span v-if="note.user.isBot" class="is-bot">bot</span>
+			<MkA v-user-preview="note.user.id" class="name" :to="userPage(note.user)">
-		</MkUserName>
+				<MkUserName :user="note.user" class="mkusername">
-	</MkA>
+					<span v-if="note.user.isBot" class="is-bot">bot</span>
-	<div class="username"><MkAcct :user="note.user"/></div>
+				</MkUserName>
-	<div class="info">
+			</MkA>
-		<MkA class="created-at" :to="notePage(note)">
+			<div class="username"><MkAcct :user="note.user"/></div>
-			<MkTime :time="note.createdAt"/>
+		</div>
-		</MkA>
+		<div>
-		<MkVisibility :note="note"/>
+			<div class="info">
+				<MkA class="created-at" :to="notePage(note)">
+					<MkTime :time="note.createdAt"/>
+				</MkA>
+				<MkVisibility :note="note"/>
+			</div>
+			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="note.user.instance"/>
+		</div>
 	</div>
 </header>
 </template>
@@ -18,66 +25,124 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import type * as misskey from 'calckey-js';
+import { defaultStore, noteViewInterruptors } from '@/store';
 import MkVisibility from '@/components/MkVisibility.vue';
+import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
+import { deepClone } from '@/scripts/clone';
 
-defineProps<{
+const props = defineProps<{
 	note: misskey.entities.Note;
 	pinned?: boolean;
 }>();
+
+let note = $ref(deepClone(props.note));
+
+const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && note.user.instance);
+
+
+
 </script>
 
 <style lang="scss" scoped>
 .kkwtjztg {
 	display: flex;
-	align-items: baseline;
+	align-items: center;
 	white-space: nowrap;
 	justify-self: flex-end;
-	padding: .1em .7em;
 	border-radius: 100px;
 	font-size: .8em;
 	text-shadow: 0 2px 2px var(--shadow);
 
-	> .name {
+	> .avatar {
-		flex-shrink: 1;
+		width: 3.7em;
-		display: block;
+		height: 3.7em;
-		margin: 0 .5em 0 0;
+		margin-right: 1em;
-		padding: 0;
+	}
-		overflow: hidden;
+	> .user-info {
+		width: 0;
+		flex-grow: 1;
+		line-height: 1.5;
+		display: flex;
 		font-size: 1.2em;
-		font-weight: bold;
+		> div {
-		text-decoration: none;
+			&:first-child {
-		text-overflow: ellipsis;
+				flex-grow: 1;
-
+				width: 0;
-		>.mkusername >.is-bot {
+				overflow: hidden;
-			flex-shrink: 0;
+				text-overflow: ellipsis;
-			align-self: center;
+			}
+			&:last-child {
+				max-width: 50%;
+				gap: .2em .5em;
+			}
+			.article > .main & {
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				&:last-child {
+					align-items: flex-end;
+				}
+				> * {
+					max-width: 100%;
+				}
+			}
+		}
+		.name {
+			// flex: 1 1 0px;
+			display: inline;
 			margin: 0 .5em 0 0;
-			padding: 1px 6px;
+			padding: 0;
-			font-size: 80%;
+			overflow: hidden;
-			border: solid 0.5px var(--divider);
+			font-weight: bold;
-			border-radius: 3px;
+			text-decoration: none;
+			text-overflow: ellipsis;
+
+			.mkusername >.is-bot {
+				flex-shrink: 0;
+				align-self: center;
+				margin: 0 .5em 0 0;
+				padding: 1px 6px;
+				font-size: 80%;
+				border: solid 0.5px var(--divider);
+				border-radius: 3px;
+			}
+
+			&:hover {
+				text-decoration: underline;
+			}
 		}
 
-		&:hover {
+		.username {
-			text-decoration: underline;
+			display: inline;
+			margin: 0 .5em 0 0;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			align-self: flex-start;
+			font-size: .9em;
 		}
-	}
 
-	> .username {
+		.info {
-		flex-shrink: 9999999;
+			display: inline-flex;
-		margin: 0 .5em 0 0;
+			flex-shrink: 0;
-		overflow: hidden;
+			margin-left: .5em;
-		text-overflow: ellipsis;
+			font-size: 0.9em;
-		grid-row: 2;
+			.created-at {
-		align-self: flex-start;
+				max-width: 100%;
-	}
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
 
-	> .info {
+		.ticker {
-		flex-shrink: 0;
+			display: inline-flex;
-		margin-left: auto;
+			margin-left: .5em;
-		font-size: 0.9em;
+			vertical-align: middle;
+			> .name {
+				display: none;
+			}
+		}
 	}
 }
 </style>

packages/client/src/components/MkNoteSimple.vue

@@ -1,6 +1,6 @@
 <template>
 <div v-size="{ min: [350, 500] }" class="yohlumlk">
-	<!-- <MkAvatar class="avatar" :user="note.user"/> -->
+	<MkAvatar class="avatar" :user="note.user"/>
 	<div class="main">
 		<XNoteHeader class="header" :note="note" :mini="true"/>
 		<div class="body">

packages/client/src/components/MkNoteSub.vue

@@ -1,7 +1,10 @@
 <template>
 <div v-size="{ max: [450] }" class="wrpstxzv" :class="{ children: depth > 1 }">
-	<div class="main" @click="router.push(notePage(note.reply))">
+	<div class="main" @click="router.push(notePage(note))">
-		<MkAvatar class="avatar" :user="note.user"/>
+		<div class="avatar-container">
+			<MkAvatar class="avatar" :user="note.user"/>
+			<div class="line"></div>
+		</div>
 		<div class="body">
 			<XNoteHeader class="header" :note="note" :mini="true"/>
 			<div class="body">
@@ -56,11 +59,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
-	font-size: 0.9em;
 
-	&.max-width_450px {
-		padding: 14px 16px;
-	}
 
 	&.children {
 		padding: 10px 0 0 16px;
@@ -75,20 +74,21 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	> .main {
 		display: flex;
 
-		> .avatar {
+		> .avatar-container {
-			flex-shrink: 0;
+			margin-right: 8px;
-			display: block;
+			> .avatar {
-			margin: 0 8px 0 0;
+				flex-shrink: 0;
-			width: 38px;
+				display: block;
-			height: 38px;
+				width: 38px;
-			border-radius: 8px;
+				height: 38px;
+				border-radius: 8px;
+			}
 		}
 
 		> .body {
 			flex: 1;
 			min-width: 0;
 			cursor: pointer;
-
 			@media (pointer: coarse) {
 				cursor: default;
 			}
@@ -129,5 +129,54 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 	> .more {
 		padding: 10px 0 0 16px;
 	}
+
+	&.reply-to, &.reply-to-more {
+		padding-bottom: 0;
+		&:first-child {
+			padding-top: 30px;
+		}
+		.avatar-container {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-right: 14px;
+			width: var(--avatarSize);
+			> .avatar {
+				width: var(--avatarSize);
+				height: var(--avatarSize);
+				margin: 0;
+			}
+			> .line {
+				width: var(--avatarSize);
+				display: flex;
+				flex-grow: 1;
+				&::before {
+					content: "";
+					display: block;
+					width: 2px;
+					background-color: var(--divider);
+					margin-inline: auto;
+					.note > & {
+						margin-bottom: -16px;
+					}
+				}
+			}
+		}
+		> .main > .body {
+			padding-bottom: 16px;
+		}
+	}
+
+	&.max-width_450px {
+		padding: 14px 16px;
+		&.reply-to, &.reply-to-more {
+			padding-top: 14px !important;
+			padding-bottom: 0 !important;
+			margin-bottom: 0 !important;
+		}
+		> .main > .avatar-container {
+			margin-right: 10px;
+		}
+	}
 }
 </style>

packages/client/src/components/MkPostForm.vue

@@ -54,6 +54,7 @@
 			<button v-tooltip="i18n.ts.hashtags" class="_button" :class="{ active: withHashtags }" @click="withHashtags = !withHashtags"><i class="ph-hash-bold ph-lg"></i></button>
 			<button v-tooltip="i18n.ts.emoji" class="_button" @click="insertEmoji"><i class="ph-smiley-bold ph-lg"></i></button>
 			<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" @click="showActions"><i class="ph-plug-bold ph-lg"></i></button>
+			<button v-tooltip="i18n.ts._mfm.cheatSheet" class="_button right" @click="openCheatSheet"><i class="ph-question-bold ph-lg"></i></button>
 		</footer>
 		<datalist id="hashtags">
 			<option v-for="hashtag in recentHashtags" :key="hashtag" :value="hashtag"/>
@@ -90,6 +91,7 @@ import { instance } from '@/instance';
 import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account';
 import { uploadFile } from '@/scripts/upload';
 import { deepClone } from '@/scripts/clone';
+import XCheatSheet from '@/components/MkCheatSheetDialog.vue';
 
 const modal = inject('modal');
 
@@ -624,6 +626,10 @@ async function insertEmoji(ev: MouseEvent) {
 	os.openEmojiPicker(ev.currentTarget ?? ev.target, {}, textareaEl);
 }
 
+async function openCheatSheet(ev: MouseEvent) {
+  os.popup(XCheatSheet, {}, {}, 'closed');
+}
+
 function showActions(ev) {
 	os.popupMenu(postFormActions.map(action => ({
 		text: action.title,
@@ -711,6 +717,9 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
+.right {
+	float:right
+}
 .gafaadew {
 	position: relative;
 

packages/client/src/components/MkReactionsViewer.vue

@@ -22,6 +22,7 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
 <style lang="scss" scoped>
 .tdflqwzn {
 	margin: 4px -2px 0 -2px;
+	width: 100%;
 
 	&:empty {
 		display: none;

packages/client/src/components/MkSubNoteContent.vue

@@ -4,7 +4,7 @@
 		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
 		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
-		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">QB: ...</MkA>
+		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
 	</div>
 	<div v-if="note.files.length > 0">
 		<summary>({{ i18n.t('withNFiles', { n: note.files.length }) }})</summary>
@@ -65,7 +65,11 @@ const collapsed = $ref(props.note.cw == null && isLong);
 		position: relative;
 		max-height: 9em;
 		overflow: hidden;
-
+		> .body {
+			max-height: 9em;
+			mask: linear-gradient(black calc(100% - 64px), transparent);
+			-webkit-mask: linear-gradient(black calc(100% - 64px), transparent);
+		}
 		> .fade {
 			display: block;
 			position: absolute;
@@ -73,7 +77,6 @@ const collapsed = $ref(props.note.cw == null && isLong);
 			left: 0;
 			width: 100%;
 			height: 64px;
-			background: linear-gradient(0deg, var(--panel), var(--X15));
 
 			> span {
 				display: inline-block;

packages/client/src/components/MkTab.vue

@@ -36,6 +36,7 @@ export default defineComponent({
 	> button {
 		flex: 1;
 		padding: 10px 8px;
+		margin: 0 8px;
 		border-radius: var(--radius);
 
 		&:disabled {

packages/client/src/components/MkUpdated.vue

@@ -5,9 +5,9 @@
 		<div class="version">✨ {{ version }} 🚀</div>
 		<div v-if="newRelease" class="releaseNotes">
 			<Mfm :text="data.notes"/>
-			<!-- <div v-if="data.screenshots.length > 0" style="max-width: 500">
+			<div v-if="data.screenshots.length > 0" style="max-width: 500">
 				<img v-for="i in data.screenshots" :key="i" :src="i"/>
-			</div> -->
+			</div>
 		</div>
 		<MkButton class="gotIt" primary full @click="modal.close()">{{ i18n.ts.gotIt }}</MkButton>
 	</div>
@@ -24,13 +24,17 @@ import * as os from '@/os';
 
 const modal = $ref<InstanceType<typeof MkModal>>();
 
-let newRelease = false;
+let newRelease = $ref(false);
-let data;
+let data = $ref(Object);
+
 os.api('release').then(res => {
 	data = res;
-	console.log(data);
 	newRelease = (version === data?.version);
 });
+console.log(`Version: ${version}`)
+console.log(`Data version: ${data.version}`)
+console.log(newRelease)
+console.log(data);
 
 </script>
 

packages/client/src/components/MkUrlPreview.vue

@@ -210,14 +210,12 @@ onUnmounted(() => {
 		position: relative;
 		display: block;
 		font-size: 14px;
-		box-shadow: 0 0 0 1px var(--divider);
+		border: 1px solid var(--divider);
 		border-radius: 8px;
 		overflow: hidden;
 
 		&:hover {
 			text-decoration: none;
-			border-color: rgba(0, 0, 0, 0.2);
-
 			> article > header > h1 {
 				text-decoration: underline;
 			}

packages/client/src/emojilist.json

@@ -1496,7 +1496,7 @@
 	{ "category": "symbols", "char": "🀄", "name": "mahjong", "keywords": ["game", "play", "chinese", "kanji"] },
 	{ "category": "symbols", "char": "♠️", "name": "spades", "keywords": ["poker", "cards", "suits", "magic"] },
 	{ "category": "symbols", "char": "♣️", "name": "clubs", "keywords": ["poker", "cards", "magic", "suits"] },
-	{ "category": "symbols", "char": "♥️", "name": "hearts", "keywords": ["poker", "cards", "magic", "suits"] },
+	{ "category": "symbols", "char": "❤️", "name": "hearts", "keywords": ["poker", "cards", "magic", "suits"] },
 	{ "category": "symbols", "char": "♦️", "name": "diamonds", "keywords": ["poker", "cards", "magic", "suits"] },
 	{ "category": "symbols", "char": "🎴", "name": "flower_playing_cards", "keywords": ["game", "sunset", "red"] },
 	{ "category": "symbols", "char": "💭", "name": "thought_balloon", "keywords": ["bubble", "cloud", "speech", "thinking", "dream"] },

packages/client/src/pages/mfm-cheat-sheet.vue

@@ -4,6 +4,7 @@
 	<MkSpacer :content-max="800">
 		<div class="mwysmxbg">
 			<div>{{ i18n.ts._mfm.intro }}</div>
+			<br/>
 			<div class="section _block">
 				<div class="title">{{ i18n.ts._mfm.mention }}</div>
 				<div class="content">
@@ -24,16 +25,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.url }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.urlDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_url"/>
-						<MkTextarea v-model="preview_url"><template #label>MFM</template></MkTextarea>
-					</div>
-				</div>
-			</div>
 			<div class="section _block">
 				<div class="title">{{ i18n.ts._mfm.link }}</div>
 				<div class="content">
@@ -320,7 +311,6 @@ import { instance } from '@/instance';
 
 let preview_mention = $ref('@example');
 let preview_hashtag = $ref('#test');
-let preview_url = $ref('https://example.com');
 let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`);
 let preview_emoji = $ref(instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:');
 let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`);

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

@@ -192,6 +192,8 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	}
 
 	async function invalidateFollow() {
+		if (!(await getConfirmed(i18n.ts.breakFollowConfirm))) return;
+
 		os.apiWithDialog("following/invalidate", {
 			userId: user.id,
 		}).then(() => {

packages/client/src/scripts/media-proxy.ts

@@ -1,15 +1,18 @@
-import { query } from '@/scripts/url';
+import { query } from "@/scripts/url";
-import { url } from '@/config';
+import { url } from "@/config";
 
-export function getProxiedImageUrl(imageUrl: string, type?: 'preview'): string {
+export function getProxiedImageUrl(imageUrl: string, type?: "preview"): string {
 	return `${url}/proxy/image.webp?${query({
 		url: imageUrl,
-		fallback: '1',
+		fallback: "1",
-		...(type ? { [type]: '1' } : {}),
+		...(type ? { [type]: "1" } : {}),
 	})}`;
 }
 
-export function getProxiedImageUrlNullable(imageUrl: string | null | undefined, type?: 'preview'): string | null {
+export function getProxiedImageUrlNullable(
+	imageUrl: string | null | undefined,
+	type?: "preview",
+): string | null {
 	if (imageUrl == null) return null;
 	return getProxiedImageUrl(imageUrl, type);
 }

packages/client/src/style.scss

@@ -4,6 +4,7 @@
 	--radius: 12px;
 	--marginFull: 16px;
 	--marginHalf: 10px;
+	--avatarSize: 48px;
 
 	--margin: var(--marginFull);
 

pnpm-lock.yaml

@@ -447,7 +447,7 @@ importers:
       typescript: 4.9.4
       uuid: 9.0.0
       vanilla-tilt: 1.8.0
-      vite: ^4.0.4
+      vite: ^4.1.0-beta.1
       vue: 3.2.45
       vue-isyourpasswordsafe: ^2.0.0
       vue-plyr: ^7.0.0
@@ -519,7 +519,7 @@ importers:
       typescript: 4.9.4
       uuid: 9.0.0
       vanilla-tilt: 1.8.0
-      vite: 4.0.4_sass@1.57.1
+      vite: 4.1.0-beta.2_sass@1.57.1
       vue: 3.2.45
       vue-isyourpasswordsafe: 2.0.0
       vue-plyr: 7.0.0
@@ -2509,14 +2509,14 @@ packages:
     dev: true
     optional: true
 
-  /@vitejs/plugin-vue/4.0.0_vite@4.0.4+vue@3.2.45:
+  /@vitejs/plugin-vue/4.0.0_f7f773kp2g3xbdt2psqzr7g57m:
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.0.4_sass@1.57.1
+      vite: 4.1.0-beta.2_sass@1.57.1
       vue: 3.2.45
     dev: true
 
@@ -10804,6 +10804,14 @@ packages:
       rangestr: 0.0.1
       seedrandom: 2.4.2
 
+  /rollup/3.12.1:
+    resolution: {integrity: sha512-t9elERrz2i4UU9z7AwISj3CQcXP39cWxgRWLdf4Tm6aKm1eYrqHIgjzXBgb67GNY1sZckTFFi0oMozh3/S++Ig==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+    hasBin: true
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: false
+
   /rollup/3.9.1:
     resolution: {integrity: sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
@@ -12464,8 +12472,8 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite/4.0.4_sass@1.57.1:
+  /vite/4.1.0-beta.2_sass@1.57.1:
-    resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
+    resolution: {integrity: sha512-B1V2qkELCaxgg1YptKyCmpY3/6LBXWW5iD5H6L4BizvWNhp2hGL7wAwBblfjqCuudVv9kcnJiL5uY2zqvZFr5Q==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       '@types/node': '>= 14'
@@ -12491,7 +12499,7 @@ packages:
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
-      rollup: 3.9.1
+      rollup: 3.12.1
       sass: 1.57.1
     optionalDependencies:
       fsevents: 2.3.2

release.json

@@ -1,5 +1,5 @@
 {
-	"version": "13.0.6-rc",
+	"version": "13.1.0",
-	"notes": "$[jelly Happy new year!] This release includes many changes, including:\n- New post layout\n- Automatic subdomain blocks\n- Notes are now called posts\n- Federation improvements\n- Many bug fixes and performance improvements",
+	"notes": "This release includes many changes, including:\n\n• New post and thread layout\n• Automatic subdomain blocks\n• Customizable default reactions\n• Federation improvements\n• Many bug fixes and performance improvements",
 	"screenshots": []
 }