Skip to content

为 Image 增加更多可扩展的子类型 #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 3, 2024
Merged

为 Image 增加更多可扩展的子类型 #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfb5051
pref: 为 Image 增加更多可扩展的子类型
ForteScarlet Feb 3, 2024
7c7835b
version to dev18
ForteScarlet Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/P.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ sealed class P(override val group: String) : ProjectDetail() {
val versionWithoutSnapshot: Version

init {
val mainVersion = version(4, 0, 0) - version("dev17")
val mainVersion = version(4, 0, 0) - version("dev18")

fun initVersionWithoutSnapshot(status: Version?): Version = if (status == null) {
mainVersion
Expand Down
40 changes: 29 additions & 11 deletions simbot-api/src/commonMain/kotlin/love/forte/simbot/message/StandardMessages.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ import love.forte.simbot.resource.ResourceBase64Serializer
import love.forte.simbot.suspendrunner.STP
import kotlin.io.encoding.ExperimentalEncodingApi
import kotlin.js.JsName
import kotlin.jvm.JvmMultifileClass
import kotlin.jvm.JvmName
import kotlin.jvm.JvmOverloads
import kotlin.jvm.JvmStatic
import kotlin.jvm.*

/**
* 一些由核心提供的标准 [Message.Element] 类型。
Expand Down Expand Up @@ -232,8 +229,29 @@ public data object AtAll : MentionMessage
*/
public interface Image : StandardMessage

// 离线图片？
// 远程图片？
/**
* 一个可以感知到 [ID] 信息的 [Image]。
*
*/
public interface IDAwareImage : Image {
/**
* 这个图片的ID。
*/
public val id: ID
}

/**
* 一个可以感知或获取到 url 信息的 [Image]。
*
*/
@STP
public interface UrlAwareImage : Image {
/**
* 获取到这个图片的链接字符串。
*/
public suspend fun url(): String
}


/**
* 一个离线图片消息元素类型。
Expand Down Expand Up @@ -355,13 +373,13 @@ public data class OfflineByteArrayImage(private val data: ByteArray) : OfflineIm
*
* @see RemoteIDImage
*/
public interface RemoteImage : Image {
public interface RemoteImage : Image, IDAwareImage {
/**
* 在远程服务器上的唯一标识。
*
* 可能是一个ID，也可能是一个资源定位符（例如图片链接）。
*/
public val id: ID
override val id: ID
}

/**
Expand All @@ -378,12 +396,12 @@ public data class RemoteIDImage(override val id: ID) : RemoteImage
*
* @see RemoteImage
*/
@STP
public interface RemoteUrlAwareImage : RemoteImage {
public interface RemoteUrlAwareImage : RemoteImage, UrlAwareImage {
/**
* 获取或查询此图片的链接。
*/
public suspend fun url(): String
@JvmSynthetic
override suspend fun url(): String
}

//endregion
Expand Down