Skip to content

Commit 93ccce1

Browse files
cssxshHim188
cssxsh
and
Him188
authored
add: SuperFaceProtocol (#2722)
* add: protocol * fix: MsgElemInfoServtype37 * add: AnimatedStickerProtocolTest * add: ... * rename: SuperFace * add: face impl * add: SuperFace toCommData * fix: stickerId * fix: SuperFace constructor * add: api dump * add: CodableMessage * add: api dump * fix: names size * fix: type * add: MessageVisitorTest * add: TestMiraiCode * add: MessageVisitorTest * add: TestMiraiCode * fix: no data class * feat: try from * add: api dump * add: hashCode, equals * [core] 优化 SuperFace API * fix tests --------- Co-authored-by: Him188 <[email protected]>
1 parent 5a450e8 commit 93ccce1

File tree

15 files changed

+606
-5
lines changed

15 files changed

+606
-5
lines changed

‎mirai-core-api/compatibility-validation/android/api/android.api

+87
Original file line numberDiff line numberDiff line change
@@ -3467,6 +3467,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
34673467
public static final field BANG_BANG_TANG I
34683468
public static final field BAN_ZHUAN_ZHONG I
34693469
public static final field BAO_BAO I
3470+
public static final field BAO_FU I
34703471
public static final field BAO_JI I
34713472
public static final field BAO_JIN I
34723473
public static final field BAO_QUAN I
@@ -3496,6 +3497,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
34963497
public static final field CHI_GUA I
34973498
public static final field CHI_TANG I
34983499
public static final field CHONG_BAI I
3500+
public static final field CUO_HAO I
34993501
public static final field Companion Lnet/mamoe/mirai/message/data/Face$Companion;
35003502
public static final field DAN I
35013503
public static final field DAN_GAO I
@@ -3504,11 +3506,15 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
35043506
public static final field DA_KU I
35053507
public static final field DA_LIAN I
35063508
public static final field DA_XIAO I
3509+
public static final field DA_YUAN_ZHONG I
3510+
public static final field DA_ZHAN_HONG_TU I
3511+
public static final field DA_ZHAO_HU I
35073512
public static final field DENG_LONG I
35083513
public static final field DE_YI I
35093514
public static final field DIAN_ZAN I
35103515
public static final field DIAO_XIE I
35113516
public static final field DING_GUA_GUA I
3517+
public static final field DUI_HAO I
35123518
public static final field E I
35133519
public static final field FAN I
35143520
public static final field FA_DAI I
@@ -3518,6 +3524,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
35183524
public static final field FEI_WEN I
35193525
public static final field FEN_DOU I
35203526
public static final field FO_XI I
3527+
public static final field FU_LUO_BO I
35213528
public static final field GAN_BEI I
35223529
public static final field GAN_GA I
35233530
public static final field GONG_XI I
@@ -3538,11 +3545,15 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
35383545
public static final field HE_XIE I
35393546
public static final field HONG_BAO I
35403547
public static final field HONG_BAO_BAO I
3548+
public static final field HONG_BAO_DUO_DUO I
35413549
public static final field HUAI_XIAO I
35423550
public static final field HUA_CHI I
3551+
public static final field HUA_DUO_LIAN I
35433552
public static final field HUI_SHOU I
35443553
public static final field HUI_TOU I
3554+
public static final field HU_HU_SHENG_WEI I
35453555
public static final field HU_LIAN I
3556+
public static final field JIA_YI I
35463557
public static final field JIA_YOU I
35473558
public static final field JIA_YOU_BAO_BAO I
35483559
public static final field JIA_YOU_BI_SHENG I
@@ -3551,12 +3562,14 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
35513562
public static final field JING_KONG I
35523563
public static final field JING_LI I
35533564
public static final field JING_XI I
3565+
public static final field JING_XIA I
35543566
public static final field JING_YA I
35553567
public static final field JI_DONG I
35563568
public static final field JI_E I
35573569
public static final field JI_ZHANG I
35583570
public static final field JU_HUA I
35593571
public static final field JU_JUE I
3572+
public static final field JU_PAI_PAI I
35603573
public static final field KAI_QIANG I
35613574
public static final field KA_FEI I
35623575
public static final field KEN_TOU I
@@ -3589,6 +3602,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
35893602
public static final field MEI_GUI I
35903603
public static final field MIAN_WU_BIAO_QING I
35913604
public static final field MIAO_MIAO I
3605+
public static final field MING_BAI I
35923606
public static final field MO_GUI_XIAO I
35933607
public static final field MO_JIN_LI I
35943608
public static final field MO_YU I
@@ -3597,6 +3611,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
35973611
public static final field NA_DAO_HONG_BAO I
35983612
public static final field NIU_A I
35993613
public static final field NIU_QI_CHONG_TIAN I
3614+
public static final field NI_ZHEN_BANG_BANG I
36003615
public static final field NO I
36013616
public static final field O I
36023617
public static final field OK I
@@ -3625,12 +3640,14 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
36253640
public static final field QUAN_TOU I
36263641
public static final field RANG_WO_KANG_KANG I
36273642
public static final field RENG_GOU I
3643+
public static final field RE_HUA_LE I
36283644
public static final field SAO_RAO I
36293645
public static final field SE I
36303646
public static final field SERIAL_NAME Ljava/lang/String;
36313647
public static final field SHAN_DIAN I
36323648
public static final field SHAN_LIAN I
36333649
public static final field SHENG_LI I
3650+
public static final field SHENG_QI I
36343651
public static final field SHENG_RI_KUAI_LE I
36353652
public static final field SHI_AI I
36363653
public static final field SHOU_QIANG I
@@ -3639,8 +3656,10 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
36393656
public static final field SHUANG_XI I
36403657
public static final field SHUI I
36413658
public static final field SONG_HUA I
3659+
public static final field SUAN_Q I
36423660
public static final field TAI_NAN_LE I
36433661
public static final field TAI_YANG I
3662+
public static final field TIAN_PING I
36443663
public static final field TIAN_YI_TIAN I
36453664
public static final field TIAO_PI I
36463665
public static final field TIAO_SHENG I
@@ -3653,13 +3672,16 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
36533672
public static final field TUO_LIAN I
36543673
public static final field TUO_SAI I
36553674
public static final field WANG_WANG I
3675+
public static final field WAN_CHENG I
36563676
public static final field WEI_QU I
36573677
public static final field WEI_XIAO I
36583678
public static final field WEN_HAO_LIAN I
36593679
public static final field WO_BU_KAN I
3680+
public static final field WO_FANG_LE I
36603681
public static final field WO_MEI_SHI I
36613682
public static final field WO_SHOU I
36623683
public static final field WO_SUAN_LE I
3684+
public static final field WO_XIANG_KAI_LE I
36633685
public static final field WO_ZUI_MEI I
36643686
public static final field WU_LIAN I
36653687
public static final field WU_LIAO I
@@ -3678,6 +3700,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
36783700
public static final field XI_GUA I
36793701
public static final field XU I
36803702
public static final field YANG_TUO I
3703+
public static final field YAN_HUA I
36813704
public static final field YAO I
36823705
public static final field YIN_XIAN I
36833706
public static final field YI_WEN I
@@ -3717,10 +3740,12 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
37173740
public static final field names [Ljava/lang/String;
37183741
public static final field 不 I
37193742
public static final field 不开心 I
3743+
public static final field 举牌牌 I
37203744
public static final field 乒乓 I
37213745
public static final field 亲亲 I
37223746
public static final field 仔细分析 I
37233747
public static final field 佛系 I
3748+
public static final field 你真棒棒 I
37243749
public static final field 便便 I
37253750
public static final field 偷看 I
37263751
public static final field 偷笑 I
@@ -3732,6 +3757,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
37323757
public static final field 凋谢 I
37333758
public static final field 击掌 I
37343759
public static final field 刀 I
3760+
public static final field 加一 I
37353761
public static final field 加油 I
37363762
public static final field 加油必胜 I
37373763
public static final field 加油抱抱 I
@@ -3779,6 +3805,8 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
37793805
public static final field 困 I
37803806
public static final field 坏笑 I
37813807
public static final field 大哭 I
3808+
public static final field 大展宏兔 I
3809+
public static final field 大怨种 I
37823810
public static final field 大笑 I
37833811
public static final field 太南了 I
37843812
public static final field 太阳 I
@@ -3790,8 +3818,10 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
37903818
public static final field 好闪 I
37913819
public static final field 委屈 I
37923820
public static final field 嫌弃 I
3821+
public static final field 完成 I
37933822
public static final field 害怕 I
37943823
public static final field 害羞 I
3824+
public static final field 对号 I
37953825
public static final field 小样儿 I
37963826
public static final field 小纠结 I
37973827
public static final field 尴尬 I
@@ -3813,18 +3843,22 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
38133843
public static final field 怄火 I
38143844
public static final field 恭喜 I
38153845
public static final field 悠闲 I
3846+
public static final field 惊吓 I
38163847
public static final field 惊呆 I
38173848
public static final field 惊喜 I
38183849
public static final field 惊恐 I
38193850
public static final field 惊讶 I
38203851
public static final field 憨笑 I
38213852
public static final field 我不看 I
3853+
public static final field 我想开了 I
3854+
public static final field 我方了 I
38223855
public static final field 我最美 I
38233856
public static final field 我没事 I
38243857
public static final field 我酸了 I
38253858
public static final field 扇脸 I
38263859
public static final field 手枪 I
38273860
public static final field 打call I
3861+
public static final field 打招呼 I
38283862
public static final field 打脸 I
38293863
public static final field 扔狗 I
38303864
public static final field 托脸 I
@@ -3863,6 +3897,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
38633897
public static final field 无奈 I
38643898
public static final field 无眼笑 I
38653899
public static final field 无聊 I
3900+
public static final field 明白 I
38663901
public static final field 晕 I
38673902
public static final field 暗中观察 I
38683903
public static final field 暴击 I
@@ -3882,6 +3917,8 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
38823917
public static final field 灯笼 I
38833918
public static final field 炸弹 I
38843919
public static final field 点赞 I
3920+
public static final field 烟花 I
3921+
public static final field 热化了 I
38853922
public static final field 爆筋 I
38863923
public static final field 爱你 I
38873924
public static final field 爱心 I
@@ -3894,6 +3931,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
38943931
public static final field 玫瑰 I
38953932
public static final field 瓢虫 I
38963933
public static final field 生日快乐 I
3934+
public static final field 生气 I
38973935
public static final field 甩头 I
38983936
public static final field 疑问 I
38993937
public static final field 白眼 I
@@ -3905,25 +3943,30 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
39053943
public static final field 示爱 I
39063944
public static final field 礼物 I
39073945
public static final field 祈祷 I
3946+
public static final field 福萝卜 I
39083947
public static final field 笑哭 I
39093948
public static final field 篮球 I
39103949
public static final field 糊脸 I
39113950
public static final field 糗大了 I
39123951
public static final field 红包 I
39133952
public static final field 红包包 I
3953+
public static final field 红包多多 I
39143954
public static final field 羊驼 I
39153955
public static final field 老色痞 I
39163956
public static final field 胖三斤 I
39173957
public static final field 胜利 I
39183958
public static final field 脑阔疼 I
39193959
public static final field 舔一舔 I
3960+
public static final field 舔屏 I
39203961
public static final field 色 I
3962+
public static final field 花朵脸 I
39213963
public static final field 花痴 I
39223964
public static final field 茶 I
39233965
public static final field 药 I
39243966
public static final field 菊花 I
39253967
public static final field 菜刀 I
39263968
public static final field 菜狗 I
3969+
public static final field 虎虎生威 I
39273970
public static final field 蛋 I
39283971
public static final field 蛋糕 I
39293972
public static final field 街舞 I
@@ -3933,6 +3976,7 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
39333976
public static final field 请 I
39343977
public static final field 调皮 I
39353978
public static final field 谢红包 I
3979+
public static final field 豹富 I
39363980
public static final field 赞 I
39373981
public static final field 足球 I
39383982
public static final field 跳绳 I
@@ -3945,7 +3989,9 @@ public final class net/mamoe/mirai/message/data/Face : net/mamoe/mirai/message/c
39453989
public static final field 送花 I
39463990
public static final field 鄙视 I
39473991
public static final field 酷 I
3992+
public static final field 酸Q I
39483993
public static final field 钞票 I
3994+
public static final field 错号 I
39493995
public static final field 闪电 I
39503996
public static final field 闭嘴 I
39513997
public static final field 问号脸 I
@@ -5355,6 +5401,47 @@ public final class net/mamoe/mirai/message/data/SingleMessage$Serializer : kotli
53555401
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/SingleMessage;)V
53565402
}
53575403

5404+
public final class net/mamoe/mirai/message/data/SuperFace : net/mamoe/mirai/message/code/CodableMessage, net/mamoe/mirai/message/data/HummerMessage {
5405+
public static final field Key Lnet/mamoe/mirai/message/data/SuperFace$Key;
5406+
public static final field SERIAL_NAME Ljava/lang/String;
5407+
public synthetic fun <init> (IILjava/lang/String;ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
5408+
public fun contentToString ()Ljava/lang/String;
5409+
public fun equals (Ljava/lang/Object;)Z
5410+
public static final fun from (Lnet/mamoe/mirai/message/data/Face;)Lnet/mamoe/mirai/message/data/SuperFace;
5411+
public static final fun fromOrNull (Lnet/mamoe/mirai/message/data/Face;)Lnet/mamoe/mirai/message/data/SuperFace;
5412+
public final fun getFace ()I
5413+
public final fun getId ()Ljava/lang/String;
5414+
public fun getKey ()Lnet/mamoe/mirai/message/data/MessageKey;
5415+
public final fun getName ()Ljava/lang/String;
5416+
public final fun getType ()I
5417+
public fun hashCode ()I
5418+
public fun toString ()Ljava/lang/String;
5419+
public static final fun write$Self (Lnet/mamoe/mirai/message/data/SuperFace;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
5420+
}
5421+
5422+
public final class net/mamoe/mirai/message/data/SuperFace$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
5423+
public static final field INSTANCE Lnet/mamoe/mirai/message/data/SuperFace$$serializer;
5424+
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
5425+
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
5426+
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/data/SuperFace;
5427+
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
5428+
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
5429+
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/data/SuperFace;)V
5430+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
5431+
}
5432+
5433+
public final class net/mamoe/mirai/message/data/SuperFace$Key : net/mamoe/mirai/message/data/AbstractPolymorphicMessageKey {
5434+
public final fun from (Lnet/mamoe/mirai/message/data/Face;)Lnet/mamoe/mirai/message/data/SuperFace;
5435+
public final fun fromOrNull (Lnet/mamoe/mirai/message/data/Face;)Lnet/mamoe/mirai/message/data/SuperFace;
5436+
public final fun serializer ()Lkotlinx/serialization/KSerializer;
5437+
}
5438+
5439+
public final class net/mamoe/mirai/message/data/SuperFaceKt {
5440+
public static final synthetic fun toFace (Lnet/mamoe/mirai/message/data/SuperFace;)Lnet/mamoe/mirai/message/data/Face;
5441+
public static final synthetic fun toSuperFace (Lnet/mamoe/mirai/message/data/Face;)Lnet/mamoe/mirai/message/data/SuperFace;
5442+
public static final synthetic fun toSuperFaceOrNull (Lnet/mamoe/mirai/message/data/Face;)Lnet/mamoe/mirai/message/data/SuperFace;
5443+
}
5444+
53585445
public abstract interface class net/mamoe/mirai/message/data/UnsupportedMessage : net/mamoe/mirai/message/data/MessageContent {
53595446
public static final field Companion Lnet/mamoe/mirai/message/data/UnsupportedMessage$Companion;
53605447
public static final field SERIAL_NAME Ljava/lang/String;

0 commit comments

Comments
 (0)