From 768cb4be44438205b482eef622fdf4f98e0b0232 Mon Sep 17 00:00:00 2001 From: ririxi Date: Wed, 11 Sep 2024 23:25:34 +0200 Subject: [PATCH] fix(apply): check for old global navbar existence --- src/apply/apply.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apply/apply.go b/src/apply/apply.go index cbcb1b7c8d..e6d9d4fc50 100644 --- a/src/apply/apply.go +++ b/src/apply/apply.go @@ -333,14 +333,17 @@ func insertNavLink(str string, appNameArray string) string { } // Global Navbar <= 1.2.45 + globalNavBarMatch := utils.FindMatch(str, `(,[a-zA-Z_\$][\w\$]*===(?:[a-zA-Z_\$][\w\$]*\.){2}HOME_NEXT_TO_NAVIGATION&&.+?)\]`) 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*\))`, func(submatches ...string) string { - return fmt.Sprintf("%s[%s%s,Spicetify._renderNavLinks([%s], true)].flat()", submatches[1], submatches[2], submatches[3], appNameArray) - }) + if len(globalNavBarMatch) == 0 { + utils.ReplaceOnce(&str, `("global-nav-bar".*?)(\(0,\s*[a-zA-Z_\$][\w\$]*\.jsx\))(\(\s*\w+,\s*\{\s*className:\w*\s*\}\s*\))`, func(submatches ...string) string { + return fmt.Sprintf("%s[%s%s,Spicetify._renderNavLinks([%s], true)].flat()", submatches[1], submatches[2], submatches[3], appNameArray) + }) + } return str }