Shamrock: 修复合并转发获取图片错误 #236

whitechi73 · Feb 17, 2024 · 62385d6 · 62385d6
1 parent 3b210d7
commit 62385d6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/convert/MessageElemConverter.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/convert/MessageElemConverter.kt
@@ -140,14 +140,18 @@ internal sealed class MessageElemConverter: IMessageConvert {
 
             //LogCenter.log(image.toString())
 
+            val originalUrl = image.originImageUrl ?: ""
+
+            LogCenter.log("receive image: $image", Level.DEBUG)
+
             return MessageSegment(
                 type = "image",
                 data = hashMapOf(
                     "file" to md5,
                     "url" to when(chatType) {
-                        MsgConstant.KCHATTYPEDISC, MsgConstant.KCHATTYPEGROUP -> RichProtoSvc.getGroupPicDownUrl(image.originImageUrl, md5)
-                        MsgConstant.KCHATTYPEC2C -> RichProtoSvc.getC2CPicDownUrl(image.originImageUrl, md5)
-                        MsgConstant.KCHATTYPEGUILD -> RichProtoSvc.getGuildPicDownUrl(image.originImageUrl, md5)
+                        MsgConstant.KCHATTYPEDISC, MsgConstant.KCHATTYPEGROUP -> RichProtoSvc.getGroupPicDownUrl(originalUrl, md5)
+                        MsgConstant.KCHATTYPEC2C -> RichProtoSvc.getC2CPicDownUrl(originalUrl, md5)
+                        MsgConstant.KCHATTYPEGUILD -> RichProtoSvc.getGuildPicDownUrl(originalUrl, md5)
                         else -> unknownChatType(chatType)
                     },
                     "subType" to image.picSubType,