From f691a8f3e0742deb7a8c883a9e942006f30737ad Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 23 Dec 2020 18:35:36 +0800 Subject: [PATCH] Add ContactOrBot.avatarUrl --- .../src/commonMain/kotlin/contact/ContactOrBot.kt | 7 +++++++ mirai-core-api/src/commonMain/kotlin/contact/Friend.kt | 6 ------ mirai-core-api/src/commonMain/kotlin/contact/User.kt | 6 ------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt b/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt index 54e0b350e..79df8e405 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/ContactOrBot.kt @@ -26,4 +26,11 @@ public interface ContactOrBot : CoroutineScope { * QQ 号或群号. */ public val id: Long + + /** + * 头像下载链接 + */ + public val avatarUrl: String + get() = "http://q1.qlogo.cn/g?b=qq&nk=$id&s=640" + } \ No newline at end of file diff --git a/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt b/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt index f182a79f1..ea3acb4cd 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/Friend.kt @@ -52,12 +52,6 @@ public interface Friend : User, CoroutineScope { */ public override val remark: String - /** - * 头像下载链接 - */ - public override val avatarUrl: String - get() = "http://q1.qlogo.cn/g?b=qq&nk=$id&s=640" - /** * 向这个对象发送消息. * diff --git a/mirai-core-api/src/commonMain/kotlin/contact/User.kt b/mirai-core-api/src/commonMain/kotlin/contact/User.kt index b4d1b5ef9..1ae8f4950 100644 --- a/mirai-core-api/src/commonMain/kotlin/contact/User.kt +++ b/mirai-core-api/src/commonMain/kotlin/contact/User.kt @@ -59,12 +59,6 @@ public interface User : Contact, UserOrBot, CoroutineScope { */ public val remark: String - /** - * 头像下载链接 - */ - public val avatarUrl: String - get() = "http://q1.qlogo.cn/g?b=qq&nk=$id&s=640" - /** * 向这个对象发送消息. *