Fixed the build id (number)

Author: ShadiestGoat

config/autoTools.go

@@ -3,7 +3,7 @@ package config
 import (
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -14,7 +14,7 @@ import (
 
 func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 	dExist := true
-	normalD, err := ioutil.ReadDir(filepath.Join(discordPath, "discord"))
+	normalD, err := os.ReadDir(filepath.Join(discordPath, "discord"))
 
 	if os.IsNotExist(err) {
 		dExist = false
@@ -23,7 +23,7 @@ func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 	}
 
 	dCExist := true
-	normalCD, err := ioutil.ReadDir(filepath.Join(discordPath, "discordcanary"))
+	normalCD, err := os.ReadDir(filepath.Join(discordPath, "discordcanary"))
 
 	if os.IsNotExist(err) {
 		dCExist = false
@@ -68,30 +68,45 @@ func (mask *HeadersMask) PullDiscordVers(discordPath string) {
 	}
 }
 
-var discordAssetReg = regexp.MustCompile(`assets/+?([a-z0-9]+?)\.js`)
+var discordAssetReg = regexp.MustCompile(`assets/([a-z0-9]+?)\.js`)
 var buildNumReg = regexp.MustCompile(`buildNumber`)
+var buildNumVReg = regexp.MustCompile(`\d{6}`)
 
 // https://github.com/Merubokkusu/Discord-S.C.U.M/blob/master/discum/start/superproperties.py thank you!
 func (mask HeadersMask) PullBuildId() string {
 	respRaw, err := http.Get(fmt.Sprintf("https://%vdiscord.com/login", mask.DomainPrefix)) //idk if its different but i am very tired atm so yk
 	tools.PanicIfErr(err)
-	resp, err := ioutil.ReadAll(respRaw.Body)
-	tools.PanicIfErr(err)
-	assets := discordAssetReg.FindAll(resp, 50)
-	buildFileRaw, err := http.Get(fmt.Sprintf("https://%vdiscord.com/%v", mask.DomainPrefix, string(assets[len(assets)-2])))
-	tools.PanicIfErr(err)
-	buildFile, err := ioutil.ReadAll(buildFileRaw.Body)
+	resp, err := io.ReadAll(respRaw.Body)
 	tools.PanicIfErr(err)
+	assets := discordAssetReg.FindAll(resp, 200)
+	
+	foundNumber := ""
 
-	buildFileS := string(buildFile)
-
-	buildLoc := buildNumReg.FindStringIndex(buildFileS)
+	for _, asset := range assets[len(assets)-7:] {
+		buildFileRaw, err := http.Get(fmt.Sprintf("https://%vdiscord.com/%v", mask.DomainPrefix, string(asset)))
+		tools.PanicIfErr(err)
+		buildFile, err := io.ReadAll(buildFileRaw.Body)
+		tools.PanicIfErr(err)
+	
+		buildFileS := buildFile
+
+		buildLoc := buildNumReg.FindIndex(buildFileS)
+		
+		if len(buildLoc) != 0 {
+			outLoc := buildNumVReg.FindIndex(buildFileS[buildLoc[1]:])
+			if len(outLoc) == 0 {continue}
+			if outLoc[0] > 20 {continue}
+			out := buildFileS[buildLoc[1]+outLoc[0]:buildLoc[1]+outLoc[1]]
+			foundNumber = string(out)
+			break
+		}
+	}
 
-	if len(buildLoc) == 0 {
-		panic("Build num not located! Auto loading has failed :(")
+	if foundNumber == "" {
+		panic("Couldn't find the build number, autoload failed!")
 	}
 
-	return buildFileS[buildLoc[1]+3 : buildLoc[1]+9]
+	return foundNumber
 }
 
 func (mask *HeadersMask) EncodeSuperProps() {