shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: fix nt image error in very old qq

Browse Source 
Signed-off-by: 白池 <whitechi73@outlook.com>
This commit is contained in:
白池 2024-02-29 09:41:56 +08:00
parent e96c356de4
commit 52ec43abf8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/NtMsgElementConverter.kt
View File

@ -171,6 +171,9 @@ internal object NtMsgElementConverter {
storeId = image.storeID storeId = image.storeID
} }
/*
PicElement{picSubType=0,fileName=A655FCDADABC40D0CEAF6F9AF92937CD.jpg,fileSize=142865,picWidth=886,picHeight=1920,original=false,md5HexStr=a655fcdadabc40d0ceaf6f9af92937cd,sourcePath=null,thumbPath=null,transferStatus=2,progress=0,picType=1000,invalidState=0,fileUuid=CgoxMDI5Mzc0MTE1EhTnucgrUbp3MJjjagUM2-VxSQ5V7hiR3Agg_goo9ZCZt-HNhANQgJqeAQ,fileSubId=,thumbFileSize=0,fileBizId=null,downloadIndex=null,summary=,emojiFrom=null,emojiWebUrl=null,emojiAd=EmojiAD{url=,desc=,},emojiMall=EmojiMall{packageId=0,emojiId=0,},emojiZplan=EmojiZPlan{actionId=0,actionName=,actionType=0,playerNumber=0,peerUid=0,bytesReserveInfo=,},originImageMd5=,originImageUrl=null,importRichMediaContext=null,isFlashPic=false,}
*/
return MessageSegment( return MessageSegment(
type = "image", type = "image",
data = hashMapOf( data = hashMapOf(

6
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt
View File

@ -160,7 +160,7 @@ internal object RichProtoSvc: BaseSvc() {
width: UInt = 0u, width: UInt = 0u,
height: UInt = 0u height: UInt = 0u
): String { ): String {
val isNtServer = originalUrl.startsWith("/download") val isNtServer = !fileId.startsWith("/") || originalUrl.startsWith("/download")
val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC
if (originalUrl.isNotEmpty()) { if (originalUrl.isNotEmpty()) {
if (isNtServer && !originalUrl.contains("rkey=")) { if (isNtServer && !originalUrl.contains("rkey=")) {
@ -196,7 +196,7 @@ internal object RichProtoSvc: BaseSvc() {
height: UInt = 0u, height: UInt = 0u,
storeId: Int = 0 storeId: Int = 0
): String { ): String {
val isNtServer = storeId == 1 || originalUrl.startsWith("/download") val isNtServer = storeId == 1 || !fileId.startsWith("/") || originalUrl.startsWith("/download")
val domain = if (isNtServer) MULTIMEDIA_DOMAIN else C2C_PIC val domain = if (isNtServer) MULTIMEDIA_DOMAIN else C2C_PIC
if (originalUrl.isNotEmpty()) { if (originalUrl.isNotEmpty()) {
if (fileId.isNotEmpty()) getNtPicRKey( if (fileId.isNotEmpty()) getNtPicRKey(
@ -238,7 +238,7 @@ internal object RichProtoSvc: BaseSvc() {
width: UInt = 0u, width: UInt = 0u,
height: UInt = 0u height: UInt = 0u
): String { ): String {
val isNtServer = originalUrl.startsWith("/download") val isNtServer = !fileId.startsWith("/") || originalUrl.startsWith("/download")
val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC
if (originalUrl.isNotEmpty()) { if (originalUrl.isNotEmpty()) {
if (isNtServer && !originalUrl.contains("rkey=")) { if (isNtServer && !originalUrl.contains("rkey=")) {