1
0
mirror of https://github.com/mamoe/mirai.git synced 2025-05-06 06:12:34 +08:00
This commit is contained in:
cssxsh 2024-09-23 19:52:05 +08:00 committed by GitHub
commit 9d92a23386
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions
mirai-core-api
compatibility-validation
android/api
jvm/api
src/commonMain/kotlin/message/data

View File

@ -4427,6 +4427,7 @@ public final class net/mamoe/mirai/message/data/ImageType : java/lang/Enum {
public static final field PNG Lnet/mamoe/mirai/message/data/ImageType;
public static final field UNKNOWN Lnet/mamoe/mirai/message/data/ImageType;
public final fun getFormatName ()Ljava/lang/String;
public final fun getSecondaryNames ()[Ljava/lang/String;
public static final fun match (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType;
public static final fun matchOrNull (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType;
public static fun valueOf (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType;

View File

@ -4427,6 +4427,7 @@ public final class net/mamoe/mirai/message/data/ImageType : java/lang/Enum {
public static final field PNG Lnet/mamoe/mirai/message/data/ImageType;
public static final field UNKNOWN Lnet/mamoe/mirai/message/data/ImageType;
public final fun getFormatName ()Ljava/lang/String;
public final fun getSecondaryNames ()[Ljava/lang/String;
public static final fun match (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType;
public static final fun matchOrNull (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType;
public static fun valueOf (Ljava/lang/String;)Lnet/mamoe/mirai/message/data/ImageType;

View File

@ -502,10 +502,11 @@ public enum class ImageType(
* @since 2.9.0
*/
@MiraiInternalApi public val formatName: String,
@MiraiInternalApi public vararg val secondaryNames: String
) {
PNG("png"),
BMP("bmp"),
JPG("jpg"),
JPG("jpg", "JPEG", "JPE"),
GIF("gif"),
//WEBP, //Unsupported by pc client
@ -523,7 +524,7 @@ public enum class ImageType(
@JvmStatic
public fun matchOrNull(str: String): ImageType? {
val input = str.uppercase()
return IMAGE_TYPE_ENUM_LIST.firstOrNull { it.name == input }
return IMAGE_TYPE_ENUM_LIST.firstOrNull { it.name == input || it.secondaryNames.contains(input) }
}
}
}