diff --git a/4chan_x.user.js b/4chan_x.user.js index 1bdc4a114..75558473d 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -860,7 +860,7 @@ _ref = post.quotes; for (_i = 0, _len = _ref.length; _i < _len; _i++) { quote = _ref[_i]; - if (!((el = $.id(quote.hash.slice(1))) && !/catalog$/.test(quote.pathname) && el.hidden)) { + if (!((el = $.id(quote.hash.slice(1))) && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) && el.hidden)) { continue; } $.addClass(quote, 'filtered'); @@ -4016,7 +4016,7 @@ if (quote.parentNode.parentNode.className === 'capcodeReplies') { break; } - if (!/catalog$/.test(quote.pathname) && (qid = quote.hash.slice(2))) { + if (quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) && (qid = quote.hash.slice(2))) { quotes[qid] = true; } } @@ -4057,7 +4057,7 @@ _ref = post.quotes; for (_i = 0, _len = _ref.length; _i < _len; _i++) { quote = _ref[_i]; - if (!(quote.hash && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) { + if (!(quote.hash && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) { continue; } $.on(quote, 'click', QuoteInline.toggle); @@ -4150,7 +4150,7 @@ _ref = post.quotes; for (_i = 0, _len = _ref.length; _i < _len; _i++) { quote = _ref[_i]; - if (!(quote.hash && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) { + if (!(quote.hash && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname) || /\bdeadlink\b/.test(quote.className))) { continue; } $.on(quote, 'mouseover', QuotePreview.mouseover); @@ -4290,7 +4290,7 @@ _ref = post.quotes; for (_i = 0, _len = _ref.length; _i < _len; _i++) { quote = _ref[_i]; - if (!(quote.hash && !/catalog$/.test(quote.pathname))) { + if (!(quote.hash && quote.hostname === 'boards.4chan.org' && !/catalog$/.test(quote.pathname))) { continue; } path = quote.pathname.split('/'); diff --git a/changelog b/changelog index e521b62eb..882f23734 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ master - Mayhem Fix successful posting causing errors. + Fix 4chan X trying to interact with >>>/board/rules links. 2.37.2 - aeosynth diff --git a/script.coffee b/script.coffee index 8a59673b4..354d85d04 100644 --- a/script.coffee +++ b/script.coffee @@ -709,7 +709,7 @@ StrikethroughQuotes = node: (post) -> return if post.isInlined for quote in post.quotes - continue unless (el = $.id quote.hash[1..]) and !/catalog$/.test(quote.pathname) and el.hidden + continue unless (el = $.id quote.hash[1..]) and quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) and el.hidden $.addClass quote, 'filtered' if Conf['Recursive Filtering'] and post.ID isnt post.threadID show_stub = !!$.x 'preceding-sibling::div[contains(@class,"stub")]', el @@ -3321,7 +3321,7 @@ QuoteBacklink = # Stop at 'Admin/Mod/Dev Replies:' on /q/ break if quote.parentNode.parentNode.className is 'capcodeReplies' # Don't process >>>/b/. - if !/catalog$/.test(quote.pathname) and qid = quote.hash[2..] + if quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) and qid = quote.hash[2..] # Duplicate quotes get overwritten. quotes[qid] = true a = $.el 'a', @@ -3349,7 +3349,7 @@ QuoteInline = Main.callbacks.push @node node: (post) -> for quote in post.quotes - continue unless quote.hash and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className + continue unless quote.hash and quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className $.on quote, 'click', QuoteInline.toggle for quote in post.backlinks $.on quote, 'click', QuoteInline.toggle @@ -3418,7 +3418,7 @@ QuotePreview = Main.callbacks.push @node node: (post) -> for quote in post.quotes - continue unless quote.hash and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className + continue unless quote.hash and quote.hostname is 'boards.4chan.org' and !/catalog$/.test(quote.pathname) or /\bdeadlink\b/.test quote.className $.on quote, 'mouseover', QuotePreview.mouseover for quote in post.backlinks $.on quote, 'mouseover', QuotePreview.mouseover @@ -3514,7 +3514,7 @@ QuoteCT = node: (post) -> return if post.isInlined and not post.isCrosspost for quote in post.quotes - unless quote.hash and !/catalog$/.test quote.pathname + unless quote.hash and quote.hostname is 'boards.4chan.org' and !/catalog$/.test quote.pathname # Make sure this isn't a link to the board we're on. continue path = quote.pathname.split '/'