From 86ebe8e67d2b0e766b682d39c7e5d5a255c018c1 Mon Sep 17 00:00:00 2001
From: ave <ave@ave.zone>
Date: Sun, 22 Aug 2021 23:48:00 +0300
Subject: [PATCH] showtag: zero-left-pad discrims

THIS IS BROKEN!

> Caused by: java.lang.VerifyError: Verifier rejected class com.discord.models.member.GuildMember$Companion: java.lang.String com.discord.models.member.GuildMember$Companion.getNickOrUsername(com.discord.models.user.User, com.discord.models.member.GuildMember, com.discord.api.channel.Channel, java.util.List) failed to verify: java.lang.String com.discord.models.member.GuildMember$Companion.getNickOrUsername(com.discord.models.user.User, com.discord.models.member.GuildMember, com.discord.api.channel.Channel, java.util.List): [0x6B] copyRes1 v2<- result0 type=Precise Reference: java.lang.String (declaration of 'com.discord.models.member.GuildMember$Companion' [...]

https://docs.oracle.com/javase/7/docs/api/java/text/DecimalFormat.html
---
 resources/patches/notrack/87202-post.sh |  1 -
 resources/patches/showtag/87202.patch   | 40 +++++++++++++++++++------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/resources/patches/notrack/87202-post.sh b/resources/patches/notrack/87202-post.sh
index 27b03f0..a9bf588 100644
--- a/resources/patches/notrack/87202-post.sh
+++ b/resources/patches/notrack/87202-post.sh
@@ -1,2 +1 @@
 #!/bin/bash
-mv smali/com/airbnb smali_classes2/com/
diff --git a/resources/patches/showtag/87202.patch b/resources/patches/showtag/87202.patch
index 0ae2bf0..7675f48 100644
--- a/resources/patches/showtag/87202.patch
+++ b/resources/patches/showtag/87202.patch
@@ -1,11 +1,9 @@
-Binary files com.discord-base/build/apk/classes.dex and com.discord/build/apk/classes.dex differ
-Binary files com.discord-base/dist/com.discord-78204.apk and com.discord/dist/com.discord-78204.apk differ
-diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion.smali com.discord/smali/com/discord/models/member/GuildMember$Companion.smali
-*** com.discord-base/smali/com/discord/models/member/GuildMember$Companion.smali	2021-05-31 14:05:54.000000000 +0300
---- com.discord/smali/com/discord/models/member/GuildMember$Companion.smali	2021-05-31 18:27:22.000000000 +0300
+diff --color -crB com.discord-87202-base/smali/com/discord/models/member/GuildMember$Companion.smali com.discord-87202/smali/com/discord/models/member/GuildMember$Companion.smali
+*** com.discord-87202-base/smali/com/discord/models/member/GuildMember$Companion.smali	2021-08-22 22:08:12.812390705 +0300
+--- com.discord-87202/smali/com/discord/models/member/GuildMember$Companion.smali	2021-08-22 23:39:54.753848426 +0300
 ***************
 *** 530,535 ****
---- 530,567 ----
+--- 530,581 ----
       :goto_4
       if-eqz v0, :cond_8
   
@@ -31,7 +29,21 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion
 + 
 +     move-result v2
 + 
-+     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
++     invoke-static {v2}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
++ 
++     move-result v2
++ 
++     new-instance v0, Ljava/text/DecimalFormat;
++ 
++     const-string v3, "0000"
++ 
++     invoke-direct {v0, v3}, Ljava/text/DecimalFormat;-><init>(Ljava/lang/String;)V
++ 
++     invoke-virtual {v0, v2}, Ljava/text/DecimalFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
++ 
++     move-result-object v2
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 + 
 +     const-string v2, ")"
 + 
@@ -46,7 +58,7 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion
       :cond_8
 ***************
 *** 537,542 ****
---- 569,592 ----
+--- 583,616 ----
   
       move-result-object v0
   
@@ -62,7 +74,17 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion
 + 
 +     move-result v2
 + 
-+     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
++     new-instance v0, Ljava/text/DecimalFormat;
++ 
++     const-string v3, "0000"
++ 
++     invoke-direct {v0, v3}, Ljava/text/DecimalFormat;-><init>(Ljava/lang/String;)V
++ 
++     invoke-virtual {v0, v2}, Ljava/text/DecimalFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
++ 
++     move-result-object v2
++ 
++     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 + 
 +     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 +