mirror of
https://github.com/inotia00/revanced-patches.git
synced 2025-05-15 13:57:17 +02:00
fix(return-youtube-dislike): remove legacy code
This commit is contained in:
inotia00
parent
f1617669a8
commit
bd1428fc34
@ -1,8 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
|
|
||||||
object DislikeFingerprint : MethodFingerprint(
|
|
||||||
returnType = "V",
|
|
||||||
strings = listOf("like/dislike")
|
|
||||||
)
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
|
|
||||||
object LikeFingerprint : MethodFingerprint(
|
|
||||||
returnType = "V",
|
|
||||||
strings = listOf("like/like")
|
|
||||||
)
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
|
|
||||||
object RemoveLikeFingerprint : MethodFingerprint(
|
|
||||||
returnType = "V",
|
|
||||||
strings = listOf("like/removelike")
|
|
||||||
)
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.extensions.or
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
import org.jf.dexlib2.Opcode
|
|
||||||
|
|
||||||
object ShortsTextComponentParentFingerprint : MethodFingerprint(
|
|
||||||
returnType = "V",
|
|
||||||
parameters = listOf("L", "L"),
|
|
||||||
opcodes = listOf(
|
|
||||||
Opcode.INVOKE_STATIC,
|
|
||||||
Opcode.MOVE_RESULT_OBJECT,
|
|
||||||
Opcode.GOTO,
|
|
||||||
Opcode.INVOKE_STATIC,
|
|
||||||
Opcode.MOVE_RESULT_OBJECT,
|
|
||||||
Opcode.INVOKE_VIRTUAL,
|
|
||||||
Opcode.RETURN_VOID,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.CHECK_CAST,
|
|
||||||
Opcode.IGET_BOOLEAN,
|
|
||||||
Opcode.IF_EQZ,
|
|
||||||
Opcode.INVOKE_STATIC
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.extensions.or
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
import org.jf.dexlib2.AccessFlags
|
|
||||||
import org.jf.dexlib2.Opcode
|
|
||||||
|
|
||||||
object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
|
|
||||||
returnType = "L",
|
|
||||||
access = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
|
||||||
parameters = listOf("L"),
|
|
||||||
opcodes = listOf(
|
|
||||||
Opcode.INVOKE_VIRTUAL,
|
|
||||||
Opcode.MOVE_RESULT_OBJECT,
|
|
||||||
Opcode.CHECK_CAST,
|
|
||||||
Opcode.MOVE_OBJECT
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.extensions.or
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
import org.jf.dexlib2.AccessFlags
|
|
||||||
|
|
||||||
object TextComponentConstructorFingerprint : MethodFingerprint(
|
|
||||||
returnType = "V",
|
|
||||||
access = AccessFlags.PRIVATE or AccessFlags.CONSTRUCTOR,
|
|
||||||
strings = listOf("TextComponent")
|
|
||||||
)
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.extensions.or
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
import org.jf.dexlib2.AccessFlags
|
|
||||||
import org.jf.dexlib2.Opcode
|
|
||||||
|
|
||||||
object TextComponentContextFingerprint : MethodFingerprint(
|
|
||||||
returnType = "L",
|
|
||||||
access = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
|
||||||
parameters = listOf("L"),
|
|
||||||
opcodes = listOf(
|
|
||||||
Opcode.IGET_OBJECT, // conversion context
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_BOOLEAN
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.extensions.or
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
import org.jf.dexlib2.AccessFlags
|
|
||||||
import org.jf.dexlib2.Opcode
|
|
||||||
|
|
||||||
object TextComponentTmpFingerprint : MethodFingerprint(
|
|
||||||
returnType = "L",
|
|
||||||
access = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
|
||||||
parameters = listOf("L"),
|
|
||||||
opcodes = listOf(
|
|
||||||
Opcode.INVOKE_STATIC,
|
|
||||||
Opcode.MOVE_RESULT_OBJECT, // last instruction of the method
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@ -1,174 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.misc.returnyoutubedislike.patch
|
|
||||||
|
|
||||||
import app.revanced.extensions.toErrorResult
|
|
||||||
import app.revanced.patcher.annotation.Description
|
|
||||||
import app.revanced.patcher.annotation.Name
|
|
||||||
import app.revanced.patcher.annotation.Version
|
|
||||||
import app.revanced.patcher.data.BytecodeContext
|
|
||||||
import app.revanced.patcher.data.toMethodWalker
|
|
||||||
import app.revanced.patcher.extensions.addInstructions
|
|
||||||
import app.revanced.patcher.extensions.instruction
|
|
||||||
import app.revanced.patcher.extensions.replaceInstructions
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
|
|
||||||
import app.revanced.patcher.patch.BytecodePatch
|
|
||||||
import app.revanced.patcher.patch.PatchResult
|
|
||||||
import app.revanced.patcher.patch.PatchResultSuccess
|
|
||||||
import app.revanced.patcher.patch.annotations.DependsOn
|
|
||||||
import app.revanced.patcher.patch.annotations.Patch
|
|
||||||
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
|
|
||||||
import app.revanced.patches.shared.annotation.YouTubeCompatibility
|
|
||||||
import app.revanced.patches.youtube.misc.returnyoutubedislike.fingerprints.*
|
|
||||||
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
|
|
||||||
import app.revanced.patches.youtube.misc.videoid.mainstream.patch.MainstreamVideoIdPatch
|
|
||||||
import app.revanced.util.integrations.Constants.UTILS_PATH
|
|
||||||
import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
|
|
||||||
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
|
|
||||||
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
|
|
||||||
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
|
|
||||||
import org.jf.dexlib2.iface.reference.Reference
|
|
||||||
|
|
||||||
@Patch
|
|
||||||
@Name("return-youtube-dislike")
|
|
||||||
@Description("Shows the dislike count of videos using the Return YouTube Dislike API.")
|
|
||||||
@DependsOn(
|
|
||||||
[
|
|
||||||
MainstreamVideoIdPatch::class,
|
|
||||||
SettingsPatch::class
|
|
||||||
]
|
|
||||||
)
|
|
||||||
@YouTubeCompatibility
|
|
||||||
@Version("0.0.1")
|
|
||||||
class ReturnYouTubeDislikePatch : BytecodePatch(
|
|
||||||
listOf(
|
|
||||||
DislikeFingerprint,
|
|
||||||
LikeFingerprint,
|
|
||||||
RemoveLikeFingerprint,
|
|
||||||
ShortsTextComponentParentFingerprint,
|
|
||||||
TextComponentConstructorFingerprint
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
override fun execute(context: BytecodeContext): PatchResult {
|
|
||||||
listOf(
|
|
||||||
LikeFingerprint.toPatch(Vote.LIKE),
|
|
||||||
DislikeFingerprint.toPatch(Vote.DISLIKE),
|
|
||||||
RemoveLikeFingerprint.toPatch(Vote.REMOVE_LIKE)
|
|
||||||
).forEach { (fingerprint, vote) ->
|
|
||||||
with(fingerprint.result ?: return fingerprint.toErrorResult()) {
|
|
||||||
mutableMethod.addInstructions(
|
|
||||||
0,
|
|
||||||
"""
|
|
||||||
const/4 v0, ${vote.value}
|
|
||||||
invoke-static {v0}, $INTEGRATIONS_RYD_CLASS_DESCRIPTOR->sendVote(I)V
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
TextComponentConstructorFingerprint.result?.let { parentResult ->
|
|
||||||
|
|
||||||
TextComponentContextFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
|
|
||||||
with (it.mutableMethod) {
|
|
||||||
val conversionContextIndex = it.scanResult.patternScanResult!!.startIndex
|
|
||||||
conversionContextFieldReference =
|
|
||||||
(instruction(conversionContextIndex) as ReferenceInstruction).reference
|
|
||||||
}
|
|
||||||
} ?: return TextComponentContextFingerprint.toErrorResult()
|
|
||||||
|
|
||||||
TextComponentTmpFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
|
|
||||||
with (it.mutableMethod) {
|
|
||||||
val startIndex = it.scanResult.patternScanResult!!.startIndex
|
|
||||||
tmpRegister =
|
|
||||||
(instruction(startIndex) as FiveRegisterInstruction).registerE
|
|
||||||
|
|
||||||
}
|
|
||||||
} ?: return TextComponentTmpFingerprint.toErrorResult()
|
|
||||||
|
|
||||||
|
|
||||||
TextComponentAtomicReferenceFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
|
|
||||||
with (it.mutableMethod) {
|
|
||||||
val atomicReferenceStartIndex = it.scanResult.patternScanResult!!.startIndex
|
|
||||||
val insertIndex = it.scanResult.patternScanResult!!.endIndex
|
|
||||||
val moveCharSequenceInstruction = instruction(insertIndex) as TwoRegisterInstruction
|
|
||||||
|
|
||||||
val atomicReferenceRegister =
|
|
||||||
(instruction(atomicReferenceStartIndex) as FiveRegisterInstruction).registerC
|
|
||||||
|
|
||||||
val charSequenceRegister =
|
|
||||||
moveCharSequenceInstruction.registerB
|
|
||||||
|
|
||||||
replaceInstructions(insertIndex, "move-object/from16 v$tmpRegister, p0")
|
|
||||||
addInstructions(
|
|
||||||
insertIndex + 1, """
|
|
||||||
iget-object v$tmpRegister, v$tmpRegister, $conversionContextFieldReference
|
|
||||||
invoke-static {v$tmpRegister, v$atomicReferenceRegister, v$charSequenceRegister}, $INTEGRATIONS_RYD_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
|
|
||||||
move-result-object v$charSequenceRegister
|
|
||||||
move-object v${moveCharSequenceInstruction.registerA}, v${charSequenceRegister}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} ?: return TextComponentAtomicReferenceFingerprint.toErrorResult()
|
|
||||||
} ?: return TextComponentConstructorFingerprint.toErrorResult()
|
|
||||||
|
|
||||||
ShortsTextComponentParentFingerprint.result?.let {
|
|
||||||
with (context
|
|
||||||
.toMethodWalker(it.method)
|
|
||||||
.nextMethod(it.scanResult.patternScanResult!!.endIndex, true)
|
|
||||||
.getMethod() as MutableMethod
|
|
||||||
) {
|
|
||||||
val insertInstructions = this.implementation!!.instructions
|
|
||||||
val insertIndex = insertInstructions.size - 1
|
|
||||||
val insertRegister = (insertInstructions.elementAt(insertIndex) as OneRegisterInstruction).registerA
|
|
||||||
|
|
||||||
this.insertShorts(insertIndex, insertRegister)
|
|
||||||
}
|
|
||||||
|
|
||||||
with (it.mutableMethod) {
|
|
||||||
val insertInstructions = this.implementation!!.instructions
|
|
||||||
val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
|
|
||||||
val insertRegister = (insertInstructions.elementAt(insertIndex - 1) as OneRegisterInstruction).registerA
|
|
||||||
|
|
||||||
this.insertShorts(insertIndex, insertRegister)
|
|
||||||
}
|
|
||||||
} ?: return ShortsTextComponentParentFingerprint.toErrorResult()
|
|
||||||
|
|
||||||
|
|
||||||
MainstreamVideoIdPatch.injectCall("$INTEGRATIONS_RYD_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Add ReVanced Settings
|
|
||||||
*/
|
|
||||||
SettingsPatch.addReVancedPreference("ryd_settings")
|
|
||||||
|
|
||||||
SettingsPatch.updatePatchStatus("return-youtube-dislike")
|
|
||||||
|
|
||||||
return PatchResultSuccess()
|
|
||||||
}
|
|
||||||
private companion object {
|
|
||||||
const val INTEGRATIONS_RYD_CLASS_DESCRIPTOR =
|
|
||||||
"$UTILS_PATH/ReturnYouTubeDislikePatch;"
|
|
||||||
|
|
||||||
lateinit var conversionContextFieldReference: Reference
|
|
||||||
var tmpRegister: Int = 12
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun MethodFingerprint.toPatch(voteKind: Vote) = VotePatch(this, voteKind)
|
|
||||||
|
|
||||||
private data class VotePatch(val fingerprint: MethodFingerprint, val voteKind: Vote)
|
|
||||||
|
|
||||||
private enum class Vote(val value: Int) {
|
|
||||||
LIKE(1),
|
|
||||||
DISLIKE(-1),
|
|
||||||
REMOVE_LIKE(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun MutableMethod.insertShorts(index: Int, register: Int) {
|
|
||||||
addInstructions(
|
|
||||||
index, """
|
|
||||||
invoke-static {v$register}, $INTEGRATIONS_RYD_CLASS_DESCRIPTOR->onShortsComponentCreated(Landroid/text/Spanned;)Landroid/text/Spanned;
|
|
||||||
move-result-object v$register
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user