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 index 7c8c1097..0858964b 100644 --- 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 @@ -218,7 +218,7 @@ internal sealed class MessageElemConverter: IMessageConvert { "url" to when(chatType) { MsgConstant.KCHATTYPEGROUP -> RichProtoSvc.getGroupVideoDownUrl("0", md5, video.fileUuid) MsgConstant.KCHATTYPEC2C -> RichProtoSvc.getC2CVideoDownUrl("0", md5, video.fileUuid) - MsgConstant.KCHATTYPEGUILD -> RichProtoSvc.getGroupVideoDownUrl(peerId, md5, video.fileUuid) + MsgConstant.KCHATTYPEGUILD -> RichProtoSvc.getGroupVideoDownUrl("0", md5, video.fileUuid) else -> unknownChatType(chatType) } ).also { diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt index 239cd2a3..9b5c4f84 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt @@ -167,9 +167,10 @@ internal object RichProtoSvc: BaseSvc() { originalUrl: String, md5: String, ): String { - val domain = if (originalUrl.startsWith("/download")) GPRO_PIC_NT else GPRO_PIC + val isNtServer = originalUrl.startsWith("/download") + val domain = if (isNtServer) GPRO_PIC_NT else GPRO_PIC if (originalUrl.isNotEmpty()) { - if (!originalUrl.contains("rkey=")) { + if (isNtServer && !originalUrl.contains("rkey=")) { return "https://$domain$originalUrl&rkey=$multiMediaRKey" } return "https://$domain$originalUrl" @@ -191,9 +192,10 @@ internal object RichProtoSvc: BaseSvc() { originalUrl: String, md5: String ): String { - val domain = if (originalUrl.startsWith("/download")) GPRO_PIC_NT else GPRO_PIC + val isNtServer = originalUrl.startsWith("/download") + val domain = if (isNtServer) GPRO_PIC_NT else GPRO_PIC if (originalUrl.isNotEmpty()) { - if (!originalUrl.contains("rkey=")) { + if (isNtServer && !originalUrl.contains("rkey=")) { return "https://$domain$originalUrl&rkey=$multiMediaRKey" } return "https://$domain$originalUrl"