#25 add GetContactSelf method

Author: jcai

wechaty-puppet-hostie/src/main/scala/wechaty/hostie/support/GrpcSupport.scala

@@ -151,7 +151,10 @@ trait GrpcSupport {
         val result = callback(value)
         promise.success(result)
       }
-      override def onError(t: Throwable): Unit = promise.failure(t)
+      override def onError(t: Throwable): Unit = {
+        logger.error(t.getMessage,t)
+        promise.failure(t)
+      }
       override def onCompleted(): Unit = {
         if(!promise.isCompleted) promise.failure(new IllegalStateException("server completed"))
       }

wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/ContactRawSupport.scala

@@ -11,7 +11,7 @@ import javax.imageio.ImageIO
 import wechaty.padplus.PuppetPadplus
 import wechaty.padplus.grpc.PadPlusServerOuterClass.{ApiType, ResponseType, StreamResponse}
 import wechaty.padplus.schemas.GrpcSchemas.GrpcQrCodeLogin
-import wechaty.padplus.schemas.ModelContact.{GetContactSelfInfoGrpcResponse, GrpcContactPayload, PadplusContactPayload}
+import wechaty.padplus.schemas.ModelContact.{GrpcContactPayload, PadplusContactPayload}
 import wechaty.padplus.schemas.ModelRoom.GrpcRoomPayload
 import wechaty.padplus.schemas.ModelUser.ScanData
 import wechaty.padplus.schemas.PadplusEnums.QrcodeStatus
@@ -61,9 +61,6 @@ trait ContactRawSupport extends LazyLogging{
         asyncRequestNothing(ApiType.GET_CONTACT,Some(json.toString)).flatMap(_=>promise.future)
     }
   }
-  def getContactSelfInfo():Future[GetContactSelfInfoGrpcResponse]={
-    asyncRequest[GetContactSelfInfoGrpcResponse](ApiType.GET_CONTACT_SELF_INFO)
-  }
 
   protected def loginPartialFunction(response: StreamResponse): PartialFunction[ResponseType, Unit] = {
     case ResponseType.QRCODE_SCAN =>
@@ -82,9 +79,9 @@ trait ContactRawSupport extends LazyLogging{
       //二维码的参数设置
       val hints             = new util.HashMap[DecodeHintType, String]();
       hints.put(DecodeHintType.CHARACTER_SET, "utf-8"); //设置二维码的编码
-    //得到解析结果,
-    val result  = multiFormatReader.decode(binaryBitmap, hints);
-    val payload = new EventScanPayload
+      //得到解析结果,
+      val result  = multiFormatReader.decode(binaryBitmap, hints);
+      val payload = new EventScanPayload
       payload.qrcode = result.getText
       logger.debug("Scan QR Code to login: %s\nhttps://wechaty.github.io/qrcode/%s\n".format(payload.status, payload.qrcode))
       emit(PuppetEventName.SCAN, payload)
@@ -104,9 +101,9 @@ trait ContactRawSupport extends LazyLogging{
       eventLoginPayload.contactId = padplusContactPayload.userName
       emit(PuppetEventName.LOGIN, eventLoginPayload)
 
-      Future {
-        getContact(padplusContactPayload.userName)
-      }
+      getContact(padplusContactPayload.userName).foreach(payload=>{
+        this.savePadplusContactPayload(payload)
+      })
     case ResponseType.AUTO_LOGIN =>
       logger.debug("response data:{}", response.getData)
       val autoLoginData = objectMapper.readTree(response.getData)
@@ -126,14 +123,10 @@ trait ContactRawSupport extends LazyLogging{
           selfId = Some(rawContactPayload.userName)
         }
 
-//        contactSelfInfo { padplusContact =>
-//          selfId = Some(padplusContact.userName)
-//          logger.debug("contactSelf:{}", padplusContact)
-//          savePadplusContactPayload(padplusContact)
-//          val eventLoginPayload = new EventLoginPayload
-//          eventLoginPayload.contactId = padplusContact.userName
-//          emit(PuppetEventName.LOGIN, eventLoginPayload)
-//        }
+        contactSelfInfo().foreach(payload=>{
+          savePadplusContactPayload(payload)
+        })
+
       } else {
         deleteUin()
         asyncRequest(ApiType.GET_QRCODE)
@@ -183,18 +176,8 @@ trait ContactRawSupport extends LazyLogging{
     val scanData    = objectMapper.readValue(scanRawData, classOf[ScanData])
     QrcodeStatus(scanData.status.intValue()) match {
       case QrcodeStatus.Scanned =>
-
       case QrcodeStatus.Confirmed =>
-//        contactSelfInfo { padplusContact =>
-//          selfId = Some(padplusContact.userName)
-//          logger.debug("contactSelf:{}", padplusContact)
-//          savePadplusContactPayload(padplusContact)
-//          val eventLoginPayload = new EventLoginPayload
-//          eventLoginPayload.contactId = padplusContact.userName
-//          emit(PuppetEventName.LOGIN, eventLoginPayload)
-//        }
       case QrcodeStatus.Canceled | QrcodeStatus.Expired =>
-
     }
   }
 

wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/ContactSelfRawSupport.scala

@@ -6,6 +6,8 @@ import wechaty.padplus.schemas.ModelContact.{GetContactSelfInfoGrpcResponse, Pad
 import wechaty.puppet.schemas.Contact.ContactGender
 import wechaty.puppet.support.ContactSelfSupport
 
+import scala.concurrent.Future
+
 /**
   *
   * @author <a href="mailto:[email protected]">Jun Tsai</a>
@@ -26,28 +28,27 @@ trait ContactSelfRawSupport {
 
   override def logout(): Unit = ???
 
-  def contactSelfInfo(callback:PadplusContactPayload=>Unit):Unit={
-//    asyncRequest[GetContactSelfInfoGrpcResponse](ApiType.GET_CONTACT_SELF_INFO)
-    asyncRequest[GetContactSelfInfoGrpcResponse](ApiType.GET_CONTACT_SELF_INFO).map{ contactPayload =>
-        val payload = new PadplusContactPayload
-        payload.alias = contactPayload.alias;
-        payload.bigHeadUrl = contactPayload.bigHeadImg;
-        payload.city = contactPayload.city
-        payload.contactFlag = 3
-        payload.contactType = 0
-        payload.country = contactPayload.country
-        payload.nickName = contactPayload.nickName
-        payload.province = contactPayload.province
-        payload.remark = ""
-        payload.sex = ContactGender(contactPayload.sex)
-        payload.signature = contactPayload.signature
-        payload.smallHeadUrl = contactPayload.smallHeadImg
-        payload.stranger = ""
-        payload.tagList = ""
-        payload.ticket = ""
-        payload.userName = contactPayload.userName
-        payload.verifyFlag = 0
-        callback(payload)
-    }
+  def contactSelfInfo():Future[PadplusContactPayload]={
+    asyncRequest[GetContactSelfInfoGrpcResponse](ApiType.GET_CONTACT_SELF_INFO).map(response =>{
+      val payload = new PadplusContactPayload
+      payload.alias = response.alias;
+      payload.bigHeadUrl = response.bigHeadImg;
+      payload.city = response.city
+      payload.contactFlag = 3
+      payload.contactType = 0
+      payload.country = response.country
+      payload.nickName = response.nickName
+      payload.province = response.province
+      payload.remark = ""
+      payload.sex = ContactGender(response.sex)
+      payload.signature = response.signature
+      payload.smallHeadUrl = response.smallHeadImg
+      payload.stranger = ""
+      payload.tagList = ""
+      payload.ticket = ""
+      payload.userName = response.userName
+      payload.verifyFlag = 0
+      payload
+    })
   }
 }

wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/GrpcSupport.scala

@@ -218,7 +218,10 @@ trait GrpcSupport {
         promise.success(result)
       }
 
-      override def onError(t: Throwable): Unit = promise.failure(t)
+      override def onError(t: Throwable): Unit = {
+        logger.error(t.getMessage,t)
+        promise.failure(t)
+      }
 
       override def onCompleted(): Unit = {
         if (!promise.isCompleted) promise.failure(new IllegalStateException("server completed"))

wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/MessageRawSupport.scala

@@ -46,6 +46,7 @@ trait MessageRawSupport {
 //      case _ => uploadFile(file.name,file.toStream)
 //    }
 
+    
     /*
     data = {
       fileName,

wechaty-puppet/src/main/scala/wechaty/puppet/support/MessageSupport.scala

@@ -33,7 +33,7 @@ trait MessageSupport {
 
   def messageSendContact(conversationId: String, contactId: String): String
 
-  def messageSendFile         (conversationId: String, file: ResourceBox): String
+  def messageSendFile(conversationId: String, file: ResourceBox): String
 
   def messageSendMiniProgram(conversationId: String, miniProgramPayload: MiniProgramPayload): String