add avatarUrl overwrite for gensokyo

MrXiaoM · Sep 7, 2024 · 636df16 · 636df16
1 parent b5c8f24
commit 636df16
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 0 deletions.
diff --git a/onebot/src/main/kotlin/client/core/Bot.kt b/onebot/src/main/kotlin/client/core/Bot.kt
@@ -1475,4 +1475,22 @@ class Bot(
         val result = actionHandler.action(this, action, params)
         return result.withToken()
     }
+
+    /**
+     * 获取用户头像地址
+     *
+     * Gensokyo
+     * @param groupId 群号，获取群成员头像时使用
+     * @param userId QQ号，获取其它用户头像时使用
+     * @return [ActionData] of [String]
+     */
+    suspend fun extGetAvatar(groupId: Long?, userId: Long): ActionData<String> {
+        val action = ActionPathEnum.EXT_GET_AVATAR
+        val params = JsonObject().apply {
+            if (groupId != null) addProperty("group_id", groupId)
+            addProperty("user_id", userId)
+        }
+        val result = actionHandler.action(this, action, params)
+        return result.withToken()
+    }
 }
diff --git a/onebot/src/main/kotlin/sdk/enums/ActionPathEnum.kt b/onebot/src/main/kotlin/sdk/enums/ActionPathEnum.kt
@@ -304,6 +304,13 @@ enum class ActionPathEnum(
      */
     EXT_GET_FILE("get_file"),
 
+    /**
+     * 获取用户头像
+     *
+     * 属于 Gensokyo 扩展 API
+     */
+    EXT_GET_AVATAR("get_file"),
+
     /**
      * 创建群文件夹
      */

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/BotWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/BotWrapper.kt
@@ -128,6 +128,14 @@ internal class BotWrapper private constructor(
         return OnebotMessages.toMiraiMessage(data.isJsonMessage, data.message, this)
     }
 
+    private val avatar: String? by lazy {
+        if (appName.lowercase() != "gensokyo") null
+        else runBlocking { impl.extGetAvatar(null, id).data }
+    }
+    override fun avatarUrl(spec: AvatarSpec): String {
+        return avatar ?: super.avatarUrl(spec)
+    }
+
     override val onebotData: String
         get() = gson.toJson(json)
     override val id: Long

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/FriendWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/FriendWrapper.kt
@@ -5,6 +5,8 @@ import cn.evolvefield.onebot.sdk.response.contact.FriendInfoResp
 import cn.evolvefield.onebot.sdk.util.JsonHelper.gson
 import com.google.gson.JsonElement
 import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.runBlocking
+import net.mamoe.mirai.contact.AvatarSpec
 import net.mamoe.mirai.contact.Friend
 import net.mamoe.mirai.contact.friendgroup.FriendGroup
 import net.mamoe.mirai.contact.roaming.RoamingMessages
@@ -51,6 +53,14 @@ internal class FriendWrapper(
         bot.impl.deleteFriend(id)
     }
 
+    private val avatar: String? by lazy {
+        if (bot.appName.lowercase() != "gensokyo") null
+        else runBlocking { bot.impl.extGetAvatar(null, id).data }
+    }
+    override fun avatarUrl(spec: AvatarSpec): String {
+        return avatar ?: super.avatarUrl(spec)
+    }
+
     @OptIn(MiraiInternalApi::class)
     override suspend fun sendMessage(message: Message): MessageReceipt<Friend> {
         if (FriendMessagePreSendEvent(this, message).broadcast().isCancelled)

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/MemberWrapper.kt
@@ -7,6 +7,7 @@ import cn.evolvefield.onebot.sdk.util.JsonHelper.gson
 import com.google.gson.JsonElement
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.contact.active.MemberActive
 import net.mamoe.mirai.event.broadcast
@@ -59,6 +60,14 @@ internal class MemberWrapper(
         this.impl = impl
     }
 
+    private val avatar: String? by lazy {
+        if (bot.appName.lowercase() != "gensokyo") null
+        else runBlocking { bot.impl.extGetAvatar(group.id, id).data }
+    }
+    override fun avatarUrl(spec: AvatarSpec): String {
+        return avatar ?: super.avatarUrl(spec)
+    }
+
     override val active: MemberActiveWrapper = MemberActiveWrapper(this)
     override val id: Long = impl.userId
     override val joinTimestamp: Int

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/StrangerWrapper.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/contact/StrangerWrapper.kt
@@ -5,6 +5,8 @@ import cn.evolvefield.onebot.sdk.response.contact.StrangerInfoResp
 import cn.evolvefield.onebot.sdk.util.JsonHelper.gson
 import com.google.gson.JsonElement
 import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.runBlocking
+import net.mamoe.mirai.contact.AvatarSpec
 import net.mamoe.mirai.contact.Stranger
 import net.mamoe.mirai.event.broadcast
 import net.mamoe.mirai.event.events.EventCancelledException
@@ -49,6 +51,14 @@ internal class StrangerWrapper(
         OverflowAPI.logger.warning("Onebot 未提供删除陌生人接口 ($id)")
     }
 
+    private val avatar: String? by lazy {
+        if (bot.appName.lowercase() != "gensokyo") null
+        else runBlocking { bot.impl.extGetAvatar(null, id).data }
+    }
+    override fun avatarUrl(spec: AvatarSpec): String {
+        return avatar ?: super.avatarUrl(spec)
+    }
+
     @OptIn(MiraiInternalApi::class)
     override suspend fun sendMessage(message: Message): MessageReceipt<Stranger> {
         if (StrangerMessagePreSendEvent(this, message).broadcast().isCancelled)