diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt index d91f62355..34a6953b9 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt @@ -484,7 +484,7 @@ internal abstract class QQAndroidBotBase constructor( headers { append( "cookie", - "uin=o${selfQQ.id}; skey=${client.wLoginSigInfo.sKey.data.encodeToString()}; p_uin=o${selfQQ.id};" + "uin=o${id}; skey=${client.wLoginSigInfo.sKey.data.encodeToString()}; p_uin=o${id};" ) } } @@ -518,9 +518,9 @@ internal abstract class QQAndroidBotBase constructor( headers { append( "cookie", - "uin=o${selfQQ.id};" + + "uin=o${id};" + " skey=${client.wLoginSigInfo.sKey.data.encodeToString()};" + - " p_uin=o${selfQQ.id};" + + " p_uin=o${id};" + " p_skey=${client.wLoginSigInfo.psKeyMap["qun.qq.com"]?.data?.encodeToString()}; " ) } @@ -546,9 +546,9 @@ internal abstract class QQAndroidBotBase constructor( headers { append( "cookie", - "uin=o${selfQQ.id};" + + "uin=o${id};" + " skey=${client.wLoginSigInfo.sKey.data.encodeToString()};" + - " p_uin=o${selfQQ.id};" + + " p_uin=o${id};" + " p_skey=${client.wLoginSigInfo.psKeyMap["qun.qq.com"]?.data?.encodeToString()}; " ) } @@ -575,7 +575,7 @@ internal abstract class QQAndroidBotBase constructor( headers { append( "cookie", - "uin=o${selfQQ.id}; skey=${client.wLoginSigInfo.sKey.data.encodeToString()}; p_uin=o${selfQQ.id};" + "uin=o${id}; skey=${client.wLoginSigInfo.sKey.data.encodeToString()}; p_uin=o${id};" ) } } @@ -599,7 +599,7 @@ internal abstract class QQAndroidBotBase constructor( headers { append( "cookie", - "uin=o${selfQQ.id}; skey=${client.wLoginSigInfo.sKey.data.encodeToString()}; p_uin=o${selfQQ.id};" + "uin=o${id}; skey=${client.wLoginSigInfo.sKey.data.encodeToString()}; p_uin=o${id};" ) } } diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt index 2c9e8167f..11a2322c4 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt @@ -105,6 +105,7 @@ abstract class Bot : CoroutineScope, LowLevelBotAPIAccessor, BotJavaFriendlyAPI( /** * [User.id] 与 [Bot.id] 相同的 [_lowLevelNewFriend] 实例 */ + @MiraiExperimentalAPI abstract val selfQQ: Friend