Event: improved support for Stranger

iTXTech · Jan 14, 2021 · 72c5e24 · 72c5e24
1 parent a1eef4c
commit 72c5e24
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/main/kotlin/org/itxtech/mirainative/bridge/MiraiBridge.kt b/src/main/kotlin/org/itxtech/mirainative/bridge/MiraiBridge.kt
@@ -221,8 +221,7 @@ object MiraiBridge {
                 writeShortLVPacket {
                     writeLong(qq.id)
                     writeString(qq.nick)
-                    //TODO: 备注
-                    writeString("")
+                    writeString(qq.remark)
                 }
             }
         }.encodeBase64()

diff --git a/src/main/kotlin/org/itxtech/mirainative/manager/CacheManager.kt b/src/main/kotlin/org/itxtech/mirainative/manager/CacheManager.kt
@@ -92,7 +92,10 @@ object CacheManager {
     fun getRecord(name: String) = records[name.replace(".mnrec", "")]
 
     fun findUser(id: Long): User? {
-        val member = MiraiNative.bot.getFriend(id) ?: senders[id]
+        var member = MiraiNative.bot.getFriend(id) ?: senders[id]
+        if (member == null) {
+            member = MiraiNative.bot.strangers[id]
+        }
         if (member == null) {
             MiraiNative.bot.groups.forEach {
                 if (it[id] != null) {

diff --git a/src/main/kotlin/org/itxtech/mirainative/manager/EventManager.kt b/src/main/kotlin/org/itxtech/mirainative/manager/EventManager.kt
@@ -85,6 +85,17 @@ object EventManager {
                     )
                 }
             }
+            subscribeAlways<StrangerMessageEvent> {
+                launchEvent {
+                    NativeBridge.eventPrivateMessage(
+                        Bridge.PRI_MSG_SUBTYPE_ONLINE_STATE,
+                        CacheManager.cacheMessage(message.source, chain = message),
+                        sender.id,
+                        ChainCodeConverter.chainToCode(message),
+                        0
+                    )
+                }
+            }
 
             // 权限事件
             subscribeAlways<MemberPermissionChangeEvent> {