Merge branch 'io' into bun

Author: u1-liquid

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.5b",
+	"version": "2024.5.0-io.5c",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/server/api/stream/channels/antenna.ts

@@ -54,9 +54,9 @@ class AntennaChannel extends Channel {
 			if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 				this.send('note', {
 					id: note.id, myReaction: note.myReaction,
-					poll: note.poll ? { choices: note.poll.choices } : undefined,
-					reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-					renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+					poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+					reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+					renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 				});
 			} else {
 				this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/channel.ts

@@ -60,9 +60,9 @@ class ChannelChannel extends Channel {
 		if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 			this.send('note', {
 				id: note.id, myReaction: note.myReaction,
-				poll: note.poll ? { choices: note.poll.choices } : undefined,
-				reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-				renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+				poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+				reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+				renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 			});
 		} else {
 			this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/global-timeline.ts

@@ -90,9 +90,9 @@ class GlobalTimelineChannel extends Channel {
 		if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 			this.send('note', {
 				id: note.id, myReaction: note.myReaction,
-				poll: note.poll ? { choices: note.poll.choices } : undefined,
-				reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-				renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+				poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+				reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+				renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 			});
 		} else {
 			this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/home-timeline.ts

@@ -94,9 +94,9 @@ class HomeTimelineChannel extends Channel {
 		if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 			this.send('note', {
 				id: note.id, myReaction: note.myReaction,
-				poll: note.poll ? { choices: note.poll.choices } : undefined,
-				reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-				renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+				poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+				reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+				renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 			});
 		} else {
 			this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/hybrid-timeline.ts

@@ -108,9 +108,9 @@ class HybridTimelineChannel extends Channel {
 		if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 			this.send('note', {
 				id: note.id, myReaction: note.myReaction,
-				poll: note.poll ? { choices: note.poll.choices } : undefined,
-				reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-				renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+				poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+				reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+				renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 			});
 		} else {
 			this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/local-timeline.ts

@@ -93,9 +93,9 @@ class LocalTimelineChannel extends Channel {
 		if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 			this.send('note', {
 				id: note.id, myReaction: note.myReaction,
-				poll: note.poll ? { choices: note.poll.choices } : undefined,
-				reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-				renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+				poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+				reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+				renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 			});
 		} else {
 			this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/role-timeline.ts

@@ -76,9 +76,9 @@ class RoleTimelineChannel extends Channel {
 			if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 				this.send('note', {
 					id: note.id, myReaction: note.myReaction,
-					poll: note.poll ? { choices: note.poll.choices } : undefined,
-					reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-					renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+					poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+					reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+					renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 				});
 			} else {
 				this.connection.cacheNote(note);

packages/backend/src/server/api/stream/channels/user-list.ts

@@ -133,9 +133,9 @@ class UserListChannel extends Channel {
 		if (this.minimize && ['public', 'home'].includes(note.visibility)) {
 			this.send('note', {
 				id: note.id, myReaction: note.myReaction,
-				poll: note.poll ? { choices: note.poll.choices } : undefined,
-				reply: note.reply ? { myReaction: note.reply.myReaction } : undefined,
-				renote: note.renote ? { myReaction: note.renote.myReaction } : undefined,
+				poll: note.poll?.choices ? { choices: note.poll.choices } : undefined,
+				reply: note.reply?.myReaction ? { myReaction: note.reply.myReaction } : undefined,
+				renote: note.renote?.myReaction ? { myReaction: note.renote.myReaction } : undefined,
 			});
 		} else {
 			this.connection.cacheNote(note);

packages/frontend/src/components/MkMediaAudio.vue

@@ -27,6 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<audio
 			ref="audioEl"
 			preload="metadata"
+			crossorigin="anonymous"
 			controls
 			:class="$style.nativeAudio"
 			@keydown.prevent
@@ -41,6 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<audio
 				ref="audioEl"
 				preload="metadata"
+				crossorigin="anonymous"
 			>
 				<source :src="audio.url">
 			</audio>

packages/frontend/src/components/MkMediaVideo.vue

@@ -34,6 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			:title="video.comment ?? undefined"
 			:alt="video.comment"
 			preload="metadata"
+			crossorigin="anonymous"
 			controls
 			@keydown.prevent
 		>
@@ -54,6 +55,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			:title="video.comment ?? undefined"
 			:alt="video.comment"
 			preload="metadata"
+			crossorigin="anonymous"
 			playsinline
 			@keydown.prevent
 			@click.self="togglePlayPause"

packages/frontend/src/index.html

@@ -15,7 +15,7 @@
 	<title>[DEV] Loading...</title>
 	<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
 	<meta
-		http-equiv="Content-Security-Policy"
+		http-equiv="Content-Security-Policy-Report-Only"
 		content="default-src 'self' https://newassets.hcaptcha.com/ https://challenges.cloudflare.com/ http://localhost:7493/ https://fonts.gstatic.com/ https://www.google-analytics.com/ https://www.googletagmanager.com/;
 			worker-src 'self';
 			script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com https://www.googletagmanager.com https://esm.sh;

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-io.5b",
+	"version": "2024.5.0-io.5c",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {