@juzi/wechaty-puppet-service 1.0.16 → 1.0.19

package/src/server/puppet-implementation.ts

@@ -1209,8 +1209,13 @@ function puppetImplementation (
       try {
         const roomId = call.request.getId()
         const contactId = call.request.getContactId()
+        const contactIds = call.request.getContactIdsList()
 
-        await puppet.roomDel(roomId, contactId)
+        if (contactIds.length > 1) {
+          await puppet.roomDel(roomId, contactId)
+        } else {
+          await puppet.roomDel(roomId, contactId || (contactIds[0]) || '')
+        }
 
         return callback(null, new grpcPuppet.RoomDelResponse())
 
@@ -1502,11 +1507,16 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagContactTagAdd()')
 
       try {
-        const tagGroupId = call.request.getTagGroupId()
-        const tagId = call.request.getTagId()
-        const contactId = call.request.getContactId()
+        const tagsProb = call.request.getTagsList()
+        const contactIds = call.request.getContactIdsList()
+        const tags = tagsProb.map(tagProb => {
+          return {
+            id: tagProb.getId(),
+            groupId: tagProb.getGroupId(),
+          }
+        })
 
-        await puppet.tagContactTagAdd(tagGroupId, tagId, contactId)
+        await puppet.tagContactTagAdd(tags, contactIds)
 
         return callback(null, new grpcPuppet.TagContactTagAddResponse())
       } catch (e) {
@@ -1518,11 +1528,16 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagContactTagRemove()')
 
       try {
-        const tagGroupId = call.request.getTagGroupId()
-        const tagId = call.request.getTagId()
-        const contactId = call.request.getContactId()
+        const tagsProb = call.request.getTagsList()
+        const contactIds = call.request.getContactIdsList()
+        const tags = tagsProb.map(tagProb => {
+          return {
+            id: tagProb.getId(),
+            groupId: tagProb.getGroupId(),
+          }
+        })
 
-        await puppet.tagContactTagRemove(tagGroupId, tagId, contactId)
+        await puppet.tagContactTagRemove(tags, contactIds)
 
         return callback(null, new grpcPuppet.TagContactTagRemoveResponse())
       } catch (e) {
@@ -1537,13 +1552,11 @@ function puppetImplementation (
         const tagGroupName = call.request.getTagGroupName()
 
         const result = await puppet.tagGroupAdd(tagGroupName)
-        const payload = new grpcPuppet.TagGroupPayload()
+
         const response = new grpcPuppet.TagGroupAddResponse()
 
         if (result) {
-          payload.setId(result.id)
-          payload.setName(result.name)
-          response.setPayload(payload)
+          response.setTagGroupId(result)
         }
 
         return callback(null, response)
@@ -1573,18 +1586,16 @@ function puppetImplementation (
         const tagGroupId = call.request.getTagGroupId()
         const tagName = call.request.getTagName()
 
-        const result = await puppet.tagTagAdd(tagGroupId, tagName)
-        const payload = new grpcPuppet.TagPayload()
+        const result = await puppet.tagTagAdd(tagName, tagGroupId)
+        const tagIdentifier = new grpcPuppet.TagIdentifier()
         const response = new grpcPuppet.TagTagAddResponse()
 
         if (result) {
-          payload.setId(result.id)
-          payload.setName(result.name)
-          payload.setType(result.type)
+          tagIdentifier.setId(result.id)
           if (result.groupId) {
-            payload.setGroupId(result.groupId)
+            tagIdentifier.setGroupId(result.groupId)
           }
-          response.setPayload(payload)
+          response.setTag(tagIdentifier)
         }
 
         return callback(null, response)
@@ -1597,10 +1608,11 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagTagDelete()')
 
       try {
-        const tagGroupId = call.request.getTagGroupId()
-        const tagId = call.request.getTagId()
+        const tagProb = call.request.getTag()
+        const id = tagProb?.getId()!
+        const groupId = tagProb?.getGroupId()
 
-        await puppet.tagTagDelete(tagGroupId, tagId)
+        await puppet.tagTagDelete({ id, groupId })
 
         return callback(null, new grpcPuppet.TagTagDeleteResponse())
       } catch (e) {
@@ -1614,14 +1626,8 @@ function puppetImplementation (
 
       try {
         const result = await puppet.tagGroupList()
-        const payloads = result.map(tagGroup => {
-          const payload = new grpcPuppet.TagGroupPayload()
-          payload.setId(tagGroup.id)
-          payload.setName(tagGroup.name)
-          return payload
-        })
         const response = new grpcPuppet.TagGroupListResponse()
-        response.setPayloadsList(payloads)
+        response.setTagGroupIdsList(result)
 
         return callback(null, response)
       } catch (e) {
@@ -1636,18 +1642,16 @@ function puppetImplementation (
         const tagGroupId = call.request.getTagGroupId()
 
         const result = await puppet.tagGroupTagList(tagGroupId)
-        const payloads = result.map(tag => {
-          const payload = new grpcPuppet.TagPayload()
-          payload.setId(tag.id)
-          payload.setName(tag.name)
-          payload.setType(tag.type)
+        const tagIdentifiers = result.map(tag => {
+          const tagIdentifier = new grpcPuppet.TagIdentifier()
+          tagIdentifier.setId(tag.id)
           if (tag.groupId) {
-            payload.setGroupId(tag.groupId)
+            tagIdentifier.setGroupId(tag.groupId)
           }
-          return payload
+          return tagIdentifier
         })
-        const response = new grpcPuppet.TagTagListResponse()
-        response.setPayloadsList(payloads)
+        const response = new grpcPuppet.TagGroupTagListResponse()
+        response.setTagsList(tagIdentifiers)
 
         return callback(null, response)
       } catch (e) {
@@ -1661,18 +1665,16 @@ function puppetImplementation (
 
       try {
         const result = await puppet.tagTagList()
-        const payloads = result.map(tag => {
-          const payload = new grpcPuppet.TagPayload()
-          payload.setId(tag.id)
-          payload.setName(tag.name)
-          payload.setType(tag.type)
+        const tagIdentifiers = result.map(tag => {
+          const tagIdentifier = new grpcPuppet.TagIdentifier()
+          tagIdentifier.setId(tag.id)
           if (tag.groupId) {
-            payload.setGroupId(tag.groupId)
+            tagIdentifier.setGroupId(tag.groupId)
           }
-          return payload
+          return tagIdentifier
         })
         const response = new grpcPuppet.TagTagListResponse()
-        response.setPayloadsList(payloads)
+        response.setTagsList(tagIdentifiers)
 
         return callback(null, response)
       } catch (e) {
@@ -1687,18 +1689,16 @@ function puppetImplementation (
         const contactId = call.request.getContactId()
 
         const result = await puppet.tagContactTagList(contactId)
-        const payloads = result.map(tag => {
-          const payload = new grpcPuppet.TagPayload()
-          payload.setId(tag.id)
-          payload.setName(tag.name)
-          payload.setType(tag.type)
+        const tagIdentifiers = result.map(tag => {
+          const tagIdentifier = new grpcPuppet.TagIdentifier()
+          tagIdentifier.setId(tag.id)
           if (tag.groupId) {
-            payload.setGroupId(tag.groupId)
+            tagIdentifier.setGroupId(tag.groupId)
           }
-          return payload
+          return tagIdentifier
         })
         const response = new grpcPuppet.TagContactTagListResponse()
-        response.setPayloadsList(payloads)
+        response.setTagsList(tagIdentifiers)
 
         return callback(null, response)
       } catch (e) {
@@ -1710,15 +1710,62 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagTagContactList()')
 
       try {
-        const tagGroupId = call.request.getTagGroupId()
-        const tagId = call.request.getTagId()
+        const tagProb = call.request.getTag()
+        const id = tagProb?.getId()!
+        const groupId = tagProb?.getGroupId()
 
-        const result = await puppet.tagTagContactList(tagGroupId, tagId)
+        const result = await puppet.tagTagContactList({ id, groupId })
 
         const response = new grpcPuppet.TagTagContactListResponse()
-        response.setPayloadsList(result)
+        response.setContactIdsList(result)
+
+        return callback(null, response)
+      } catch (e) {
+        return grpcError('tagTagContactList', e, callback)
+      }
+    },
+
+    tagGroupPayload: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagGroupPayload()')
+
+      try {
+        const id = call.request.getGroupId()
+
+        const result = await puppet.tagGroupPayloadPuppet(id)
+        const response = new grpcPuppet.TagGroupPayloadResponse()
+        const payload = new grpcPuppet.TagGroupPayload()
+        payload.setId(result.id)
+        payload.setName(result.name)
+        response.setPayload(payload)
 
         return callback(null, response)
+
+      } catch (e) {
+        return grpcError('tagTagContactList', e, callback)
+      }
+    },
+
+    tagPayload: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'tagPayload()')
+
+      try {
+        const tag = call.request.getTag()!
+        const id = tag.getId()
+        const groupId = tag.getGroupId() || ''
+
+        const result = await puppet.tagPayloadPuppet({ id, groupId })
+        const response = new grpcPuppet.TagPayloadResponse()
+        const payload = new grpcPuppet.TagPayload()
+        payload.setId(result.id)
+        payload.setName(result.name)
+        payload.setType(result.type)
+        if (result.groupId) {
+          payload.setGroupId(result.groupId)
+        }
+        response.setPayload(payload)
+
+        return callback(null, response)
+
       } catch (e) {
         return grpcError('tagTagContactList', e, callback)
       }