|
21 | 21 |
|
22 | 22 | package cc.hicore.message.chat;
|
23 | 23 |
|
| 24 | +import static cc.ioctl.util.HostInfo.requireMinQQVersion; |
24 | 25 | import static cc.ioctl.util.HostInfo.requireMinTimVersion;
|
25 | 26 |
|
26 | 27 | import cc.hicore.ReflectUtil.XField;
|
27 | 28 | import cc.hicore.Utils.XLog;
|
28 | 29 | import io.github.qauxv.bridge.kernelcompat.ContactCompat;
|
29 | 30 | import io.github.qauxv.util.Initiator;
|
| 31 | +import io.github.qauxv.util.QQVersion; |
30 | 32 | import io.github.qauxv.util.TIMVersion;
|
31 | 33 | import java.io.Serializable;
|
32 | 34 |
|
@@ -57,14 +59,20 @@ public static Serializable AIOParam2ContactRaw(Object AIOParam) {
|
57 | 59 | }
|
58 | 60 |
|
59 | 61 | 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(); |
61 | 65 | }
|
62 | 66 |
|
63 | 67 | 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(); |
65 | 71 | }
|
66 | 72 |
|
67 | 73 | 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(); |
69 | 77 | }
|
70 | 78 | }
|
0 commit comments