Merge branch 'develop' into feature/2024.10

packages/frontend-embed/src/components/EmAvatar.vue

@@ -30,6 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			rotate: getDecorationAngle(decoration),
 			scale: getDecorationScale(decoration),
 			translate: getDecorationOffset(decoration),
+			zIndex: getDecorationZIndex(decoration),
 		}"
 		alt=""
 	>
@@ -86,6 +87,10 @@ function getDecorationOffset(decoration: Omit<Misskey.entities.UserDetailed['ava
 	const offsetY = decoration.offsetY ?? 0;
 	return offsetX === 0 && offsetY === 0 ? undefined : `${offsetX * 100}% ${offsetY * 100}%`;
 }
+
+function getDecorationZIndex(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
+	return decoration.showBelow ? '-1' : undefined;
+}
 </script>
 
 <style lang="scss" module>

packages/frontend-embed/src/components/EmMediaBanner.vue

@@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <a :href="href" target="_blank" :class="$style.root">
 	<div :class="$style.label">
 		<template v-if="media.type.startsWith('audio')"><i class="ti ti-music"></i> {{ i18n.ts.audio }}</template>
+		<template v-else-if="media.type.startsWith('application') && media.type.includes('flash')"><i class="ti ti-bolt"></i> {{ i18n.ts.flash }}</template>
 		<template v-else><i class="ti ti-file"></i> {{ i18n.ts.file }}</template>
 	</div>
 	<div :class="$style.go">