MV3: Really support CSL import from all .csl github pages

zotero · May 24, 2024 · fe12c39 · fe12c39
1 parent 783dda1
commit fe12c39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/browserExt/contentTypeHandler.js b/src/browserExt/contentTypeHandler.js
@@ -47,7 +47,7 @@ Zotero.ContentTypeHandler = {
 	]),
 	mv3CSLWhitelistRegexp: {
 		"https://www.zotero.org/styles/\\1": /https?:\/\/(?:www\.)zotero\.org\/styles\/?#importConfirm=(.*)$/,
-		"https://raw.githubusercontent.com/\\1/styles/\\2": /https?:\/\/github\.com\/([^/]*)\/styles\/[^/]*\/([^.]*.csl)#importConfirm$/,
+		"https://raw.githubusercontent.com/\\1/\\2": /https?:\/\/github\.com\/([^/]*\/[^/]*)\/[^/]*\/([^.]*.csl)#importConfirm$/,
 	},
 	ignoreURL: new Set(),
 

diff --git a/src/browserExt/styleInterceptRules.json b/src/browserExt/styleInterceptRules.json
@@ -19,11 +19,11 @@
 		"action": {
 			"type": "redirect",
 			"redirect": {
-				"regexSubstitution": "https://github.com/\\1/styles/blob/\\2#importConfirm"
+				"regexSubstitution": "https://github.com/\\1/blob/\\2#importConfirm"
 			}
 		},
 		"condition": {
-			"regexFilter": "^https://raw\\.githubusercontent\\.com/([^/]*)/styles/([^/]*/[^#?]+.csl)$",
+			"regexFilter": "^https://raw\\.githubusercontent\\.com/([^/]*/[^/]*)/([^/]*/[^#?]+.csl)$",
 			"resourceTypes": ["main_frame"]
 		}
 	}