1. 修复查找房间联系人的时候联系人没有payload的bug

Author: LuSingTea

wechaty-puppet/src/main/kotlin/Puppet.kt

@@ -841,6 +841,7 @@ abstract class Puppet : EventEmitter {
             }
 
             var idList = ArrayList(contactSearch(contactQuery, roomMemberIdList).get())
+
             val memberPayloadList = roomMemberIdList.mapNotNull { x -> roomMemberPayload(roomId, x).get() }
 
             if (query.roomAlias != null) {
@@ -943,6 +944,7 @@ abstract class Puppet : EventEmitter {
 
     fun setMemory(memoryCard: MemoryCard) {
         log.debug("Puppet, setMemory()")
+
         this.memory = memoryCard
     }
 

wechaty/src/main/kotlin/io/github/wechaty/Wechaty.kt

@@ -56,6 +56,14 @@ class Wechaty private constructor(private var wechatyOptions: WechatyOptions) :
 
 
     fun start(await: Boolean = false):Wechaty {
+        if (this.status.on() == StateEnum.ON) {
+            this.status.ready(StateEnum.ON)
+            return this
+        }
+
+        this.readyState.off(StateEnum.OFF)
+        this.status.on(StateEnum.PENDING)
+
         initPuppet()
         puppet.start().get()
 //        status = StateEnum.ON
@@ -78,40 +86,25 @@ class Wechaty private constructor(private var wechatyOptions: WechatyOptions) :
     }
 
     fun stop() {
+//        if (this.status.off() == StateEnum.OFF) {
+//            this.status.ready(StateEnum.OFF)
+//            return
+//        }
+//
+//        this.readyState.off(StateEnum.OFF)
+//        this.status.off(StateEnum.PENDING)
         puppet.stop()
+
+//        this.status.off(StateEnum.OFF)
     }
 
     fun name(): String {
         return wechatyOptions.name
     }
 
     fun say(something: Any): Future<Void> {
-
         val msgId: String?
         this.userSelf().say(something)
-//        this.puppet.selfId()?.let {
-//            when (something) {
-//                is String -> {
-//                    msgId = puppet.messageSendText(it, something).get()
-//                }
-//                is Contact -> {
-//                    msgId = puppet.messageSendContact(it, something.id).get()
-//                }
-//                is FileBox -> {
-//                    msgId = puppet.messageSendFile(it, something).get()
-//                }
-//                is UrlLink -> {
-//                    msgId = puppet.messageSendUrl(it, something.payload).get()
-//                }
-//                is MiniProgram -> {
-//                    msgId = puppet.messageSendMiniProgram(it, something.payload).get()
-//                }
-//                else -> {
-//                    throw Exception("unsupported arg:$something")
-//                }
-//            }
-//            return@let
-//        }
         return CompletableFuture.completedFuture(null)
     }
     fun onLogin(listener: LoginListener):Wechaty{

wechaty/src/main/kotlin/io/github/wechaty/user/Room.kt

@@ -325,11 +325,10 @@ class Room(wechaty: Wechaty, val id: String) : Accessory(wechaty), Sayable {
 
         val contactIdList = wechaty.getPuppet().roomMemberSearch(this.id, query).get()
         val contactList = contactIdList.map {
-            wechaty.contactManager.load(id)
+            id -> wechaty.contactManager.load(id)
         }
 
         return contactList
-
     }
 
     fun memberList(): List<Contact> {
@@ -341,7 +340,7 @@ class Room(wechaty: Wechaty, val id: String) : Accessory(wechaty), Sayable {
         }
 
         val contactList = memberIdList.map {
-            wechaty.contactManager.load(id)
+            id -> wechaty.contactManager.load(id)
         }
         return contactList