From 146433d56fc6dd2c1562500b6ef4e597d3c9547e Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 10 Mar 2021 10:03:54 +0800
Subject: [PATCH] Add common UserOrBot.nick

---
 .../api/binary-compatibility-validator-android.api        | 1 +
 .../api/binary-compatibility-validator.api                | 1 +
 mirai-core-api/src/commonMain/kotlin/Bot.kt               | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/User.kt      | 2 +-
 mirai-core-api/src/commonMain/kotlin/contact/UserOrBot.kt | 8 +++++++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
index 3559c7f16..a1abf8562 100644
--- a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
+++ b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
@@ -589,6 +589,7 @@ public final class net/mamoe/mirai/contact/UserKt {
 }
 
 public abstract interface class net/mamoe/mirai/contact/UserOrBot : net/mamoe/mirai/contact/ContactOrBot {
+	public abstract fun getNick ()Ljava/lang/String;
 	public abstract fun nudge ()Lnet/mamoe/mirai/message/action/Nudge;
 }
 
diff --git a/binary-compatibility-validator/api/binary-compatibility-validator.api b/binary-compatibility-validator/api/binary-compatibility-validator.api
index 0a1e54899..c0e42eb6b 100644
--- a/binary-compatibility-validator/api/binary-compatibility-validator.api
+++ b/binary-compatibility-validator/api/binary-compatibility-validator.api
@@ -589,6 +589,7 @@ public final class net/mamoe/mirai/contact/UserKt {
 }
 
 public abstract interface class net/mamoe/mirai/contact/UserOrBot : net/mamoe/mirai/contact/ContactOrBot {
+	public abstract fun getNick ()Ljava/lang/String;
 	public abstract fun nudge ()Lnet/mamoe/mirai/message/action/Nudge;
 }
 
diff --git a/mirai-core-api/src/commonMain/kotlin/Bot.kt b/mirai-core-api/src/commonMain/kotlin/Bot.kt
index 6daa2ebf4..36dc82356 100644
--- a/mirai-core-api/src/commonMain/kotlin/Bot.kt
+++ b/mirai-core-api/src/commonMain/kotlin/Bot.kt
@@ -63,7 +63,7 @@ public interface Bot : CoroutineScope, ContactOrBot, UserOrBot {
     /**
      * 昵称
      */
-    public val nick: String
+    public override val nick: String
 
     /**
      * 日志记录器
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/User.kt b/mirai-core-api/src/commonMain/kotlin/contact/User.kt
index 40ff27829..a9ddde4ac 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/User.kt
+++ b/mirai-core-api/src/commonMain/kotlin/contact/User.kt
@@ -46,7 +46,7 @@ public interface User : Contact, UserOrBot, CoroutineScope {
     /**
      * 昵称
      */
-    public val nick: String
+    public override val nick: String
 
     /**
      * 备注信息
diff --git a/mirai-core-api/src/commonMain/kotlin/contact/UserOrBot.kt b/mirai-core-api/src/commonMain/kotlin/contact/UserOrBot.kt
index f23d333c5..a4fe53641 100644
--- a/mirai-core-api/src/commonMain/kotlin/contact/UserOrBot.kt
+++ b/mirai-core-api/src/commonMain/kotlin/contact/UserOrBot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 Mamoe Technologies and contributors.
+ * Copyright 2019-2021 Mamoe Technologies and contributors.
  *
  *  此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
  *  Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@@ -19,6 +19,12 @@ import net.mamoe.mirai.message.action.Nudge
  * @see ContactOrBot
  */
 public interface UserOrBot : ContactOrBot {
+    /**
+     * 昵称
+     * @since 2.6
+     */
+    public val nick: String
+
     /**
      * 创建一个 "戳一戳" 消息
      *