#21 finish PadplusMessagePayload to MessagePayload

jcai · jcai · commit 2e6ce3982717 · 2020-06-24T17:30:07.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -81,6 +81,11 @@
         <artifactId>jackson-databind</artifactId>
         <version>2.11.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-xml</artifactId>
+        <version>2.11.0</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-scala_${scala-binary-version}</artifactId>
diff --git a/wechaty-puppet-padplus/pom.xml b/wechaty-puppet-padplus/pom.xml
@@ -46,6 +46,10 @@
       <artifactId>javase</artifactId>
       <version>3.4.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-all</artifactId>
diff --git a/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/internal/LocalStore.scala b/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/internal/LocalStore.scala
@@ -5,6 +5,9 @@ import java.io.File
 import com.google.protobuf.ByteString
 import org.fusesource.leveldbjni.JniDBFactory._
 import org.iq80.leveldb.{DB, Options}
+import wechaty.puppet.schemas.Puppet.objectMapper
+
+import scala.reflect.ClassTag
 
 
 /**
@@ -29,6 +32,12 @@ class LocalStore(storePath:String) {
   def get(key:String): Option[ByteString]={
     get(ByteString.copyFromUtf8(key))
   }
+  def getObject[T](key:String)(implicit classTag: ClassTag[T]): Option[T]={
+    get(key).map(str=>{
+      objectMapper.readValue(str.toStringUtf8,classTag.runtimeClass.asInstanceOf[Class[T]])
+    })
+  }
+
   def get(key:ByteString): Option[ByteString]={
     val value = db.get(key.toByteArray)
     if(value != null) Some(ByteString.copyFrom(value))
diff --git a/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/ContactRawSupport.scala b/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/ContactRawSupport.scala
@@ -110,7 +110,7 @@ trait ContactRawSupport {
       padplusContactPayload.sex = ContactGender.Unknown
       padplusContactPayload.userName = loginData.userName
       padplusContactPayload.verifyFlag = 0
-      saveRawContactPayload(padplusContactPayload.userName, padplusContactPayload)
+      savePadplusContactPayload( padplusContactPayload)
       val eventLoginPayload = new EventLoginPayload
       eventLoginPayload.contactId = padplusContactPayload.userName
       emit(PuppetEventName.LOGIN, eventLoginPayload)
@@ -132,15 +132,15 @@ trait ContactRawSupport {
           rawContactPayload.nickName = wechatUser.get("nickName").asText()
           rawContactPayload.sex = ContactGender.Unknown
           rawContactPayload.userName = wechatUser.get("userName").asText()
-          saveRawContactPayload(rawContactPayload.userName, rawContactPayload)
+          savePadplusContactPayload(rawContactPayload)
           // "{\"uin\":1213374243,\"online\":true,\"wechatUser\":{\"headImgUrl\":\"http://wx.qlogo.cn/mmhead/ver_1/iag5D2R2U9ibgTW2eh7XUbPTHqpEMP2DhSpXSBeQYzEPWgEmLIx5IDibwicGh4fTh4IibkL4hNianoiaTzXmVORnm1O4ZjhxfPosKzkMPSwic8Iicylk/0\",\"nickName\":\"\351\230\277\350\224\241\",\"uin\":1213374243,\"userName\":\"wxid_gbk03zsepqny22\",\"alias\":\"\",\"verifyFlag\":0}}"
           selfId = Some(rawContactPayload.userName)
         }
 
         contactSelfInfo { padplusContact =>
           selfId = Some(padplusContact.userName)
           logger.debug("contactSelf:{}", padplusContact)
-          saveRawContactPayload(padplusContact.userName, padplusContact)
+          savePadplusContactPayload(padplusContact)
           val eventLoginPayload = new EventLoginPayload
           eventLoginPayload.contactId = padplusContact.userName
           emit(PuppetEventName.LOGIN, eventLoginPayload)
@@ -169,7 +169,7 @@ trait ContactRawSupport {
             throw new PadplusError(PadplusErrorType.NO_CACHE, `CONTACT_MODIFY`)
           }
            */
-            saveRoom(roomPayload)
+            savePadplusRoomPayload(roomPayload)
 
             roomPayload
           }
@@ -180,7 +180,7 @@ trait ContactRawSupport {
           val result:Try[PadplusContactPayload] = Try {
             val contact               = objectMapper.readValue(data, classOf[GrpcContactPayload])
             val padplusContactPayload = convertFromGrpcContact(contact)
-            saveRawContactPayload(padplusContactPayload.userName, padplusContactPayload)
+            savePadplusContactPayload(padplusContactPayload)
             padplusContactPayload
           }
           val callbacks =contactPromises.getIfPresent(userName)
@@ -201,7 +201,7 @@ trait ContactRawSupport {
         contactSelfInfo { padplusContact =>
           selfId = Some(padplusContact.userName)
           logger.debug("contactSelf:{}", padplusContact)
-          saveRawContactPayload(padplusContact.userName, padplusContact)
+          savePadplusContactPayload(padplusContact)
           val eventLoginPayload = new EventLoginPayload
           eventLoginPayload.contactId = padplusContact.userName
           emit(PuppetEventName.LOGIN, eventLoginPayload)
diff --git a/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/LocalStoreSupport.scala b/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/LocalStoreSupport.scala
@@ -3,8 +3,8 @@ package wechaty.padplus.support
 import com.google.protobuf.ByteString
 import wechaty.padplus.PuppetPadplus
 import wechaty.padplus.internal.LocalStore
-import wechaty.padplus.schemas.GrpcSchemas.GrpcMessagePayload
 import wechaty.padplus.schemas.ModelContact.PadplusContactPayload
+import wechaty.padplus.schemas.ModelMessage.PadplusMessagePayload
 import wechaty.padplus.schemas.ModelRoom.{PadplusRoomMemberMap, PadplusRoomPayload}
 import wechaty.puppet.schemas.Puppet.objectMapper
 
@@ -17,8 +17,8 @@ trait LocalStoreSupport {
   self:PuppetPadplus=>
   protected var store:LocalStore =  _
   private val uinKey = ByteString.copyFromUtf8("uin")
-  private val messageKeyFormat="MSG_%s"
-  private val contactKeyFormat="CON_%s"
+  private val messageKeyFormat="MS_%s"
+  private val contactKeyFormat="CO_%s"
   private val roomMemberKeyFormat="RM_%s"
   protected def saveUin(uin:ByteString): Unit ={
     if(!uin.isEmpty){
@@ -31,35 +31,32 @@ trait LocalStoreSupport {
   protected def deleteUin():Unit ={
     store.delete(uinKey)
   }
-  protected def saveRawContactPayload(contactId:String,payload:PadplusContactPayload): Unit ={
-    store.put(contactKeyFormat.format(contactId),objectMapper.writeValueAsString(payload))
+  protected def savePadplusContactPayload(payload:PadplusContactPayload): Unit ={
+    store.put(contactKeyFormat.format(payload.userName),payload)
   }
-  protected def getRawContactPayload(contactId:String):Option[PadplusContactPayload] ={
-    store.get(contactKeyFormat.format(contactId)).map(str=>{
-      objectMapper.readValue(str.toStringUtf8,classOf[PadplusContactPayload])
-    })
+  protected def getPadplusContactPayload(contactId:String):Option[PadplusContactPayload] ={
+    store.getObject[PadplusContactPayload](contactKeyFormat.format(contactId))
   }
-  protected def saveRawMessagePayload(messageId:String,rawMessage:String): Unit ={
-    store.put(messageKeyFormat.format(messageId),rawMessage)
+  protected def getPadplusMessagePayload(messageId:String): Option[PadplusMessagePayload]={
+    store.getObject[PadplusMessagePayload](messageKeyFormat.format(messageId))
   }
-  protected def saveRoom(roomPayload:PadplusRoomPayload): Unit ={
-    store.put(roomPayload.chatroomId,objectMapper.writeValueAsString(roomPayload))
+  protected def savePadplusMessagePayload(padplusMessagePayload: PadplusMessagePayload): Unit ={
+    store.put(messageKeyFormat.format(padplusMessagePayload.msgId),padplusMessagePayload)
+  }
+  protected def savePadplusRoomPayload(roomPayload:PadplusRoomPayload): Unit ={
+    store.put(roomPayload.chatroomId,roomPayload)
   }
   protected def getPadplusRoomPayload(roomId:String):Option[PadplusRoomPayload]={
-    store.get(roomId).map(v=>objectMapper.readValue(v.toStringUtf8,classOf[PadplusRoomPayload]))
+    store.getObject[PadplusRoomPayload](roomId)
   }
   protected def savePadplusRoomMembers(roomId:String,padplusRoomMemberMap: PadplusRoomMemberMap): Unit ={
-    store.put(roomMemberKeyFormat.format(roomId),objectMapper.writeValueAsString(padplusRoomMemberMap))
+    store.put(roomMemberKeyFormat.format(roomId),padplusRoomMemberMap)
   }
   protected def getPadplusRoomMembers(roomId:String): Option[PadplusRoomMemberMap]={
-    store.get(roomMemberKeyFormat.format(roomId)).map(v=>{
-      objectMapper.readValue(v.toStringUtf8,classOf[PadplusRoomMemberMap])
-    })
+    store.getObject[PadplusRoomMemberMap](roomMemberKeyFormat.format(roomId))
   }
-  protected def getGrpcMessagePayload(messageId:String):Option[GrpcMessagePayload] ={
-    store.get(messageKeyFormat.format(messageId)).map(str=>{
-      objectMapper.readValue(str.toStringUtf8,classOf[GrpcMessagePayload])
-    })
+  private implicit def payloadToString[T](value:T):String={
+    objectMapper.writeValueAsString(value)
   }
 
   protected def startLocalStore(): Unit ={
diff --git a/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/MessageRawSupport.scala b/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/MessageRawSupport.scala
@@ -1,15 +1,17 @@
 package wechaty.padplus.support
 
+import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.typesafe.scalalogging.LazyLogging
 import wechaty.padplus.grpc.PadPlusServerOuterClass.{ApiType, ResponseType, StreamResponse}
 import wechaty.padplus.schemas.GrpcSchemas.GrpcMessagePayload
+import wechaty.padplus.schemas.ModelMessage.PadplusMessagePayload
 import wechaty.padplus.schemas.PadplusEnums.PadplusMessageType
 import wechaty.puppet.ResourceBox
 import wechaty.puppet.events.EventEmitter
 import wechaty.puppet.schemas.Event.EventMessagePayload
 import wechaty.puppet.schemas.Image.ImageType.Type
 import wechaty.puppet.schemas.Message.{MessagePayload, MessageType}
-import wechaty.puppet.schemas.Puppet.{PuppetEventName, objectMapper}
+import wechaty.puppet.schemas.Puppet.{PuppetEventName, isBlank, objectMapper}
 import wechaty.puppet.schemas.{Message, MiniProgram, Puppet, UrlLink}
 import wechaty.puppet.support.MessageSupport
 
@@ -56,38 +58,38 @@ trait MessageRawSupport {
 
 
   override protected def messageRawPayload(messageId: String): Message.MessagePayload = {
-    getGrpcMessagePayload(messageId) match {
+    getPadplusMessagePayload(messageId) match {
       case Some(rawPayload) =>
         val messagePayload = new MessagePayload
-        messagePayload.id = rawPayload.MsgId
-        messagePayload.`type` = messageType(PadplusMessageType(rawPayload.MsgType))
+        messagePayload.id = rawPayload.msgId
+        messagePayload.`type` = messageType(rawPayload.msgType)
 
         /**
           * 1. Set Room Id
           */
-        if (isRoomId(rawPayload.FromUserName)) {
-          messagePayload.roomId = rawPayload.FromUserName
-        } else if (isRoomId(rawPayload.ToUserName)) {
-          messagePayload.roomId = rawPayload.ToUserName
+        if (isRoomId(rawPayload.fromUserName)) {
+          messagePayload.roomId = rawPayload.fromUserName
+        } else if (isRoomId(rawPayload.toUserName)) {
+          messagePayload.roomId = rawPayload.toUserName
         }
 
         /**
           * 2. Set To Contact Id
           */
-        if (isContactId(rawPayload.ToUserName)) {
+        if (isContactId(rawPayload.toUserName)) {
 
-          messagePayload.toId = rawPayload.ToUserName
+          messagePayload.toId = rawPayload.toUserName
         }
 
         /**
           * 3. Set From Contact Id
           */
-        if (isContactId(rawPayload.FromUserName)) {
+        if (isContactId(rawPayload.fromUserName)) {
 
-          messagePayload.fromId = rawPayload.FromUserName
+          messagePayload.fromId = rawPayload.fromUserName
 
         } else {
-          val parts = rawPayload.Content.split(":\n")
+          val parts = rawPayload.content.split(":\n")
           if (parts.length > 1) {
             if (isContactId(parts(0))) {
               messagePayload.fromId = parts(0)
@@ -99,13 +101,13 @@ trait MessageRawSupport {
           *
           * 4. Set Text
           */
-        if (isRoomId(rawPayload.FromUserName)) {
+        if (isRoomId(rawPayload.fromUserName)) {
 
-          val startIndex = rawPayload.Content.indexOf(":\n")
-          messagePayload.text = rawPayload.Content.substring(if (startIndex != -1) startIndex + 2 else 0)
+          val startIndex = rawPayload.content.indexOf(":\n")
+          messagePayload.text = rawPayload.content.substring(if (startIndex != -1) startIndex + 2 else 0)
 
         } else {
-          messagePayload.text = rawPayload.Content
+          messagePayload.text = rawPayload.content
         }
 
         if (messagePayload.`type` == MessageType.Recalled) {
@@ -116,13 +118,14 @@ trait MessageRawSupport {
         /**
           * 6. Set mention list, only for room messages
           */
-        //TODO
-        //    if (roomId) {
-        //    const messageSource = await messageSourceParser(rawPayload.msgSource)
-        //    if (messageSource !== null && messageSource.atUserList) {
-        //    mentionIdList = messageSource.atUserList || []
-        //    }
-        //    }
+        if (!isBlank(messagePayload.roomId)) {
+          val xmlMapper = new XmlMapper();
+          println(rawPayload.msgSource)
+          val root = xmlMapper.readTree(rawPayload.msgSource)
+          if(root.has("atuserlist")){
+            messagePayload.mentionIdList = root.get("atuserlist").asText().split(",")
+          }
+        }
 
         /**
           * 6. Set Contact for ShareCard
@@ -147,7 +150,32 @@ trait MessageRawSupport {
       val payload                                  = objectMapper.readValue(rawMessageStr, classOf[GrpcMessagePayload])
       val eventMessagePayload                      = new EventMessagePayload
       eventMessagePayload.messageId = payload.MsgId
-      saveRawMessagePayload(payload.MsgId, rawMessageStr)
+      savePadplusMessagePayload(payload)
       emit(PuppetEventName.MESSAGE, eventMessagePayload)
   }
+  private implicit def convertMessageFromGrpcToPadplus (rawMessage: GrpcMessagePayload): PadplusMessagePayload= {
+    val padplusMessagePayload = new  PadplusMessagePayload
+    padplusMessagePayload.appMsgType= rawMessage.AppMsgType
+    padplusMessagePayload.content= rawMessage.Content
+    padplusMessagePayload.createTime= rawMessage.CreateTime
+    padplusMessagePayload.fileName= if(isBlank(rawMessage.FileName))  rawMessage.fileName else rawMessage.FileName
+    padplusMessagePayload.fromMemberNickName= rawMessage.FromMemberNickName
+    padplusMessagePayload.fromMemberUserName= rawMessage.FromMemberUserName
+    padplusMessagePayload.fromUserName= rawMessage.FromUserName
+    padplusMessagePayload.imgBuf= rawMessage.ImgBuf
+    padplusMessagePayload.imgStatus= rawMessage.ImgStatus
+    padplusMessagePayload.l1MsgType= rawMessage.L1MsgType
+    padplusMessagePayload.msgId= rawMessage.MsgId
+    padplusMessagePayload.msgSource= rawMessage.MsgSource
+    padplusMessagePayload.msgSourceCd= rawMessage.msgSourceCd
+    padplusMessagePayload.msgType= PadplusMessageType(rawMessage.MsgType)
+    padplusMessagePayload.newMsgId= rawMessage.NewMsgId
+    padplusMessagePayload.pushContent= rawMessage.PushContent
+    padplusMessagePayload.status= rawMessage.Status
+    padplusMessagePayload.toUserName= rawMessage.ToUserName
+    padplusMessagePayload.uin= rawMessage.Uin
+    padplusMessagePayload.url= rawMessage.Url
+    padplusMessagePayload.wechatUserName= rawMessage.wechatUserName
+    padplusMessagePayload
+  }
 }
diff --git a/wechaty-puppet/src/main/scala/wechaty/puppet/support/RoomMemberSupport.scala b/wechaty-puppet/src/main/scala/wechaty/puppet/support/RoomMemberSupport.scala
@@ -63,7 +63,7 @@ trait RoomMemberSupport {
       */
     val rawPayload = this.roomMemberRawPayload(roomId, memberId)
     if (rawPayload == null) {
-//      throw new Error("contact(" + memberId + ") is not in the Room(" + roomId + ")")
+      throw new Error("contact(" + memberId + ") is not in the Room(" + roomId + ")")
     }
     this.cacheRoomMemberPayload.put(CACHE_KEY, rawPayload)
     rawPayload
diff --git a/wechaty/src/main/scala/wechaty/user/Message.scala b/wechaty/src/main/scala/wechaty/user/Message.scala
@@ -2,6 +2,7 @@ package wechaty.user
 
 import java.util.Date
 
+import com.typesafe.scalalogging.LazyLogging
 import wechaty.Wechaty.PuppetResolver
 import wechaty.helper.ImplicitHelper._
 import wechaty.puppet.schemas.Message.MessageType
@@ -15,7 +16,7 @@ import wechaty.puppet.{ResourceBox, schemas}
   * @author <a href="mailto:jcai@ganshane.com">Jun Tsai</a>
   * @since 2020-06-02
   */
-class Message(messageId:String)(implicit resolver: PuppetResolver) {
+class Message(messageId:String)(implicit resolver: PuppetResolver) extends LazyLogging{
   private val MENTION_MEMBER_PATTERN= ("@([^\u2005^\u0020^$]+)")
   lazy val payload: schemas.Message.MessagePayload = {
     resolver
@@ -159,6 +160,7 @@ class Message(messageId:String)(implicit resolver: PuppetResolver) {
       room.get.alias(member).getOrElse(member.name)
     }
 
+    logger.debug(s"message text:$text mentionsList:$list")
     val mentionNameList = list.map(toAliasName)
 
     val textWithoutMention = mentionNameList.foldLeft(text)((prev, cur) => {
diff --git a/wechaty/src/test/scala/wechaty/user/MessageTest.scala b/wechaty/src/test/scala/wechaty/user/MessageTest.scala
@@ -27,9 +27,9 @@ class MessageTest extends TestBase{
     stubFor(unaryMethod(PuppetGrpc.getMessagePayloadMethod)
       .willReturn(response))
 
-    val method = unaryMethod(PuppetGrpc.getContactPayloadMethod)
     memberIds.toList match{
       case head::remain=>
+        val method = unaryMethod(PuppetGrpc.getContactPayloadMethod)
         val response = ContactPayloadResponse.newBuilder()
           .setName(head)
           .build()
@@ -40,9 +40,9 @@ class MessageTest extends TestBase{
             .build()
           n.nextWillReturn(response)
         }}
+        stubFor(method)
       case Nil =>
     }
-    stubFor(method)
 
     val roomMemberPayloadResponse = RoomMemberPayloadResponse.newBuilder().build()
     stubFor(unaryMethod(PuppetGrpc.getRoomMemberPayloadMethod)
@@ -98,6 +98,18 @@ class MessageTest extends TestBase{
     Assertions.assertEquals("中文中文测试",message.mentionText())
   }
   @Test
+  def testMentionAll: Unit ={
+    //测试名称特殊字符
+    val wexinText = "@所有人\u2005hello"
+    constructMessage(wexinText,"所有人")
+
+    val message = new Message("messageId")
+
+    val mentionList = message.mentionList
+    Assertions.assertEquals(1,message.mentionList.size)
+    Assertions.assertEquals("hello",message.mentionText())
+  }
+  @Test
   def testForward: Unit ={
     val roomId = "roomId"
     val response = MessagePayloadResponse.newBuilder()

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ trait RoomMemberSupport {`
`63`	`63`	`*/`
`64`	`64`	`val rawPayload = this.roomMemberRawPayload(roomId, memberId)`
`65`	`65`	`if (rawPayload == null) {`
`66`		`-// throw new Error("contact(" + memberId + ") is not in the Room(" + roomId + ")")`
	`66`	`+ throw new Error("contact(" + memberId + ") is not in the Room(" + roomId + ")")`
`67`	`67`	`}`
`68`	`68`	`this.cacheRoomMemberPayload.put(CACHE_KEY, rawPayload)`
`69`	`69`	`rawPayload`