1 解决冲突

LuSingTea · LuSingTea · commit 6c129a6ab86f · 2020-08-03T22:51:38.000+08:00
diff --git a/wechaty/src/main/kotlin/io/github/wechaty/Wechaty.kt b/wechaty/src/main/kotlin/io/github/wechaty/Wechaty.kt
@@ -44,7 +44,7 @@ class Wechaty private constructor(private var wechatyOptions: WechatyOptions) :
     val roomInvitationManager = RoomInvitationManager(this)
     val imageManager = ImageManager(this)
 
-    val friendShipManager = FriendShipManager(this)
+    val friendShipManager = FriendshipManager(this)
     init {
         if (wechatyOptions.memory == null) {
             this.memory = MemoryCard(wechatyOptions.name)
@@ -121,11 +121,6 @@ class Wechaty private constructor(private var wechatyOptions: WechatyOptions) :
         return wechatyOptions.name
     }
 
-    fun say(something: Any): Future<Void> {
-        val msgId: String?
-        this.userSelf().say(something)
-        return CompletableFuture.completedFuture(null)
-    }
     fun onLogin(listener: LoginListener):Wechaty{
         return on(EventEnum.LOGIN,listener)
     }
@@ -512,25 +507,25 @@ class Wechaty private constructor(private var wechatyOptions: WechatyOptions) :
         }, "StartMain-shutdown-hook"))
     }
 
-    override fun toString(): String {
-        if (this.wechatyOptions == null) {
-            return "default"
-        }
-        val first = if (this.wechatyOptions != null && this.puppet != null) {
-            this.wechatyOptions.puppet
-        }
-        else {
-            "puppet"
-        }
-
-        val second = if (this.memory != null) {
-            this.memory!!.getName()
-        }
-        else {
-            "default"
-        }
-        return "Wechaty#<${first}><${second}>"
-    }
+//    override fun toString(): String {
+//        if (this.wechatyOptions == null) {
+//            return "default"
+//        }
+//        val first = if (this.wechatyOptions != null && this.puppet != null) {
+//            this.wechatyOptions.puppet
+//        }
+//        else {
+//            "puppet"
+//        }
+//
+//        val second = if (this.memory != null) {
+//            this.memory!!.getName()
+//        }
+//        else {
+//            "default"
+//        }
+//        return "Wechaty#<${first}><${second}>"
+//    }
 }
 
 
diff --git a/wechaty/src/main/kotlin/io/github/wechaty/user/Contact.kt b/wechaty/src/main/kotlin/io/github/wechaty/user/Contact.kt
@@ -94,38 +94,18 @@ open class Contact(wechaty: Wechaty,val id:String) : Sayable, Accessory(wechaty)
         return (payload != null && StringUtils.isNotEmpty(payload!!.name))
     }
 
-    fun friend(): Boolean {
-        return payload?.friend ?: false
-    }
-
     fun name():String {
         return payload?.name ?: ""
     }
 
-    fun type(): ContactType {
-        return payload?.type ?: ContactType.Unknown
-    }
-
-    fun gender(): ContactGender {
-        return payload?.gender ?: ContactGender.Unknown
-    }
-
     fun address(): String {
         return this.payload?.address ?: ""
     }
 
-    fun province(): String {
-        return this.payload?.province ?: ""
-    }
-
     fun signature(): String {
         return this.payload?.signature ?: ""
     }
 
-    fun city(): String {
-        return this.payload?.city ?: ""
-    }
-
     fun star(): Boolean {
         return this.payload?.star ?: false
     }
@@ -134,12 +114,6 @@ open class Contact(wechaty: Wechaty,val id:String) : Sayable, Accessory(wechaty)
         return this.payload?.weixin ?: ""
     }
 
-    fun self(): Boolean {
-        val userId = this.puppet.selfId() ?: return false
-
-        return this.id === userId
-    }
-
     fun setAlias(newAlias:String){
         if(payload == null){
             throw Exception("no payload")
@@ -208,7 +182,7 @@ open class Contact(wechaty: Wechaty,val id:String) : Sayable, Accessory(wechaty)
         }
     }
 
-    fun self():Boolean{
+    fun self():Boolean {
         val userId = puppet.selfId()
         if(StringUtils.isEmpty(userId)){
             return false
diff --git a/wechaty/src/main/kotlin/io/github/wechaty/user/ContactSelf.kt b/wechaty/src/main/kotlin/io/github/wechaty/user/ContactSelf.kt
@@ -67,22 +67,22 @@ class ContactSelf(wechaty: Wechaty, id: String) : Contact(wechaty, id) {
         return null
     }
 
-    fun signature (signature: String): Future<Void> {
-        log.debug("ContactSelf, signature()")
-
-        val puppetId = try {
-            this.puppet.selfId()
-        }
-        catch (e: Exception) {
-            throw Exception("Can not get qrcode, user might be either not logged in or already logged out")
-        }
-
-        if (this.id !== puppetId) {
-            throw Exception("only can get qrcode for the login userself")
-        }
-        // maybe
-        return this.puppet.contactSelfSignature(signature)
-    }
+//    fun signature (signature: String): Future<Void> {
+//        log.debug("ContactSelf, signature()")
+//
+//        val puppetId = try {
+//            this.puppet.selfId()
+//        }
+//        catch (e: Exception) {
+//            throw Exception("Can not get qrcode, user might be either not logged in or already logged out")
+//        }
+//
+//        if (this.id !== puppetId) {
+//            throw Exception("only can get qrcode for the login userself")
+//        }
+//        // maybe
+//        return this.puppet.contactSelfSignature(signature)
+//    }
 
     companion object {
         private val log = LoggerFactory.getLogger(ContactSelf::class.java)
diff --git a/wechaty/src/main/kotlin/io/github/wechaty/user/Friendship.kt b/wechaty/src/main/kotlin/io/github/wechaty/user/Friendship.kt
@@ -14,11 +14,6 @@ class Friendship (wechaty: Wechaty,val id:String):Accessory(wechaty){
 
     private var payload:FriendshipPayload? = null
 
-    fun load(id:String):Friendship {
-        this.id = id
-        return this
-    }
-
     fun search(queryFilter: FriendshipSearchCondition):Contact?{
         val contactId = wechaty.getPuppet().friendshipSearch(queryFilter).get();
         if(StringUtils.isEmpty(contactId)){
@@ -29,20 +24,12 @@ class Friendship (wechaty: Wechaty,val id:String):Accessory(wechaty){
         return contact
     }
 
-    fun hello(): String {
-        if (this.payload == null) {
-            throw Exception("no payload")
-        }
-
-        return this.payload!!.hello ?: ""
-    }
-
     // 这个应该是静态方法吧
     fun add(contact: Contact, hello:String){
         log.debug("add contact: {} hello: {}",contact,hello)
         wechaty.getPuppet().friendshipAdd(contact.id!!,hello).get()
     }
-  
+
     fun isReady():Boolean{
         return  payload != null
     }
diff --git a/wechaty/src/main/kotlin/io/github/wechaty/user/Room.kt b/wechaty/src/main/kotlin/io/github/wechaty/user/Room.kt
@@ -404,23 +404,6 @@ class Room(wechaty: Wechaty, val id: String) : Accessory(wechaty), Sayable {
         return roomMemberPayload?.roomAlias
     }
 
-
-    fun owner(): Contact? {
-        log.debug("Room, owner()")
-        val ownerId = if (this.payload != null && this.payload!!.ownerId != null) {
-            this.payload?.ownerId
-        }
-        else {
-            return null
-        }
-        return ownerId?.let { wechaty.contactManager.load(it) }
-    }
-
-    fun avatar(): Future<FileBox> {
-        log.debug("Room, acatar()")
-        return this.puppet.roomAvatar(this.id)
-    }
-
     fun has(contact: Contact): Boolean {
         val memberIdList = puppet.roomMemberList(id).get()
         if (memberIdList.isEmpty()) {
