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

# Conflicts:
#	packages/backend/src/server/api/stream/channels/home-timeline.ts
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	pnpm-lock.yaml

packages/frontend/package.json

@@ -30,7 +30,7 @@
 		"@vueuse/core": "^10.4.1",
 		"astring": "1.8.6",
 		"autosize": "6.0.1",
-		"broadcast-channel": "5.4.0",
+		"broadcast-channel": "5.5.0",
 		"browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
 		"buraha": "0.0.1",
 		"canvas-confetti": "1.6.1",
@@ -60,7 +60,7 @@
 		"querystring": "0.2.1",
 		"rollup": "4.1.4",
 		"sanitize-html": "2.11.0",
-		"sass": "1.69.3",
+		"sass": "1.69.4",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
 		"three": "0.157.0",
@@ -73,7 +73,7 @@
 		"uuid": "9.0.1",
 		"v-code-diff": "1.7.1",
 		"vanilla-tilt": "1.8.1",
-		"vite": "4.4.11",
+		"vite": "4.5.0",
 		"vue": "3.3.4",
 		"vue-multiselect": "^2.1.7",
 		"vue-prism-editor": "2.0.0-alpha.2",
@@ -99,25 +99,25 @@
 		"@storybook/vue3": "7.5.0",
 		"@storybook/vue3-vite": "7.5.0",
 		"@testing-library/vue": "7.0.0",
-		"@types/escape-regexp": "0.0.1",
-		"@types/estree": "1.0.2",
-		"@types/matter-js": "0.19.1",
-		"@types/micromatch": "4.0.3",
-		"@types/node": "20.8.6",
-		"@types/punycode": "2.1.0",
-		"@types/sanitize-html": "2.9.2",
-		"@types/throttle-debounce": "5.0.0",
-		"@types/tinycolor2": "1.4.4",
-		"@types/uuid": "9.0.5",
-		"@types/websocket": "1.0.7",
-		"@types/ws": "8.5.7",
+		"@types/escape-regexp": "0.0.2",
+		"@types/estree": "1.0.3",
+		"@types/matter-js": "0.19.2",
+		"@types/micromatch": "4.0.4",
+		"@types/node": "20.8.7",
+		"@types/punycode": "2.1.1",
+		"@types/sanitize-html": "2.9.3",
+		"@types/throttle-debounce": "5.0.1",
+		"@types/tinycolor2": "1.4.5",
+		"@types/uuid": "9.0.6",
+		"@types/websocket": "1.0.8",
+		"@types/ws": "8.5.8",
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
 		"@vitest/coverage-v8": "0.34.6",
 		"@vue/runtime-core": "3.3.4",
 		"acorn": "8.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.1",
+		"cypress": "13.3.2",
 		"eslint": "8.51.0",
 		"eslint-plugin-import": "2.28.1",
 		"eslint-plugin-vue": "9.17.0",

packages/frontend/src/components/MkNote.vue

@@ -240,6 +240,7 @@ const keymap = {
 useNoteCapture({
 	rootEl: el,
 	note: $$(appearNote),
+	pureNote: $$(note),
 	isDeletedRef: isDeleted,
 });
 

packages/frontend/src/components/MkNoteDetailed.vue

@@ -323,6 +323,7 @@ const reactionsPagination = $computed(() => ({
 useNoteCapture({
 	rootEl: el,
 	note: $$(appearNote),
+	pureNote: $$(note),
 	isDeletedRef: isDeleted,
 });
 

packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts

@@ -90,7 +90,7 @@ export default function(props: {
 		switch (token.type) {
 			case 'text': {
 				let text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
-				if (!disableNyaize && props.author.isCat) {
+				if (!disableNyaize && props.author?.isCat) {
 					text = nyaize(text);
 				}
 

packages/frontend/src/scripts/use-note-capture.ts

@@ -11,15 +11,17 @@ import { $i } from '@/account.js';
 export function useNoteCapture(props: {
 	rootEl: Ref<HTMLElement>;
 	note: Ref<Misskey.entities.Note>;
+	pureNote: Ref<Misskey.entities.Note>;
 	isDeletedRef: Ref<boolean>;
 }) {
 	const note = props.note;
+	const pureNote = props.pureNote;
 	const connection = $i ? useStream() : null;
 
 	function onStreamNoteUpdated(noteData): void {
 		const { type, id, body } = noteData;
 
-		if (id !== note.value.id) return;
+		if ((id !== note.value.id) && (id !== pureNote.value.id)) return;
 
 		switch (type) {
 			case 'reacted': {
@@ -89,6 +91,7 @@ export function useNoteCapture(props: {
 		if (connection) {
 			// TODO: このノートがストリーミング経由で流れてきた場合のみ sr する
 			connection.send(document.body.contains(props.rootEl.value) ? 'sr' : 's', { id: note.value.id });
+			if (pureNote.value.id !== note.value.id) connection.send('s', { id: pureNote.value.id });
 			if (withHandler) connection.on('noteUpdated', onStreamNoteUpdated);
 		}
 	}
@@ -98,6 +101,11 @@ export function useNoteCapture(props: {
 			connection.send('un', {
 				id: note.value.id,
 			});
+			if (pureNote.value.id !== note.value.id) {
+				connection.send('un', {
+					id: pureNote.value.id,
+				});
+			}
 			if (withHandler) connection.off('noteUpdated', onStreamNoteUpdated);
 		}
 	}