github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-13 20:02:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Desensitizer for NestedStructure

Browse Source
This commit is contained in:
Him188 2021-12-21 22:22:15 +00:00
parent 83d7c0d3d1
commit aa53d92fbe
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mirai-core/src/commonTest/kotlin/testFramework/desensitizer/Desensitizer.kt
View File

@ -216,17 +216,22 @@ private class DesensitizationVisitor(
val result = instance.cast<NestedStructureDesensitizer<ProtocolStruct, ProtocolStruct>>() val result = instance.cast<NestedStructureDesensitizer<ProtocolStruct, ProtocolStruct>>()
.deserialize(desc.origin as ProtocolStruct, value.origin as ByteArray) .deserialize(desc.origin as ProtocolStruct, value.origin as ByteArray)
?: desc.origin ?.let { ValueDescAnalyzer.analyze(it) }
val generate = ValueDescAnalyzer.analyze(result) if (result == null) {
.transform(OptimizeByteArrayAsHexStringTransformer()) value
.transform(DesensitizationVisitor(desensitizer)) } else {
.renderToString() val generate = ValueDescAnalyzer.analyze(result)
PlainValueDesc( .transform(OptimizeByteArrayAsHexStringTransformer())
desc, .transform(DesensitizationVisitor(desensitizer))
"$generate.toByteArray(${result::class.qualifiedName}.serializer())", .renderToString()
value.origin
) PlainValueDesc(
desc,
"$generate.toByteArray(${result::class.qualifiedName}.serializer())",
value.origin
)
}
} else value } else value
} }
}).let { }).let {