Skip to content

Commit 80cc2b5

Browse files
committed
fix QQSession on QQ9170
1 parent 0f99e56 commit 80cc2b5

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

app/src/main/java/cc/hicore/message/chat/SessionUtils.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121

2222
package cc.hicore.message.chat;
2323

24+
import static cc.ioctl.util.HostInfo.requireMinQQVersion;
2425
import static cc.ioctl.util.HostInfo.requireMinTimVersion;
2526

2627
import cc.hicore.ReflectUtil.XField;
2728
import cc.hicore.Utils.XLog;
2829
import io.github.qauxv.bridge.kernelcompat.ContactCompat;
2930
import io.github.qauxv.util.Initiator;
31+
import io.github.qauxv.util.QQVersion;
3032
import io.github.qauxv.util.TIMVersion;
3133
import java.io.Serializable;
3234

@@ -57,14 +59,20 @@ public static Serializable AIOParam2ContactRaw(Object AIOParam) {
5759
}
5860

5961
public static String getCurrentPeerIDByAIOContact(Object AIOContact) throws Exception {
60-
return XField.obj(AIOContact).name(requireMinTimVersion(TIMVersion.TIM_4_0_95_BETA) ? "e" : "f").type(String.class).get();
62+
return XField.obj(AIOContact).name(
63+
(requireMinTimVersion(TIMVersion.TIM_4_0_95_BETA) || requireMinQQVersion(QQVersion.QQ_9_1_70))
64+
? "e" : "f").type(String.class).get();
6165
}
6266

6367
public static int getCurrentChatTypeByAIOContact(Object AIOContact) throws Exception {
64-
return XField.obj(AIOContact).name(requireMinTimVersion(TIMVersion.TIM_4_0_95_BETA) ? "d" : "e").type(int.class).get();
68+
return XField.obj(AIOContact).name(
69+
(requireMinTimVersion(TIMVersion.TIM_4_0_95_BETA) || requireMinQQVersion(QQVersion.QQ_9_1_70))
70+
? "d" : "e").type(int.class).get();
6571
}
6672

6773
public static String getCurrentGuildIDByAIOContact(Object AIOContact) throws Exception {
68-
return XField.obj(AIOContact).name(requireMinTimVersion(TIMVersion.TIM_4_0_95_BETA) ? "f" : "g").type(String.class).get();
74+
return XField.obj(AIOContact).name(
75+
(requireMinTimVersion(TIMVersion.TIM_4_0_95_BETA) || requireMinQQVersion(QQVersion.QQ_9_1_70))
76+
? "f" : "g").type(String.class).get();
6977
}
7078
}

app/src/main/java/io/github/qauxv/util/QQVersion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,5 @@ private QQVersion() {
184184
public static final long QQ_9_1_60 = 9388;
185185
public static final long QQ_9_1_65_BETA_24705 = 9522;
186186
public static final long QQ_9_1_65 = 9558;
187+
public static final long QQ_9_1_70 = 9898;
187188
}

0 commit comments

Comments
 (0)