fix(navlinks): add support for 1.2.46's global navbar

spicetify · Sep 8, 2024 · 4e947ad · 4e947ad
1 parent d1fc089
commit 4e947ad
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/apply/apply.go b/src/apply/apply.go
@@ -332,11 +332,16 @@ func insertNavLink(str string, appNameArray string) string {
 			1)
 	}
 
-	// Global Navbar
+	// Global Navbar <= 1.2.45
 	utils.ReplaceOnce(&str, `(,[a-zA-Z_\$][\w\$]*===(?:[a-zA-Z_\$][\w\$]*\.){2}HOME_NEXT_TO_NAVIGATION&&.+?)\]`, func(submatches ...string) string {
 		return fmt.Sprintf("%s,Spicetify._renderNavLinks([%s], true)]", submatches[1], appNameArray)
 	})
 
+	// Global Navbar >= 1.2.46
+	utils.ReplaceOnce(&str, `("global-nav-bar".*?)(\(0,\s*[a-zA-Z_\$][\w\$]*\.jsx\))(\(\s*\w+,\s*\{\s*className:\w*\s*\}\s*\))\s*\}\),\s*(\(0,)`, func(submatches ...string) string {
+		return fmt.Sprintf("%s[%s%s,Spicetify._renderNavLinks([%s], true)].flat()}),%s", submatches[1], submatches[2], submatches[3], appNameArray, submatches[4])
+	})
+
 	return str
 }
 
@@ -409,7 +414,6 @@ func insertExpFeatures(jsPath string, flags Flag) {
 			&content,
 			`(([\w$.]+\.fromJSON)\(\w+\)+;)(return ?[\w{}().,]+[\w$]+\.Provider,)(\{value:\{localConfiguration)`,
 			func(submatches ...string) string {
-				fmt.Println(submatches)
 				return fmt.Sprintf("%sSpicetify.createInternalMap=%s;%sSpicetify.RemoteConfigResolver=%s", submatches[1], submatches[2], submatches[3], submatches[4])
 			})
 		return content