1. Contact.kt添加type,province等一系列方法

2. Message.kt添加date,forward等方法
3. 添加say方法
4. 还未测试

Author: LuSingTea

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

@@ -4,6 +4,7 @@ package io.github.wechaty;
 import io.github.wechaty.eventEmitter.Event
 import io.github.wechaty.eventEmitter.EventEmitter
 import io.github.wechaty.eventEmitter.Listener
+import io.github.wechaty.filebox.FileBox
 import io.github.wechaty.io.github.wechaty.schemas.EventEnum
 import io.github.wechaty.listener.*
 import io.github.wechaty.memorycard.MemoryCard
@@ -13,6 +14,8 @@ import io.github.wechaty.user.*
 import io.github.wechaty.user.manager.*
 import org.slf4j.LoggerFactory
 import java.util.*
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Future
 import java.util.concurrent.locks.ReentrantLock
 
 val PUPPET_MEMORY_NAME = "puppet"
@@ -82,6 +85,34 @@ class Wechaty private constructor(private var wechatyOptions: WechatyOptions) :
         return wechatyOptions.name
     }
 
+    fun say(something: Any): Future<Void> {
+
+        val msgId: String?
+        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{
         return on(EventEnum.LOGIN,listener)
     }

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

@@ -4,8 +4,10 @@ import io.github.wechaty.Accessory
 import io.github.wechaty.Puppet
 import io.github.wechaty.Wechaty
 import io.github.wechaty.filebox.FileBox
+import io.github.wechaty.schemas.ContactGender
 import io.github.wechaty.schemas.ContactPayload
 import io.github.wechaty.schemas.ContactQueryFilter
+import io.github.wechaty.schemas.ContactType
 import io.github.wechaty.type.Sayable
 import io.github.wechaty.utils.FutureUtils
 import org.apache.commons.lang3.StringUtils
@@ -94,6 +96,29 @@ open class Contact(wechaty: Wechaty,val id:String) : Sayable, Accessory(wechaty)
     fun name():String{
         return payload?.name ?: ""
     }
+    fun type(): ContactType {
+        return payload?.type ?: ContactType.Unknown
+    }
+    fun gender(): ContactGender {
+        return payload?.gender ?: ContactGender.Unknown
+    }
+
+    fun province(): String? {
+        return payload?.province
+    }
+
+    fun city(): String? {
+        return payload?.city
+    }
+
+    fun self(): Boolean {
+        val userId = this.puppet.selfId()
+
+        if (userId == null) {
+            return false
+        }
+        return this.id === userId
+    }
 
     fun setAlias(newAlias:String){
         if(payload == null){

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

@@ -18,7 +18,6 @@ class ContactSelf(wechaty: Wechaty,id: String) : Contact(wechaty,id){
             puppet.setContactAvatar(super.id, fileBox)
             null
         }
-
     }
 
     fun qrcode(): Future<String> {

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

@@ -7,9 +7,11 @@ import io.github.wechaty.schemas.MessagePayload
 import io.github.wechaty.schemas.MessageType
 import io.github.wechaty.schemas.RoomMemberQueryFilter
 import io.github.wechaty.type.Sayable
+import io.grpc.netty.shaded.io.netty.util.concurrent.CompleteFuture
 import org.apache.commons.collections4.CollectionUtils
 import org.apache.commons.lang3.StringUtils
 import org.slf4j.LoggerFactory
+import java.util.*
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Future
 import java.util.regex.Pattern
@@ -124,6 +126,28 @@ open class Message(wechaty: Wechaty,val id: String) : Sayable, Accessory(wechaty
         return StringUtils.equals(selfId,from?.id)
     }
 
+    fun date(): Date {
+        val payload = wechaty.getPuppet().messagePayload(this.id).get()
+        return Date(payload.timestamp!! * 1000)
+    }
+
+    fun forward(to: Any): Future<Void> {
+        log.debug("Message, forward({})", to)
+        when(to) {
+            is Room -> {
+                this.puppet.messageForward(to.id, this.id).get()
+            }
+            is Contact -> {
+                this.puppet.messageForward(to.id, this.id).get()
+            }
+            else -> {
+                throw Exception("unkown forward type")
+            }
+        }
+        return CompletableFuture.completedFuture(null)
+    }
+
+
     fun mentionList():List<Contact>{
         val room = this.room()
 

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

@@ -35,7 +35,7 @@ class MiniProgram(var payload: MiniProgramPayload) {
 
     companion object{
 
-        fun create():MiniProgram{
+        fun create(): MiniProgram {
             val payload = MiniProgramPayload()
             return MiniProgram(payload);
         }

wechaty/src/main/kotlin/io/github/wechaty/user/manager/ContactManager.kt

@@ -30,9 +30,6 @@ class ContactManager(wechaty: Wechaty):Accessory(wechaty) {
 
     }
 
-
-
-
     fun find(queryFilter: ContactQueryFilter):Contact?{
 
         val findAll = findAll(queryFilter)