diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt b/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt index 6e832d12f..8fc3bebdf 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/data/HummerMessage.kt @@ -345,6 +345,14 @@ public data class FlashImage( */ @JvmStatic public fun from(imageId: String): FlashImage = FlashImage(Image(imageId)) + + /** + * 将普通图片转换为闪照. + * + * @see Image.flash + */ + @JvmStatic + public inline fun from(image: Image): FlashImage = FlashImage(image) } private val stringValue: String by lazy(LazyThreadSafetyMode.NONE) { "[mirai:flash:${image.imageId}]" } @@ -369,16 +377,4 @@ public inline fun FlashImage(imageId: String): FlashImage = FlashImage.from(imag * 将普通图片转换为闪照. */ @JvmSynthetic -public inline fun Image.flash(): FlashImage = FlashImage(this) - -/** - * 将普通图片转换为闪照. - */ -@JvmSynthetic -public inline fun GroupImage.flash(): FlashImage = FlashImage(this) - -/** - * 将普通图片转换为闪照. - */ -@JvmSynthetic -public inline fun FriendImage.flash(): FlashImage = FlashImage(this) \ No newline at end of file +public inline fun Image.flash(): FlashImage = FlashImage(this) \ No newline at end of file diff --git a/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt b/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt index 99f32c270..49409cee5 100644 --- a/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt @@ -204,15 +204,15 @@ internal abstract class AbstractImage : Image { // make sealed in 1.3.0 ? } } -internal interface ConstOriginUrlAware : Image { +internal interface ConstOriginUrlAware { val originUrl: String } -internal interface DeferredOriginUrlAware : Image { +internal interface DeferredOriginUrlAware { fun getUrl(bot: Bot): String } -internal interface SuspendDeferredOriginUrlAware : Image { +internal interface SuspendDeferredOriginUrlAware { suspend fun getUrl(bot: Bot): String }