From 1d217f63ebc199f2971411571d21068e63bce643 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Mon, 15 Jul 2019 22:52:37 -0700 Subject: [PATCH] Support the same options for the `boards:` option in Sauce that we do for Filter. #2171 --- src/General/Settings/Sauce.html | 2 +- src/Images/Sauce.coffee | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/General/Settings/Sauce.html b/src/General/Settings/Sauce.html index bee13122d..6f35c88cf 100644 --- a/src/General/Settings/Sauce.html +++ b/src/General/Settings/Sauce.html @@ -18,7 +18,7 @@
Lines starting with a # will be ignored.
You can specify a display text by appending ;text:[text] to the URL.
-
You can specify the applicable boards by appending ;boards:[board1],[board2].
+
You can specify the applicable boards/sites by appending ;boards:[board1],[board2]. See the Filter guide for details.
You can specify the applicable file types by appending ;types:[extension1],[extension2].
You can specify a regular expression the filename must match by appending ;regexp:[regular expression].
diff --git a/src/Images/Sauce.coffee b/src/Images/Sauce.coffee index b36f3fa74..b7717daa2 100644 --- a/src/Images/Sauce.coffee +++ b/src/Images/Sauce.coffee @@ -26,6 +26,8 @@ Sauce = m = part.match /^(\w*):?(.*)$/ parts[m[1]] = m[2] parts['text'] or= parts['url'].match(/(\w+)\.\w+\//)?[1] or '?' + if 'boards' of parts + parts['boards'] = Filter.parseBoards parts['boards'] if 'regexp' of parts try if (regexp = parts['regexp'].match /^\/(.*)\/(\w*)$/) @@ -48,8 +50,8 @@ Sauce = parts = {} $.extend parts, link - return null unless !parts['boards'] or post.board.ID in parts['boards'].split ',' - return null unless !parts['types'] or ext in parts['types'].split ',' + return null unless !parts['boards'] or parts['boards']["#{post.siteID}/#{post.boardID}"] or parts['boards']["#{post.siteID}/*"] + return null unless !parts['types'] or ext in parts['types'].split(',') return null unless !parts['regexp'] or (matches = file.name.match parts['regexp']) missing = []