-
-
diff --git a/src/General/Settings/SettingsHtml.tsx b/src/General/Settings/SettingsHtml.tsx
new file mode 100644
index 0000000000..b435b6cdeb
--- /dev/null
+++ b/src/General/Settings/SettingsHtml.tsx
@@ -0,0 +1,26 @@
+import { g } from "../../globals/globals";
+import h from "../../globals/jsx";
+import meta from '../../../package.json';
+
+// \u00A0 is non breaking space
+const separator = '\u00A0|\u00A0';
+
+const settingsHtml =
-
+
+
;
+
+export default settingsHtml;
diff --git a/src/General/Test.js b/src/General/Test.js
index 79a83f6e1a..6b68aace89 100644
--- a/src/General/Test.js
+++ b/src/General/Test.js
@@ -5,8 +5,21 @@
* DS205: Consider reworking code to avoid use of IIFEs
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-// <% if (readJSON('/.tests_enabled')) { %>
-var Test = {
+
+import Notice from "../classes/Notice";
+import Post from "../classes/Post";
+import Config from "../config/Config";
+import Filter from "../Filtering/Filter";
+import ImageHost from "../Images/ImageHost";
+import Keybinds from "../Miscellaneous/Keybinds";
+import Unread from "../Monitoring/Unread";
+import $$ from "../platform/$$";
+import $ from "../platform/$";
+import Header from "./Header";
+import { g, Conf, c } from "../globals/globals";
+import Menu from "../Menu/Menu";
+
+const Test = {
init() {
if ((g.SITE.software !== 'yotsuba') || !['index', 'thread'].includes(g.VIEW)) { return; }
@@ -237,4 +250,4 @@ var Test = {
}
}
};
-// <% } %>
+export default Test;
diff --git a/src/General/UI.js b/src/General/UI.js
index 9e3139912b..52ca6a63e1 100644
--- a/src/General/UI.js
+++ b/src/General/UI.js
@@ -1,3 +1,9 @@
+import { Conf, d, doc } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import Header from "./Header";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -278,7 +284,7 @@ var Menu = (function() {
return Menu;
})();
-var dragstart = function(e) {
+export var dragstart = function (e) {
let isTouching;
if ((e.type === 'mousedown') && (e.button !== 0)) { return; } // not LMB
// prevent text selection
@@ -324,7 +330,7 @@ var dragstart = function(e) {
}
};
-var touchmove = function(e) {
+export var touchmove = function (e) {
for (var touch of e.changedTouches) {
if (touch.identifier === this.identifier) {
drag.call(this, touch);
@@ -333,7 +339,7 @@ var touchmove = function(e) {
}
};
-var drag = function(e) {
+export var drag = function (e) {
const {clientX, clientY} = e;
let left = clientX - this.dx;
@@ -369,7 +375,7 @@ var drag = function(e) {
return style.bottom = bottom;
};
-var touchend = function(e) {
+export var touchend = function (e) {
for (var touch of e.changedTouches) {
if (touch.identifier === this.identifier) {
dragend.call(this);
@@ -378,7 +384,7 @@ var touchend = function(e) {
}
};
-var dragend = function() {
+export var dragend = function () {
if (this.isTouching) {
$.off(d, 'touchmove', this.move);
$.off(d, 'touchend touchcancel', this.up);
@@ -389,7 +395,7 @@ var dragend = function() {
return $.set(`${this.id}.position`, this.style.cssText);
};
-const hoverstart = function({root, el, latestEvent, endEvents, height, width, cb, noRemove}) {
+const hoverstart = function ({ root, el, latestEvent, endEvents, height, width, cb, noRemove }) {
const rect = root.getBoundingClientRect();
const o = {
root,
@@ -428,7 +434,7 @@ const hoverstart = function({root, el, latestEvent, endEvents, height, width, cb
hoverstart.padding = 25;
-var hover = function(e) {
+export var hover = function (e) {
this.latestEvent = e;
const height = (this.height || this.el.offsetHeight) + hoverstart.padding;
const width = (this.width || this.el.offsetWidth);
@@ -452,7 +458,7 @@ var hover = function(e) {
return style.right = right;
};
-var hoverend = function(e) {
+export var hoverend = function (e) {
if (((e.type === 'keydown') && (e.keyCode !== 13)) || (e.target.nodeName === "TEXTAREA")) { return; }
if (!this.noRemove) { $.rm(this.el); }
$.off(this.root, this.endEvents, this.hoverend);
@@ -463,7 +469,7 @@ var hoverend = function(e) {
if (this.cb) { return this.cb.call(this); }
};
-const checkbox = function(name, text, checked) {
+export const checkbox = function (name, text, checked) {
if (checked == null) { checked = Conf[name]; }
const label = $.el('label');
const input = $.el('input', {type: 'checkbox', name, checked});
@@ -477,3 +483,4 @@ const UI = {
hover: hoverstart,
checkbox
};
+export default UI;
diff --git a/src/Images/FappeTyme.js b/src/Images/FappeTyme.js
index 8620a13e0e..5704f9f210 100644
--- a/src/Images/FappeTyme.js
+++ b/src/Images/FappeTyme.js
@@ -1,3 +1,9 @@
+import Callbacks from "../classes/Callbacks";
+import Header from "../General/Header";
+import UI from "../General/UI";
+import { Conf, doc, g } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -83,3 +89,4 @@ var FappeTyme = {
if (type === 'werk') { return $.cb.checked.call(this.nodes[type]); }
}
};
+export default FappeTyme;
diff --git a/src/Images/Gallery.js b/src/Images/Gallery.js
index cbccd67bc5..d04c63a35c 100644
--- a/src/Images/Gallery.js
+++ b/src/Images/Gallery.js
@@ -6,6 +6,20 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
import galleryPage from './Gallery/Gallery.html';
+import $ from '../platform/$';
+import Callbacks from '../classes/Callbacks';
+import Notice from '../classes/Notice';
+import Main from '../main/Main';
+import Keybinds from '../Miscellaneous/Keybinds';
+import $$ from '../platform/$$';
+import ImageCommon from './ImageCommon';
+import Sauce from './Sauce';
+import Volume from './Volume';
+import Header from '../General/Header';
+import { Conf, d, doc, g } from '../globals/globals';
+import UI from '../General/UI';
+import Get from '../General/Get';
+import { debounce, dict, SECOND } from '../platform/helpers';
var Gallery = {
init() {
@@ -64,7 +78,7 @@ var Gallery = {
Gallery.images = [];
const nodes = (Gallery.nodes = {});
- Gallery.fileIDs = $.dict();
+ Gallery.fileIDs = dict();
Gallery.slideshow = false;
nodes.el = (dialog = $.el('div',
@@ -280,7 +294,7 @@ var Gallery = {
},
startTimer() {
- return Gallery.timeoutID = setTimeout(Gallery.checkTimer, Gallery.delay * $.SECOND);
+ return Gallery.timeoutID = setTimeout(Gallery.checkTimer, Gallery.delay * SECOND);
},
setupTimer() {
@@ -399,7 +413,7 @@ var Gallery = {
rotateLeft() { return Gallery.cb.rotate(270); },
rotateRight() { return Gallery.cb.rotate(90); },
- rotate: $.debounce(100, function(delta) {
+ rotate: debounce(100, function(delta) {
const {current} = Gallery.nodes;
if (current.nodeName === 'IFRAME') { return; }
current.dataRotate = ((current.dataRotate || 0) + delta) % 360;
@@ -431,7 +445,7 @@ var Gallery = {
return (this.checked ? $.addClass : $.rmClass)(doc, `gal-${this.name.toLowerCase().replace(/\s+/g, '-')}`);
},
- setHeight: $.debounce(100, function() {
+ setHeight: debounce(100, function () {
let dim, margin, minHeight;
const {current, frame} = Gallery.nodes;
const {style} = current;
@@ -504,3 +518,4 @@ var Gallery = {
}
}
};
+export default Gallery;
diff --git a/src/Images/ImageCommon.js b/src/Images/ImageCommon.js
index f4a1b4062d..bc36f436bd 100644
--- a/src/Images/ImageCommon.js
+++ b/src/Images/ImageCommon.js
@@ -1,3 +1,11 @@
+import Redirect from "../Archive/Redirect";
+import Notice from "../classes/Notice";
+import { g, Conf, d } from "../globals/globals";
+import $ from "../platform/$";
+import CrossOrigin from "../platform/CrossOrigin";
+import ImageHost from "./ImageHost";
+import Volume from "./Volume";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -144,3 +152,4 @@ var ImageCommon = {
});
}
};
+export default ImageCommon;
diff --git a/src/Images/ImageExpand.js b/src/Images/ImageExpand.js
index 6a6071472e..7c1e59a794 100644
--- a/src/Images/ImageExpand.js
+++ b/src/Images/ImageExpand.js
@@ -1,3 +1,15 @@
+import Callbacks from "../classes/Callbacks";
+import Config from "../config/Config";
+import Get from "../General/Get";
+import Header from "../General/Header";
+import UI from "../General/UI";
+import { Conf, d, doc, g } from "../globals/globals";
+import Nav from "../Miscellaneous/Nav";
+import $ from "../platform/$";
+import { SECOND } from "../platform/helpers";
+import ImageCommon from "./ImageCommon";
+import Volume from "./Volume";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -338,7 +350,7 @@ var ImageExpand = {
if (ImageCommon.isFromArchive(this)) {
return ImageExpand.contract(post);
}
- return ImageCommon.error(this, post, post.file, 10 * $.SECOND, function(URL) {
+ return ImageCommon.error(this, post, post.file, 10 * SECOND, function(URL) {
if (post.file.isExpanding || post.file.isExpanded) {
ImageExpand.contract(post);
if (URL) { return ImageExpand.expand(post, URL); }
@@ -383,3 +395,4 @@ var ImageExpand = {
}
}
};
+export default ImageExpand;
diff --git a/src/Images/ImageHost.js b/src/Images/ImageHost.js
index cfc7a6f4d3..1af2e15929 100644
--- a/src/Images/ImageHost.js
+++ b/src/Images/ImageHost.js
@@ -1,3 +1,7 @@
+import Callbacks from "../classes/Callbacks";
+import { Conf, g } from "../globals/globals";
+import $$ from "../platform/$$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -49,3 +53,4 @@ var ImageHost = {
}
}
};
+export default ImageHost;
diff --git a/src/Images/ImageHover.js b/src/Images/ImageHover.js
index f87a68583f..3edff195b8 100644
--- a/src/Images/ImageHover.js
+++ b/src/Images/ImageHover.js
@@ -1,3 +1,12 @@
+import Callbacks from "../classes/Callbacks";
+import Header from "../General/Header";
+import UI from "../General/UI";
+import { g, Conf, doc } from "../globals/globals";
+import $ from "../platform/$";
+import { SECOND } from "../platform/helpers";
+import ImageCommon from "./ImageCommon";
+import Volume from "./Volume";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -93,7 +102,7 @@ var ImageHover = {
error(post, file) { return function() {
if (ImageCommon.decodeError(this, file)) { return; }
- return ImageCommon.error(this, post, file, 3 * $.SECOND, URL => {
+ return ImageCommon.error(this, post, file, 3 * SECOND, URL => {
if (URL) {
return this.src = URL + (this.src === URL ? '?' + Date.now() : '');
} else {
@@ -102,3 +111,4 @@ var ImageHover = {
});
}; }
};
+export default ImageHover;
diff --git a/src/Images/ImageLoader.js b/src/Images/ImageLoader.js
index 648ac5c04c..b5ed88bed2 100644
--- a/src/Images/ImageLoader.js
+++ b/src/Images/ImageLoader.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import Header from "../General/Header";
+import { g, Conf, d } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -133,3 +138,4 @@ var ImageLoader = {
});
}
};
+export default ImageLoader;
diff --git a/src/Images/Metadata.js b/src/Images/Metadata.js
index f01652d80b..de064144c0 100644
--- a/src/Images/Metadata.js
+++ b/src/Images/Metadata.js
@@ -1,3 +1,9 @@
+import $ from "../platform/$";
+import Callbacks from "../classes/Callbacks";
+import CrossOrigin from "../platform/CrossOrigin";
+import { Conf, d, g } from "../globals/globals";
+import Get from "../General/Get";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -87,3 +93,4 @@ var Metadata = {
return null;
}
};
+export default Metadata;
diff --git a/src/Images/RevealSpoilers.js b/src/Images/RevealSpoilers.js
index efd69bcefd..414fe4ee63 100644
--- a/src/Images/RevealSpoilers.js
+++ b/src/Images/RevealSpoilers.js
@@ -1,3 +1,6 @@
+import Callbacks from "../classes/Callbacks";
+import { g, Conf } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -31,3 +34,4 @@ const RevealSpoilers = {
}
}
};
+export default RevealSpoilers;
diff --git a/src/Images/Sauce.js b/src/Images/Sauce.js
index 027fb98ee9..5d1646b598 100644
--- a/src/Images/Sauce.js
+++ b/src/Images/Sauce.js
@@ -1,3 +1,10 @@
+import Callbacks from "../classes/Callbacks";
+import Notice from "../classes/Notice";
+import Filter from "../Filtering/Filter";
+import { g, Conf, doc } from "../globals/globals";
+import $ from "../platform/$";
+import { dict } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -35,7 +42,7 @@ var Sauce = {
parseLink(link) {
if (!(link = link.trim())) { return null; }
- const parts = $.dict();
+ const parts = dict();
const iterable = link.split(/;(?=(?:text|boards|types|regexp|sandbox):?)/);
for (let i = 0; i < iterable.length; i++) {
var part = iterable[i];
@@ -75,7 +82,7 @@ var Sauce = {
createSauceLink(link, post, file) {
let a, matches, needle;
const ext = file.url.match(/[^.]*$/)[0];
- const parts = $.dict();
+ const parts = dict();
$.extend(parts, link);
if (!!parts['boards'] && !parts['boards'][`${post.siteID}/${post.boardID}`] && !parts['boards'][`${post.siteID}/*`]) { return null; }
@@ -168,3 +175,4 @@ var Sauce = {
semi() { return ';'; }
}
};
+export default Sauce;
diff --git a/src/Images/Volume.js b/src/Images/Volume.js
index 41b11fbcdd..1cb018b125 100644
--- a/src/Images/Volume.js
+++ b/src/Images/Volume.js
@@ -1,3 +1,10 @@
+import Callbacks from "../classes/Callbacks";
+import Config from "../config/Config";
+import Header from "../General/Header";
+import UI from "../General/UI";
+import { g, Conf, E } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -10,14 +17,12 @@ var Volume = {
$.sync('Allow Sound', function(x) {
Conf['Allow Sound'] = x;
- // TODO check if inputs exits
- return Volume.inputs.unmute.checked = x;
+ if (Volume.inputs) Volume.inputs.unmute.checked = x;
});
$.sync('Default Volume', function(x) {
Conf['Default Volume'] = x;
- // TODO check if inputs exits
- return Volume.inputs.volume.value = x;
+ if (Volume.inputs) Volume.inputs.volume.value = x;
});
if (Conf['Mouse Wheel Volume']) {
@@ -110,3 +115,4 @@ var Volume = {
return e.preventDefault();
}
};
+export default Volume;
diff --git a/src/Linkification/Embedding.js b/src/Linkification/Embedding.js
index 31f0dca63b..6bdbd583fc 100644
--- a/src/Linkification/Embedding.js
+++ b/src/Linkification/Embedding.js
@@ -1,3 +1,14 @@
+import Get from '../General/Get';
+import Header from '../General/Header';
+import UI from '../General/UI';
+import { g, Conf, d, doc } from '../globals/globals';
+import ImageHost from '../Images/ImageHost';
+import Main from '../main/Main';
+import $ from '../platform/$';
+import $$ from '../platform/$$';
+import CrossOrigin from '../platform/CrossOrigin';
+import { dict } from '../platform/helpers';
+import EmbeddingPage from './Embedding/Embed.html';
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -6,12 +17,11 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-import EmbeddingPage from './Ebedding/embedding.html';
var Embedding = {
init() {
if (!['index', 'thread', 'archive'].includes(g.VIEW) || !Conf['Linkify'] || (!Conf['Embedding'] && !Conf['Link Title'] && !Conf['Cover Preview'])) { return; }
- this.types = $.dict();
+ this.types = dict();
for (var type of this.ordered_types) { this.types[type.key] = type; }
if (Conf['Embedding'] && (g.VIEW !== 'archive')) {
@@ -689,3 +699,4 @@ var Embedding = {
}
]
};
+export default Embedding;
diff --git a/src/Linkification/Linkify.js b/src/Linkification/Linkify.js
index b785cdf9b5..20096ce39b 100644
--- a/src/Linkification/Linkify.js
+++ b/src/Linkification/Linkify.js
@@ -1,3 +1,12 @@
+import Callbacks from "../classes/Callbacks";
+// import Test from "../General/Test";
+import { g, Conf } from "../globals/globals";
+import ImageHost from "../Images/ImageHost";
+import ExpandComment from "../Miscellaneous/ExpandComment";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import Embedding from "./Embedding";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -94,11 +103,13 @@ var Linkify = {
if (Linkify.regString.test(word)) {
links.push(Linkify.makeRange(node, endNode, index, length));
- }
+
// <% if (readJSON('/.tests_enabled')) { %>
- // Test.assert ->
- // word is links[links.length-1].toString()
+ // if (links.length) {
+ // Test.assert(() => word === links[links.length - 1]?.toString());
+ // }
// <% } %>
+ }
if (!test.lastIndex || (node !== endNode)) { break; }
}
@@ -196,3 +207,4 @@ aero|asia|biz|cat|com|coop|dance|info|int|jobs|mobi|moe|museum|name|net|org|post
return a;
}
};
+export default Linkify;
diff --git a/src/Menu/ArchiveLink.js b/src/Menu/ArchiveLink.js
index 06b0f57141..e65fd107e8 100644
--- a/src/Menu/ArchiveLink.js
+++ b/src/Menu/ArchiveLink.js
@@ -1,3 +1,9 @@
+import $ from "../platform/$";
+import Redirect from "../Archive/Redirect";
+import Filter from "../Filtering/Filter";
+import { g, Conf } from "../globals/globals";
+import Menu from "./Menu";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -76,3 +82,4 @@ const ArchiveLink = {
};
}
};
+export default ArchiveLink;
diff --git a/src/Menu/CopyTextLink.js b/src/Menu/CopyTextLink.js
index c622ee8681..d1597f0570 100644
--- a/src/Menu/CopyTextLink.js
+++ b/src/Menu/CopyTextLink.js
@@ -1,3 +1,7 @@
+import { g, Conf, d } from "../globals/globals";
+import $ from "../platform/$";
+import Menu from "./Menu";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -39,3 +43,4 @@ var CopyTextLink = {
return $.rm(el);
}
};
+export default CopyTextLink;
diff --git a/src/Menu/DeleteLink.js b/src/Menu/DeleteLink.js
index 6714e88088..e34106bc91 100644
--- a/src/Menu/DeleteLink.js
+++ b/src/Menu/DeleteLink.js
@@ -1,3 +1,9 @@
+import Notice from "../classes/Notice";
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+import { dict } from "../platform/helpers";
+import QR from "../Posting/QR";
+import Menu from "./Menu";
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -5,7 +11,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
var DeleteLink = {
- auto: [$.dict(), $.dict()],
+ auto: [dict(), dict()],
init() {
if (!['index', 'thread'].includes(g.VIEW) || !Conf['Menu'] || !Conf['Delete Link']) { return; }
@@ -147,7 +153,7 @@ var DeleteLink = {
},
cooldown: {
- seconds: $.dict(),
+ seconds: dict(),
start(post, seconds) {
// Already counting.
@@ -176,3 +182,4 @@ var DeleteLink = {
}
}
};
+export default DeleteLink;
diff --git a/src/Menu/DownloadLink.js b/src/Menu/DownloadLink.js
index b6b5c96268..84deee5b19 100644
--- a/src/Menu/DownloadLink.js
+++ b/src/Menu/DownloadLink.js
@@ -1,3 +1,8 @@
+import { g, Conf } from "../globals/globals";
+import ImageCommon from "../Images/ImageCommon";
+import $ from "../platform/$";
+import Menu from "./Menu";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -28,3 +33,4 @@ const DownloadLink = {
});
}
};
+export default DownloadLink;
diff --git a/src/Menu/Menu.js b/src/Menu/Menu.js
index 0c191645f4..e62c15aaf5 100644
--- a/src/Menu/Menu.js
+++ b/src/Menu/Menu.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import UI from "../General/UI";
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -50,3 +55,4 @@ var Menu = {
return button;
}
};
+export default Menu;
diff --git a/src/Menu/ReportLink.js b/src/Menu/ReportLink.js
index 7ddcb1a4a4..30c3c8652b 100644
--- a/src/Menu/ReportLink.js
+++ b/src/Menu/ReportLink.js
@@ -1,3 +1,7 @@
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+import Menu from "./Menu";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -37,3 +41,4 @@ var ReportLink = {
return window.open(url, id, set);
}
};
+export default ReportLink;
diff --git a/src/Miscellaneous/AntiAutoplay.js b/src/Miscellaneous/AntiAutoplay.js
index 2ca75e2d83..1f0fbe8070 100644
--- a/src/Miscellaneous/AntiAutoplay.js
+++ b/src/Miscellaneous/AntiAutoplay.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import { Conf, doc } from "../globals/globals";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -44,3 +49,4 @@ var AntiAutoplay = {
return $.addClass(el, 'autoplay-removed');
}
};
+export default AntiAutoplay;
diff --git a/src/Miscellaneous/Banner.js b/src/Miscellaneous/Banner.js
index 8894bf443b..790ceb5ed0 100644
--- a/src/Miscellaneous/Banner.js
+++ b/src/Miscellaneous/Banner.js
@@ -1,3 +1,11 @@
+import DataBoard from "../classes/DataBoard";
+import { Conf, d, g } from "../globals/globals";
+import Main from "../main/Main";
+import Unread from "../Monitoring/Unread";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import { dict } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -103,7 +111,7 @@ var Banner = {
}
},
- original: $.dict(),
+ original: dict(),
custom(child) {
let data;
@@ -125,3 +133,4 @@ var Banner = {
}
}
};
+export default Banner;
diff --git a/src/Miscellaneous/CatalogLinks.js b/src/Miscellaneous/CatalogLinks.js
index 46b605df58..06977553e7 100644
--- a/src/Miscellaneous/CatalogLinks.js
+++ b/src/Miscellaneous/CatalogLinks.js
@@ -1,3 +1,16 @@
+import Callbacks from "../classes/Callbacks";
+import Filter from "../Filtering/Filter";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import meta from '../../package.json';
+import Index from "../General/Index";
+import Site from "../site/Site";
+import Header from "../General/Header";
+import { g, Conf } from "../globals/globals";
+import UI from "../General/UI";
+import Get from "../General/Get";
+import { dict } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -28,14 +41,14 @@ var CatalogLinks = {
var catalogLink = link.parentNode.cloneNode(true);
var link2 = catalogLink.firstElementChild;
link2.href = catalogURL;
- link2.textContent = link2.hostname === location.hostname ? '<%= meta.name %> Catalog' : 'External Catalog';
+ link2.textContent = link2.hostname === location.hostname ? `${meta.name} Catalog` : 'External Catalog';
$.after(link.parentNode, [$.tn(' '), catalogLink]);
}
}
});
}
- if ((g.SITE.software === 'yotsuba') && Conf['JSON Index'] && Conf['Use <%= meta.name %> Catalog']) {
+ if ((g.SITE.software === 'yotsuba') && Conf['JSON Index'] && Conf[`Use ${meta.name} Catalog`]) {
Callbacks.Post.push({
name: 'Catalog Link Rewrite',
cb: this.node
@@ -111,12 +124,12 @@ var CatalogLinks = {
},
externalParse() {
- CatalogLinks.externalList = $.dict();
+ CatalogLinks.externalList = dict();
for (var line of Conf['externalCatalogURLs'].split('\n')) {
if (line[0] === '#') { continue; }
var url = line.split(';')[0];
var boards = Filter.parseBoards(line.match(/;boards:([^;]+)/)?.[1] || '*');
- var excludes = Filter.parseBoards(line.match(/;exclude:([^;]+)/)?.[1]) || $.dict();
+ var excludes = Filter.parseBoards(line.match(/;exclude:([^;]+)/)?.[1]) || dict();
for (var board in boards) {
if (!excludes[board] && !excludes[board.split('/')[0] + '/*']) {
CatalogLinks.externalList[board] = url;
@@ -143,7 +156,7 @@ var CatalogLinks = {
let external, nativeCatalog;
if (Conf['External Catalog'] && (external = CatalogLinks.external(board))) {
return external;
- } else if (Index.enabledOn(board) && Conf['Use <%= meta.name %> Catalog']) {
+ } else if (Index.enabledOn(board) && Conf[`Use ${meta.name} Catalog`]) {
return CatalogLinks.jsonIndex(board, '#catalog');
} else if (nativeCatalog = Get.url('catalog', board)) {
return nativeCatalog;
@@ -160,3 +173,4 @@ var CatalogLinks = {
}
}
};
+export default CatalogLinks;
diff --git a/src/Miscellaneous/CustomCSS.js b/src/Miscellaneous/CustomCSS.js
index 22db6a43b2..2e0a074c61 100644
--- a/src/Miscellaneous/CustomCSS.js
+++ b/src/Miscellaneous/CustomCSS.js
@@ -1,3 +1,7 @@
+import $ from "../platform/$";
+import CSS from "../css/CSS";
+import { Conf } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -27,3 +31,4 @@ const CustomCSS = {
return this.style.textContent = CSS.sub(Conf['usercss']);
}
};
+export default CustomCSS;
diff --git a/src/Miscellaneous/ExpandComment.js b/src/Miscellaneous/ExpandComment.js
index 5b42093078..33537d5e4d 100644
--- a/src/Miscellaneous/ExpandComment.js
+++ b/src/Miscellaneous/ExpandComment.js
@@ -1,3 +1,9 @@
+import Callbacks from "../classes/Callbacks";
+import Get from "../General/Get";
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -94,3 +100,4 @@ var ExpandComment = {
}
}
};
+export default ExpandComment;;
diff --git a/src/Miscellaneous/ExpandThread.js b/src/Miscellaneous/ExpandThread.js
index 6ca2f3252a..dab38f5300 100644
--- a/src/Miscellaneous/ExpandThread.js
+++ b/src/Miscellaneous/ExpandThread.js
@@ -1,3 +1,13 @@
+import Callbacks from "../classes/Callbacks";
+import Post from "../classes/Post";
+import Get from "../General/Get";
+import Index from "../General/Index";
+import { g, Conf, d } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import { dict } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -5,7 +15,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
var ExpandThread = {
- statuses: $.dict(),
+ statuses: dict(),
init() {
if (!((g.VIEW === 'index') && Conf['Thread Expansion'])) { return; }
if (Conf['JSON Index']) {
@@ -156,3 +166,4 @@ var ExpandThread = {
}
}
};
+export default ExpandThread;
diff --git a/src/Miscellaneous/FileInfo.js b/src/Miscellaneous/FileInfo.js
deleted file mode 100644
index d03c625747..0000000000
--- a/src/Miscellaneous/FileInfo.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-var FileInfo = {
- init() {
- if (!['index', 'thread', 'archive'].includes(g.VIEW) || !Conf['File Info Formatting']) { return; }
-
- return Callbacks.Post.push({
- name: 'File Info Formatting',
- cb: this.node
- });
- },
-
- node() {
- if (!this.file) { return; }
- if (this.isClone) {
- let a;
- for (a of $$('.file-info .download-button', this.file.text)) {
- $.on(a, 'click', ImageCommon.download);
- }
- for (a of $$('.file-info .quick-filter-md5', this.file.text)) {
- $.on(a, 'click', Filter.quickFilterMD5);
- }
- return;
- }
-
- const oldInfo = $.el('span', {className: 'fileText-original'});
- $.prepend(this.file.link.parentNode, oldInfo);
- $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
-
- const info = $.el('span', {className: 'file-info'});
- FileInfo.format(Conf['fileInfo'], this, info);
- return $.prepend(this.file.text, info);
- },
-
- format(formatString, post, outputNode) {
- let a;
- const output = [];
- formatString.replace(/%(.)|[^%]+/g, function(s, c) {
- output.push($.hasOwn(FileInfo.formatters, c) ?
- FileInfo.formatters[c].call(post)
- :
- {innerHTML: E(s)}
- );
- return '';
- });
- $.extend(outputNode, {innerHTML: E.cat(output)});
- for (a of $$('.download-button', outputNode)) {
- $.on(a, 'click', ImageCommon.download);
- }
- for (a of $$('.quick-filter-md5', outputNode)) {
- $.on(a, 'click', Filter.quickFilterMD5);
- }
- },
-
- formatters: {
- t() { return {innerHTML: E(this.file.url.match(/[^/]*$/)[0])}; },
- T() { return {innerHTML: "" + (FileInfo.formatters.t.call(this)).innerHTML + ""}; },
- l() { return {innerHTML: "" + (FileInfo.formatters.n.call(this)).innerHTML + ""}; },
- L() { return {innerHTML: "" + (FileInfo.formatters.N.call(this)).innerHTML + ""}; },
- n() {
- const fullname = this.file.name;
- const shortname = SW.yotsuba.Build.shortFilename(this.file.name, this.isReply);
- if (fullname === shortname) {
- return {innerHTML: E(fullname)};
- } else {
- return {innerHTML: "" + E(shortname) + "" + E(fullname) + ""};
- }
- },
- N() { return {innerHTML: E(this.file.name)}; },
- d() { return {innerHTML: ""}; },
- f() { return {innerHTML: ""}; },
- p() { return {innerHTML: ((this.file.isSpoiler) ? "Spoiler, " : "")}; },
- s() { return {innerHTML: E(this.file.size)}; },
- B() { return {innerHTML: E(Math.round(this.file.sizeInBytes)) + " Bytes"}; },
- K() { return {innerHTML: E(Math.round(this.file.sizeInBytes/1024)) + " KB"}; },
- M() { return {innerHTML: E(Math.round(this.file.sizeInBytes/1048576*100)/100) + " MB"}; },
- r() { return {innerHTML: E(this.file.dimensions || "PDF")}; },
- g() { return {innerHTML: ((this.file.tag) ? ", " + E(this.file.tag) : "")}; },
- '%'() { return {innerHTML: "%"}; }
- }
-};
diff --git a/src/Miscellaneous/FileInfo.tsx b/src/Miscellaneous/FileInfo.tsx
new file mode 100644
index 0000000000..2d967704e2
--- /dev/null
+++ b/src/Miscellaneous/FileInfo.tsx
@@ -0,0 +1,99 @@
+import Callbacks from "../classes/Callbacks";
+import Filter from "../Filtering/Filter";
+import { g, Conf, E } from "../globals/globals";
+import h, { isEscaped } from "../globals/jsx";
+import ImageCommon from "../Images/ImageCommon";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import SW from "../site/SW";
+
+/*
+ * decaffeinate suggestions:
+ * DS102: Remove unnecessary code created because of implicit returns
+ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
+ */
+var FileInfo = {
+ init() {
+ if (!['index', 'thread', 'archive'].includes(g.VIEW) || !Conf['File Info Formatting']) { return; }
+
+ return Callbacks.Post.push({
+ name: 'File Info Formatting',
+ cb: this.node
+ });
+ },
+
+ node() {
+ if (!this.file) { return; }
+ if (this.isClone) {
+ let a;
+ for (a of $$('.file-info .download-button', this.file.text)) {
+ $.on(a, 'click', ImageCommon.download);
+ }
+ for (a of $$('.file-info .quick-filter-md5', this.file.text)) {
+ $.on(a, 'click', Filter.quickFilterMD5);
+ }
+ return;
+ }
+
+ const oldInfo = $.el('span', {className: 'fileText-original'});
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
+
+ const info = $.el('span', {className: 'file-info'});
+ FileInfo.format(Conf['fileInfo'], this, info);
+ return $.prepend(this.file.text, info);
+ },
+
+ format(formatString, post, outputNode) {
+ let a;
+ const output = [];
+ formatString.replace(/%(.)|[^%]+/g, function(s, c) {
+ output.push($.hasOwn(FileInfo.formatters, c) ?
+ FileInfo.formatters[c].call(post)
+ :
+ {innerHTML: E(s)}
+ );
+ return '';
+ });
+ $.extend(outputNode, {innerHTML: E.cat(output)});
+ for (a of $$('.download-button', outputNode)) {
+ $.on(a, 'click', ImageCommon.download);
+ }
+ for (a of $$('.quick-filter-md5', outputNode)) {
+ $.on(a, 'click', Filter.quickFilterMD5);
+ }
+ },
+
+ formatters: {
+ t() { return { innerHTML: E(this.file.url.match(/[^/]*$/)[0]), [isEscaped]: true }; },
+ T() { return {FileInfo.formatters.t.call(this)} },
+ l() { return {FileInfo.formatters.n.call(this)} },
+ L() { return {FileInfo.formatters.N.call(this)} },
+ n() {
+ const fullname = this.file.name;
+ const shortname = SW.yotsuba.Build.shortFilename(this.file.name, this.isReply);
+ if (fullname === shortname) {
+ return { innerHTML: E(fullname), [isEscaped]: true };
+ } else {
+ return
+ {shortname}
+ {fullname}
+ ;
+ }
+ },
+ N() { return { innerHTML: E(this.file.name), [isEscaped]: true }; },
+ d() { return },
+ f() {
+ return { innerHTML: "", [isEscaped]: true };
+ },
+ p() { return { innerHTML: ((this.file.isSpoiler) ? "Spoiler, " : ""), [isEscaped]: true }; },
+ s() { return { innerHTML: E(this.file.size), [isEscaped]: true }; },
+ B() { return { innerHTML: Math.round(this.file.sizeInBytes) + " Bytes", [isEscaped]: true }; },
+ K() { return { innerHTML: (Math.round(this.file.sizeInBytes / 1024)) + " KB", [isEscaped]: true }; },
+ M() { return { innerHTML: (Math.round(this.file.sizeInBytes / 1048576 * 100) / 100) + " MB", [isEscaped]: true }; },
+ r() { return { innerHTML: E(this.file.dimensions || "PDF"), [isEscaped]: true }; },
+ g() { return { innerHTML: ((this.file.tag) ? ", " + E(this.file.tag) : ""), [isEscaped]: true }; },
+ '%'() { return { innerHTML: "%", [isEscaped]: true }; }
+ }
+};
+export default FileInfo;
diff --git a/src/Miscellaneous/Flash.js b/src/Miscellaneous/Flash.js
index d377a7e613..dd8f54612d 100644
--- a/src/Miscellaneous/Flash.js
+++ b/src/Miscellaneous/Flash.js
@@ -1,3 +1,6 @@
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -21,3 +24,4 @@ var Flash = {
}
}
};
+export default Flash;
diff --git a/src/Miscellaneous/Fourchan.js b/src/Miscellaneous/Fourchan.js
index 43e8c198ec..a0311cef4d 100644
--- a/src/Miscellaneous/Fourchan.js
+++ b/src/Miscellaneous/Fourchan.js
@@ -1,3 +1,11 @@
+import Callbacks from "../classes/Callbacks";
+import BoardConfig from "../General/BoardConfig";
+import { d, doc, g } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import ExpandComment from "./ExpandComment";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -111,3 +119,4 @@ var Fourchan = {
return cb();
}
};
+export default Fourchan;
diff --git a/src/Miscellaneous/IDColor.js b/src/Miscellaneous/IDColor.js
index 840d61149c..52716fe132 100644
--- a/src/Miscellaneous/IDColor.js
+++ b/src/Miscellaneous/IDColor.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+import { dict } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -6,7 +11,7 @@
var IDColor = {
init() {
if (!['index', 'thread'].includes(g.VIEW) || !Conf['Color User IDs']) { return; }
- this.ids = $.dict();
+ this.ids = dict();
this.ids['Heaven'] = [0, 0, 0, '#fff'];
return Callbacks.Post.push({
@@ -51,3 +56,4 @@ var IDColor = {
return this.ids[uid] = rgb;
}
};
+export default IDColor;
diff --git a/src/Miscellaneous/IDHighlight.js b/src/Miscellaneous/IDHighlight.js
index 8d83307309..8b8471ec17 100644
--- a/src/Miscellaneous/IDHighlight.js
+++ b/src/Miscellaneous/IDHighlight.js
@@ -1,3 +1,7 @@
+import Callbacks from "../classes/Callbacks";
+import { g } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -32,3 +36,4 @@ var IDHighlight = {
return g.posts.forEach(IDHighlight.set);
}; }
};
+export default IDHighlight;
diff --git a/src/Miscellaneous/IDPostCount.js b/src/Miscellaneous/IDPostCount.js
index caebe8f274..b2182ee05f 100644
--- a/src/Miscellaneous/IDPostCount.js
+++ b/src/Miscellaneous/IDPostCount.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import Get from "../General/Get";
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -31,3 +36,4 @@ var IDPostCount = {
return this.title = `${n} post${n === 1 ? '' : 's'} by this ID`;
}
};
+export default IDPostCount;
diff --git a/src/Miscellaneous/Keybinds.js b/src/Miscellaneous/Keybinds.js
index d2c605bf12..6fa2aee58e 100644
--- a/src/Miscellaneous/Keybinds.js
+++ b/src/Miscellaneous/Keybinds.js
@@ -1,3 +1,29 @@
+import Notice from "../classes/Notice";
+import Config from "../config/Config";
+import Filter from "../Filtering/Filter";
+import ThreadHiding from "../Filtering/ThreadHiding";
+import BoardConfig from "../General/BoardConfig";
+import Get from "../General/Get";
+import Header from "../General/Header";
+import Index from "../General/Index";
+import Settings from "../General/Settings";
+import { Conf, d, g } from "../globals/globals";
+import FappeTyme from "../Images/FappeTyme";
+import Gallery from "../Images/Gallery";
+import ImageExpand from "../Images/ImageExpand";
+import Embedding from "../Linkification/Embedding";
+import ThreadUpdater from "../Monitoring/ThreadUpdater";
+import ThreadWatcher from "../Monitoring/ThreadWatcher";
+import UnreadIndex from "../Monitoring/UnreadIndex";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import QR from "../Posting/QR";
+import QuoteThreading from "../Quotelinks/QuoteThreading";
+import QuoteYou from "../Quotelinks/QuoteYou";
+import CatalogLinks from "./CatalogLinks";
+import ExpandThread from "./ExpandThread";
+import Nav from "./Nav";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -447,3 +473,4 @@ var Keybinds = {
}
}
};
+export default Keybinds;
diff --git a/src/Miscellaneous/ModContact.js b/src/Miscellaneous/ModContact.js
index 3137e59443..b44efd531d 100644
--- a/src/Miscellaneous/ModContact.js
+++ b/src/Miscellaneous/ModContact.js
@@ -1,3 +1,7 @@
+import $ from "../platform/$";
+import Callbacks from "../classes/Callbacks";
+import { g } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -40,3 +44,4 @@ var ModContact = {
qa: {innerHTML: "Moving a thread to /qa/ does not imply mods will read it. If you wish to contact mods, use feedback (https://www.4chan.org/feedback) or IRC (https://www.4chan-x.net/4chan-irc.html)."}
}
};
+export default ModContact;
diff --git a/src/Miscellaneous/Nav.js b/src/Miscellaneous/Nav.js
index f8fd4fff41..cc486898c4 100644
--- a/src/Miscellaneous/Nav.js
+++ b/src/Miscellaneous/Nav.js
@@ -1,3 +1,9 @@
+import Get from "../General/Get";
+import Header from "../General/Header";
+import { g, Conf, d, doc } from "../globals/globals";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -107,3 +113,4 @@ var Nav = {
}
}
};
+export default Nav;
diff --git a/src/Miscellaneous/NormalizeURL.js b/src/Miscellaneous/NormalizeURL.js
index 9b4a2bb9f8..eeaf6f2aec 100644
--- a/src/Miscellaneous/NormalizeURL.js
+++ b/src/Miscellaneous/NormalizeURL.js
@@ -1,3 +1,5 @@
+import { Conf, g } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -25,3 +27,4 @@ const NormalizeURL = {
}
}
};
+export default NormalizeURL;
diff --git a/src/Miscellaneous/PSA.js b/src/Miscellaneous/PSA.js
index 649760dacc..099c99e28a 100644
--- a/src/Miscellaneous/PSA.js
+++ b/src/Miscellaneous/PSA.js
@@ -1,3 +1,8 @@
+import Notice from "../classes/Notice";
+import { g, Conf, doc } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -21,3 +26,4 @@ const PSA = {
}
}
};
+export default PSA;
diff --git a/src/Miscellaneous/PSAHiding.js b/src/Miscellaneous/PSAHiding.js
index e1a6066c0f..7a0bacceb9 100644
--- a/src/Miscellaneous/PSAHiding.js
+++ b/src/Miscellaneous/PSAHiding.js
@@ -1,3 +1,6 @@
+import Header from "../General/Header";
+import { Conf, doc, g } from "../globals/globals";
+import $ from "../platform/$";
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -81,7 +84,7 @@ var PSAHiding = {
} else {
$.add(psa, [...Array.from(content.childNodes)]);
}
- // TODO check if hr exists
- return PSAHiding.hr.hidden = psa.hidden;
+ if (PSAHiding.hr) PSAHiding.hr.hidden = psa.hidden;
}
};
+export default PSAHiding;
diff --git a/src/Miscellaneous/PassMessage.js b/src/Miscellaneous/PassMessage.js
index dd699a5ce4..8deae7ffbd 100644
--- a/src/Miscellaneous/PassMessage.js
+++ b/src/Miscellaneous/PassMessage.js
@@ -1,9 +1,11 @@
+import { Conf, d } from "../globals/globals";
+import $ from "../platform/$";
+import PassMessagePage from './PassMessage/PassMessageHtml';
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-import PassMessagePage from './PassMessage/PassMessage.html';
const PassMessage = {
init() {
@@ -11,7 +13,7 @@ const PassMessage = {
const msg = $.el('div',
{className: 'box-outer top-box'}
,
- { innerHTML: PassMessagePage });
+ PassMessagePage);
msg.style.cssText = 'padding-bottom: 0;';
const close = $('a', msg);
$.on(close, 'click', function() {
@@ -28,3 +30,4 @@ const PassMessage = {
});
}
};
+export default PassMessage;
diff --git a/src/Miscellaneous/PassMessage/PassMessage.html b/src/Miscellaneous/PassMessage/PassMessage.html
deleted file mode 100644
index 2c1b02b620..0000000000
--- a/src/Miscellaneous/PassMessage/PassMessage.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
+
-
-
diff --git a/src/Miscellaneous/PassMessage/PassMessageHtml.tsx b/src/Miscellaneous/PassMessage/PassMessageHtml.tsx
new file mode 100644
index 0000000000..596bd6de62
--- /dev/null
+++ b/src/Miscellaneous/PassMessage/PassMessageHtml.tsx
@@ -0,0 +1,15 @@
+import h from '../../globals/jsx';
+import meta from '../../../package.json';
+
+const passMessagePage =
- Check the 4chan X wiki for alternative solutions.
-
-
+
+
;
+export default passMessagePage;
diff --git a/src/Miscellaneous/PostJumper.js b/src/Miscellaneous/PostJumper.js
index 6f1ce1c195..1bed985011 100644
--- a/src/Miscellaneous/PostJumper.js
+++ b/src/Miscellaneous/PostJumper.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import { Conf, g, E } from "../globals/globals";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -87,3 +92,4 @@ var PostJumper = {
return window.scrollBy(0, destPos-prevPos);
}
};
+export default PostJumper;
diff --git a/src/Miscellaneous/RelativeDates.js b/src/Miscellaneous/RelativeDates.js
index fa4db38b73..7f8141be91 100644
--- a/src/Miscellaneous/RelativeDates.js
+++ b/src/Miscellaneous/RelativeDates.js
@@ -1,3 +1,10 @@
+import Callbacks from "../classes/Callbacks";
+import Post from "../classes/Post";
+import Index from "../General/Index";
+import { g, Conf, d, doc } from "../globals/globals";
+import $ from "../platform/$";
+import { DAY, HOUR, MINUTE, SECOND } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -5,7 +12,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
var RelativeDates = {
- INTERVAL: $.MINUTE / 2,
+ INTERVAL: 30000,
init() {
if (
@@ -45,32 +52,32 @@ var RelativeDates = {
relative(diff, now, date, abbrev) {
let number;
let unit = (() => {
- if ((number = (diff / $.DAY)) >= 1) {
+ if ((number = (diff / DAY)) >= 1) {
const years = now.getFullYear() - date.getFullYear();
- let months = now.getMonth() - date.getMonth();
+ let months = now.getMonth() - date.getMonth();
const days = now.getDate() - date.getDate();
- if (years > 1) {
- number = years - ((months < 0) || ((months === 0) && (days < 0)));
- return 'year';
- } else if ((years === 1) && ((months > 0) || ((months === 0) && (days >= 0)))) {
- number = years;
- return 'year';
+ if (years > 1) {
+ number = years - ((months < 0) || ((months === 0) && (days < 0)));
+ return 'year';
+ } else if ((years === 1) && ((months > 0) || ((months === 0) && (days >= 0)))) {
+ number = years;
+ return 'year';
} else if ((months = months + (12*years)) > 1) {
- number = months - (days < 0);
- return 'month';
- } else if ((months === 1) && (days >= 0)) {
- number = months;
- return 'month';
- } else {
- return 'day';
- }
- } else if ((number = (diff / $.HOUR)) >= 1) {
+ number = months - (days < 0);
+ return 'month';
+ } else if ((months === 1) && (days >= 0)) {
+ number = months;
+ return 'month';
+ } else {
+ return 'day';
+ }
+ } else if ((number = (diff / HOUR)) >= 1) {
return 'hour';
- } else if ((number = (diff / $.MINUTE)) >= 1) {
+ } else if ((number = (diff / MINUTE)) >= 1) {
return 'minute';
} else {
// prevent "-1 seconds ago"
- number = Math.max(0, diff) / $.SECOND;
+ number = Math.max(0, diff) / SECOND;
return 'second';
}
})();
@@ -145,14 +152,14 @@ var RelativeDates = {
},
setOwnTimeout(diff, data) {
- const delay = diff < $.MINUTE ?
- $.SECOND - ((diff + ($.SECOND / 2)) % $.SECOND)
- : diff < $.HOUR ?
- $.MINUTE - ((diff + ($.MINUTE / 2)) % $.MINUTE)
- : diff < $.DAY ?
- $.HOUR - ((diff + ($.HOUR / 2)) % $.HOUR)
+ const delay = diff < MINUTE ?
+ SECOND - ((diff + (SECOND / 2)) % SECOND)
+ : diff < HOUR ?
+ MINUTE - ((diff + (MINUTE / 2)) % MINUTE)
+ : diff < DAY ?
+ HOUR - ((diff + (HOUR / 2)) % HOUR)
:
- $.DAY - ((diff + ($.DAY / 2)) % $.DAY);
+ DAY - ((diff + (DAY / 2)) % DAY);
return setTimeout(RelativeDates.markStale, delay, data);
},
@@ -163,3 +170,4 @@ var RelativeDates = {
return RelativeDates.stale.push(data);
}
};
+export default RelativeDates;
diff --git a/src/Miscellaneous/RemoveSpoilers.js b/src/Miscellaneous/RemoveSpoilers.js
index dd405358bf..ee44b5b67e 100644
--- a/src/Miscellaneous/RemoveSpoilers.js
+++ b/src/Miscellaneous/RemoveSpoilers.js
@@ -1,3 +1,8 @@
+import Callbacks from "../classes/Callbacks";
+import { Conf, doc, g } from "../globals/globals";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -35,3 +40,4 @@ var RemoveSpoilers = {
}
}
};
+export default RemoveSpoilers;
diff --git a/src/Miscellaneous/Report.js b/src/Miscellaneous/Report.js
index 866ce158a8..dbecd09f33 100644
--- a/src/Miscellaneous/Report.js
+++ b/src/Miscellaneous/Report.js
@@ -1,9 +1,15 @@
+import Redirect from "../Archive/Redirect";
+import $ from "../platform/$";
+import ReportPage from './Report/ArchiveReport.html';
+import CSS from "../css/CSS";
+import Captcha from "../Posting/Captcha";
+import { Conf, d, g } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-import ReportPage from './ArchiveReport.html';
var Report = {
init() {
@@ -135,3 +141,4 @@ var Report = {
}
}
};
+export default Report;
diff --git a/src/Miscellaneous/ThreadLinks.js b/src/Miscellaneous/ThreadLinks.js
index 231935ff72..8d6a3aafdf 100644
--- a/src/Miscellaneous/ThreadLinks.js
+++ b/src/Miscellaneous/ThreadLinks.js
@@ -1,3 +1,6 @@
+import Callbacks from "../classes/Callbacks";
+import { g, Conf } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -30,3 +33,4 @@ var ThreadLinks = {
return link.target = '_blank';
}
};
+export default ThreadLinks;
diff --git a/src/Miscellaneous/Time.js b/src/Miscellaneous/Time.js
index ad888ce931..2348113de1 100644
--- a/src/Miscellaneous/Time.js
+++ b/src/Miscellaneous/Time.js
@@ -1,3 +1,7 @@
+import $ from "../platform/$";
+import Callbacks from "../classes/Callbacks";
+import { g, Conf } from "../globals/globals";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -96,3 +100,4 @@ var Time = {
'%'() { return '%'; }
}
};
+export default Time;
diff --git a/src/Miscellaneous/Tinyboard.js b/src/Miscellaneous/Tinyboard.js
index 23d026a88a..ae6e48de3a 100644
--- a/src/Miscellaneous/Tinyboard.js
+++ b/src/Miscellaneous/Tinyboard.js
@@ -1,3 +1,7 @@
+import { g } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -35,3 +39,4 @@ const Tinyboard = {
}
}
};
+export default Tinyboard;
diff --git a/src/Monitoring/Favicon.js b/src/Monitoring/Favicon.js
index 6f3bff31c5..61d1332241 100644
--- a/src/Monitoring/Favicon.js
+++ b/src/Monitoring/Favicon.js
@@ -1,9 +1,3 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
import ferongr_unreadDead from './Favicon/ferongr.unreadDead.png';
import ferongr_unreadDeadY from './Favicon/ferongr.unreadDeadY.png';
import ferongr_unreadSFW from './Favicon/ferongr.unreadSFW.png';
@@ -42,7 +36,15 @@ import Metro_unreadNSFW from './Favicon/Metro.unreadNSFW.png';
import Metro_unreadNSFWY from './Favicon/Metro.unreadNSFWY.png';
import dead from './Favicon/dead.gif';
import empty from './Favicon/empty.gif';
+import $ from '../platform/$';
+import { Conf, d } from '../globals/globals';
+/*
+ * decaffeinate suggestions:
+ * DS101: Remove unnecessary use of Array.from
+ * DS102: Remove unnecessary code created because of implicit returns
+ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
+ */
var Favicon = {
init() {
@@ -145,7 +147,7 @@ var Favicon = {
SFW: '//s.4cdn.org/image/favicon-ws.ico',
NSFW: '//s.4cdn.org/image/favicon.ico',
- // TODO
- dead: 'data:image/gif;base64,<%= readBase64("dead.gif") %>',
- logo: 'data:image/png;base64,<%= readBase64("/src/meta/icon128.png") %>'
+ dead: `data:image/gif;base64,${dead}`,
+ logo: `data:image/png;base64,${empty}`,
};
+export default Favicon;
diff --git a/src/Monitoring/MarkNewIPs.js b/src/Monitoring/MarkNewIPs.js
index 3bc7462157..b11c3b9e6d 100644
--- a/src/Monitoring/MarkNewIPs.js
+++ b/src/Monitoring/MarkNewIPs.js
@@ -1,3 +1,7 @@
+import Callbacks from "../classes/Callbacks";
+import { g, Conf } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -61,3 +65,4 @@ var MarkNewIPs = {
return $.addClass(post.nodes.root, 'old-ip');
}
};
+export default MarkNewIPs;
diff --git a/src/Monitoring/ReplyPruning.js b/src/Monitoring/ReplyPruning.js
index d61e941902..d59ede035c 100644
--- a/src/Monitoring/ReplyPruning.js
+++ b/src/Monitoring/ReplyPruning.js
@@ -1,3 +1,10 @@
+import Callbacks from "../classes/Callbacks";
+import Header from "../General/Header";
+import UI from "../General/UI";
+import { g, Conf, E, d } from "../globals/globals";
+import $ from "../platform/$";
+import QuoteThreading from "../Quotelinks/QuoteThreading";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -167,3 +174,4 @@ var ReplyPruning = {
}
}
};
+export default ReplyPruning;
diff --git a/src/Monitoring/ThreadStats.js b/src/Monitoring/ThreadStats.js
index f6b40a07c4..6faa307468 100644
--- a/src/Monitoring/ThreadStats.js
+++ b/src/Monitoring/ThreadStats.js
@@ -1,3 +1,10 @@
+import Callbacks from "../classes/Callbacks";
+import Header from "../General/Header";
+import UI from "../General/UI";
+import { g, Conf, E, doc, d } from "../globals/globals";
+import $ from "../platform/$";
+import { MINUTE, SECOND } from "../platform/helpers";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -110,7 +117,7 @@ var ThreadStats = {
$.addClass(ThreadStats.pageCountEl, 'warning');
return;
}
- ThreadStats.timeout = setTimeout(ThreadStats.fetchPage, 2 * $.MINUTE);
+ ThreadStats.timeout = setTimeout(ThreadStats.fetchPage, 2 * MINUTE);
return $.whenModified(
g.SITE.urls.threadsListJSON(ThreadStats.thread),
'ThreadStats',
@@ -144,7 +151,7 @@ var ThreadStats = {
if (thread.no === ThreadStats.thread.ID) {
ThreadStats.pageCountEl.textContent = pageNum + 1;
ThreadStats.pageCountEl.classList.toggle('warning', (i >= (nThreads - this.response[0].threads.length)));
- ThreadStats.lastPageUpdate = new Date(thread.last_modified * $.SECOND);
+ ThreadStats.lastPageUpdate = new Date(thread.last_modified * SECOND);
ThreadStats.retry();
return;
}
@@ -167,6 +174,7 @@ var ThreadStats = {
(ThreadStats.thread.posts.get(ThreadStats.thread.lastPost).info.date <= ThreadStats.lastPageUpdate)
) { return; }
clearTimeout(ThreadStats.timeout);
- return ThreadStats.timeout = setTimeout(ThreadStats.fetchPage, 5 * $.SECOND);
+ return ThreadStats.timeout = setTimeout(ThreadStats.fetchPage, 5 * SECOND);
}
};
+export default ThreadStats;
diff --git a/src/Monitoring/ThreadUpdater.js b/src/Monitoring/ThreadUpdater.js
index f0e0f2c633..8d5e457c7c 100644
--- a/src/Monitoring/ThreadUpdater.js
+++ b/src/Monitoring/ThreadUpdater.js
@@ -1,3 +1,18 @@
+import Beep from './ThreadUpdater/beep.wav';
+import $ from "../platform/$";
+import Callbacks from '../classes/Callbacks';
+import Notice from '../classes/Notice';
+import Post from '../classes/Post';
+import Main from '../main/Main';
+import Config from '../config/Config';
+import Settings from '../General/Settings';
+import QuoteThreading from '../Quotelinks/QuoteThreading';
+import Unread from './Unread';
+import Header from '../General/Header';
+import { g, Conf, d, doc } from '../globals/globals';
+import UI from '../General/UI';
+import { MINUTE, SECOND } from '../platform/helpers';
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -5,7 +20,6 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-import Beep from './ThreadUpdater/beep.wav';
var ThreadUpdater = {
init() {
@@ -112,7 +126,7 @@ var ThreadUpdater = {
http://freesound.org/people/pierrecartoons1979/sounds/90112/
cc-by-nc-3.0
*/
- beep: 'data:audio/wav;base64,<%= readBase64("beep.wav") %>',
+ beep: `data:audio/wav;base64,${Beep}`,
playBeep() {
const {audio} = ThreadUpdater;
@@ -231,7 +245,7 @@ var ThreadUpdater = {
// Fetching your own posts after posting
if (ThreadUpdater.postID && (ThreadUpdater.checkPostCount < 5)) {
ThreadUpdater.set('timer', '...', 'loading');
- ThreadUpdater.timeoutID = setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND);
+ ThreadUpdater.timeoutID = setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * SECOND);
return;
}
@@ -298,7 +312,7 @@ var ThreadUpdater = {
g.SITE.urls.threadJSON({boardID: ThreadUpdater.thread.board.ID, threadID: ThreadUpdater.thread.ID}),
'ThreadUpdater',
ThreadUpdater.cb.load,
- {timeout: $.MINUTE}
+ { timeout: MINUTE }
);
},
@@ -330,7 +344,7 @@ var ThreadUpdater = {
// XXX Reject updates that falsely delete the last post.
if ((postObjects[postObjects.length-1].no < lastPost) &&
- ((new Date(req.getResponseHeader('Last-Modified')) - thread.posts.get(lastPost).info.date) < (30 * $.SECOND))) { return; }
+ ((new Date(req.getResponseHeader('Last-Modified')) - thread.posts.get(lastPost).info.date) < (30 * SECOND))) { return; }
g.SITE.Build.spoilerRange[board] = OP.custom_spoiler;
thread.setStatus('Archived', !!OP.archived);
@@ -448,3 +462,4 @@ var ThreadUpdater = {
);
}
};
+export default ThreadUpdater;
diff --git a/src/Monitoring/ThreadWatcher.js b/src/Monitoring/ThreadWatcher.js
index cd199aae72..3a60bba36e 100644
--- a/src/Monitoring/ThreadWatcher.js
+++ b/src/Monitoring/ThreadWatcher.js
@@ -1,3 +1,26 @@
+import ThreadWatcherPage from './ThreadWatcher/ThreadWatcher.html';
+import $ from "../platform/$";
+import Board from '../classes/Board';
+import Callbacks from '../classes/Callbacks';
+import DataBoard from '../classes/DataBoard';
+import Thread from '../classes/Thread';
+import Filter from '../Filtering/Filter';
+import Main from '../main/Main';
+import $$ from '../platform/$$';
+import Config from '../config/Config';
+import CrossOrigin from '../platform/CrossOrigin';
+import PostRedirect from '../Posting/PostRedirect';
+import QuoteYou from '../Quotelinks/QuoteYou';
+import Unread from './Unread';
+import UnreadIndex from './UnreadIndex';
+import Header from '../General/Header';
+import Index from '../General/Index';
+import { Conf, d, doc, g } from '../globals/globals';
+import Menu from '../Menu/Menu';
+import UI from '../General/UI';
+import Get from '../General/Get';
+import { dict, HOUR, MINUTE } from '../platform/helpers';
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -6,7 +29,6 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-import ThreadWatcherPage from './ThreadWatcher/ThreadWatcher.html';
var ThreadWatcher = {
init() {
@@ -275,7 +297,7 @@ var ThreadWatcher = {
url,
'ThreadWatcher',
onloadend,
- {timeout: $.MINUTE, ajax}
+ { timeout: MINUTE, ajax }
);
return ThreadWatcher.requests.push(req);
},
@@ -299,7 +321,7 @@ var ThreadWatcher = {
},
initLastModified() {
- const lm = ($.lastModified['ThreadWatcher'] || ($.lastModified['ThreadWatcher'] = $.dict()));
+ const lm = ($.lastModified['ThreadWatcher'] || ($.lastModified['ThreadWatcher'] = dict()));
for (var siteID in ThreadWatcher.dbLM.data) {
var boards = ThreadWatcher.dbLM.data[siteID];
for (var boardID in boards.boards) {
@@ -321,7 +343,7 @@ var ThreadWatcher = {
clearTimeout(ThreadWatcher.timeout);
if (!Conf['Auto Update Thread Watcher']) { return; }
const {db} = ThreadWatcher;
- const interval = Conf['Show Page'] || (ThreadWatcher.unreadEnabled && Conf['Show Unread Count']) ? 5 * $.MINUTE : 2 * $.HOUR;
+ const interval = Conf['Show Page'] || (ThreadWatcher.unreadEnabled && Conf['Show Unread Count']) ? 5 * MINUTE : 2 * HOUR;
const now = Date.now();
if ((now - interval >= ((middle = db.data.lastChecked || 0)) || middle > now) && !d.hidden && !!d.hasFocus()) {
ThreadWatcher.fetchAllStatus(interval);
@@ -355,7 +377,7 @@ var ThreadWatcher = {
let middle1;
const {db} = ThreadWatcher;
const now = Date.now();
- const deep = !(now - (2 * $.HOUR) < ((middle1 = db.data.lastChecked2 || 0)) && middle1 <= now);
+ const deep = !(now - (2 * HOUR) < ((middle1 = db.data.lastChecked2 || 0)) && middle1 <= now);
const boards = ThreadWatcher.getAll(true);
for (var board of boards) {
ThreadWatcher.fetchBoard(board, deep);
@@ -395,7 +417,7 @@ var ThreadWatcher = {
const {siteID, boardID} = board[0];
const lmDate = this.getResponseHeader('Last-Modified');
ThreadWatcher.dbLM.extend({siteID, boardID, val: $.item(url, lmDate)});
- const threads = $.dict();
+ const threads = dict();
let pageLength = 0;
let nThreads = 0;
let oldest = null;
@@ -612,7 +634,7 @@ var ThreadWatcher = {
},
setPrefixes(threads) {
- const prefixes = $.dict();
+ const prefixes = dict();
for (var {siteID} of threads) {
if (siteID in prefixes) { continue; }
var len = 0;
@@ -751,7 +773,7 @@ var ThreadWatcher = {
},
addRaw(boardID, threadID, data, cb) {
- const oldData = ThreadWatcher.db.get({boardID, threadID, defaultValue: $.dict()});
+ const oldData = ThreadWatcher.db.get({ boardID, threadID, defaultValue: dict() });
delete oldData.last;
delete oldData.modified;
$.extend(oldData, data);
@@ -896,3 +918,4 @@ var ThreadWatcher = {
}
}
};
+export default ThreadWatcher;
diff --git a/src/Monitoring/Unread.js b/src/Monitoring/Unread.js
index 83fa6ea83d..bd580336da 100644
--- a/src/Monitoring/Unread.js
+++ b/src/Monitoring/Unread.js
@@ -1,3 +1,15 @@
+import Callbacks from "../classes/Callbacks";
+import DataBoard from "../classes/DataBoard";
+import RandomAccessList from "../classes/RandomAccessList";
+import Get from "../General/Get";
+import Header from "../General/Header";
+import { g, Conf, d } from "../globals/globals";
+import $ from "../platform/$";
+import { debounce, SECOND } from "../platform/helpers";
+import QuoteYou from "../Quotelinks/QuoteYou";
+import Favicon from "./Favicon";
+import ThreadWatcher from "./ThreadWatcher";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -179,7 +191,7 @@ var Unread = {
return window.focus();
};
return notif.onshow = () => setTimeout(() => notif.close()
- , 7 * $.SECOND);
+ , 7 * SECOND);
},
onUpdate() {
@@ -200,7 +212,7 @@ var Unread = {
return Unread.update();
},
- read: $.debounce(100, function(e) {
+ read: debounce(100, function(e) {
// Update the lastReadPost when hidden posts are added to the thread.
if (!Unread.posts.size && (Unread.readCount !== Unread.thread.posts.keys.length)) {
Unread.saveLastReadPost();
@@ -232,7 +244,7 @@ var Unread = {
}
},
- saveLastReadPost: $.debounce(2 * $.SECOND, function() {
+ saveLastReadPost: debounce(2 * SECOND, function() {
let ID;
$.forceSync('Remember Last Read Post');
if (!Conf['Remember Last Read Post'] || !Unread.db) { return; }
@@ -300,7 +312,7 @@ var Unread = {
}
},
- saveThreadWatcherCount: $.debounce(2 * $.SECOND, function() {
+ saveThreadWatcherCount: debounce(2 * SECOND, function() {
$.forceSync('Remember Last Read Post');
if (Conf['Remember Last Read Post'] && (!Unread.thread.isDead || Unread.thread.isArchived)) {
let posts;
@@ -328,3 +340,4 @@ var Unread = {
}
})
};
+export default Unread;
diff --git a/src/Monitoring/UnreadIndex.js b/src/Monitoring/UnreadIndex.js
index b58ed27d29..4db9b100b0 100644
--- a/src/Monitoring/UnreadIndex.js
+++ b/src/Monitoring/UnreadIndex.js
@@ -1,3 +1,15 @@
+import Callbacks from "../classes/Callbacks";
+import DataBoard from "../classes/DataBoard";
+import Get from "../General/Get";
+import Header from "../General/Header";
+import Index from "../General/Index";
+import { g, Conf, d } from "../globals/globals";
+import ExpandThread from "../Miscellaneous/ExpandThread";
+import $ from "../platform/$";
+import { dict } from "../platform/helpers";
+import QuoteYou from "../Quotelinks/QuoteYou";
+import ThreadWatcher from "./ThreadWatcher";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -5,9 +17,9 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
var UnreadIndex = {
- lastReadPost: $.dict(),
- hr: $.dict(),
- markReadLink: $.dict(),
+ lastReadPost: dict(),
+ hr: dict(),
+ markReadLink: dict(),
init() {
if ((g.VIEW !== 'index') || !Conf['Remember Last Read Post'] || !Conf['Unread Line in Index']) { return; }
@@ -143,3 +155,4 @@ var UnreadIndex = {
);
}
};
+export default UnreadIndex;
diff --git a/src/Posting/Captcha.cache.js b/src/Posting/Captcha.cache.js
deleted file mode 100644
index 393f69ba18..0000000000
--- a/src/Posting/Captcha.cache.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-Captcha.cache = {
- init() {
- $.on(d, 'SaveCaptcha', e => {
- return this.saveAPI(e.detail);
- });
- return $.on(d, 'NoCaptcha', e => {
- return this.noCaptcha(e.detail);
- });
- },
-
- captchas: [],
-
- getCount() {
- return this.captchas.length;
- },
-
- neededRaw() {
- return !(
- this.haveCookie() || this.captchas.length || QR.req || this.submitCB
- ) && (
- (QR.posts.length > 1) || Conf['Auto-load captcha'] || !QR.posts[0].isOnlyQuotes() || QR.posts[0].file
- );
- },
-
- needed() {
- return this.neededRaw() && $.event('LoadCaptcha');
- },
-
- prerequest() {
- if (!Conf['Prerequest Captcha']) { return; }
- // Post count temporarily off by 1 when called from QR.post.rm, QR.close, or QR.submit
- return $.queueTask(() => {
- if (
- !this.prerequested &&
- this.neededRaw() &&
- !$.event('LoadCaptcha') &&
- !QR.captcha.occupied() &&
- (QR.cooldown.seconds <= 60) &&
- (QR.selected === QR.posts[QR.posts.length - 1]) &&
- !QR.selected.isOnlyQuotes()
- ) {
- const isReply = (QR.selected.thread !== 'new');
- if (!$.event('RequestCaptcha', {isReply})) {
- this.prerequested = true;
- this.submitCB = captcha => {
- if (captcha) { return this.save(captcha); }
- };
- return this.updateCount();
- }
- }
- });
- },
-
- haveCookie() {
- return /\b_ct=/.test(d.cookie) && (QR.posts[0].thread !== 'new');
- },
-
- getOne() {
- let captcha;
- delete this.prerequested;
- this.clear();
- if (captcha = this.captchas.shift()) {
- this.count();
- return captcha;
- } else {
- return null;
- }
- },
-
- request(isReply) {
- if (!this.submitCB) {
- if ($.event('RequestCaptcha', {isReply})) { return; }
- }
- return cb => {
- this.submitCB = cb;
- return this.updateCount();
- };
- },
-
- abort() {
- if (this.submitCB) {
- delete this.submitCB;
- $.event('AbortCaptcha');
- return this.updateCount();
- }
- },
-
- saveAPI(captcha) {
- let cb;
- if (cb = this.submitCB) {
- delete this.submitCB;
- cb(captcha);
- return this.updateCount();
- } else {
- return this.save(captcha);
- }
- },
-
- noCaptcha(detail) {
- let cb;
- if (cb = this.submitCB) {
- if (!this.haveCookie() || detail?.error) {
- QR.error(detail?.error || 'Failed to retrieve captcha.');
- QR.captcha.setup(d.activeElement === QR.nodes.status);
- }
- delete this.submitCB;
- cb();
- return this.updateCount();
- }
- },
-
- save(captcha) {
- let cb;
- if (cb = this.submitCB) {
- this.abort();
- cb(captcha);
- return;
- }
- this.captchas.push(captcha);
- this.captchas.sort((a, b) => a.timeout - b.timeout);
- return this.count();
- },
-
- clear() {
- if (this.captchas.length) {
- let i;
- const now = Date.now();
- for (i = 0; i < this.captchas.length; i++) {
- var captcha = this.captchas[i];
- if (captcha.timeout > now) { break; }
- }
- if (i) {
- this.captchas = this.captchas.slice(i);
- return this.count();
- }
- }
- },
-
- count() {
- clearTimeout(this.timer);
- if (this.captchas.length) {
- this.timer = setTimeout(this.clear.bind(this), this.captchas[0].timeout - Date.now());
- }
- return this.updateCount();
- },
-
- updateCount() {
- return $.event('CaptchaCount', this.captchas.length);
- }
-};
diff --git a/src/Posting/Captcha.js b/src/Posting/Captcha.js
index 50b0d7038a..2531134e88 100644
--- a/src/Posting/Captcha.js
+++ b/src/Posting/Captcha.js
@@ -1 +1,422 @@
-Captcha = {};
+import $ from "../platform/$";
+import CaptchaReplace from "./Captcha.replace";
+import CaptchaT from "./Captcha.t";
+import meta from '../../package.json';
+import Main from "../main/Main";
+import Keybinds from "../Miscellaneous/Keybinds";
+import $$ from "../platform/$$";
+import QR from "./QR";
+import { Conf, d } from "../globals/globals";
+import { MINUTE, SECOND } from "../platform/helpers";
+
+const Captcha = {
+ Cache: {
+ init() {
+ $.on(d, 'SaveCaptcha', e => {
+ return this.saveAPI(e.detail);
+ });
+ return $.on(d, 'NoCaptcha', e => {
+ return this.noCaptcha(e.detail);
+ });
+ },
+
+ captchas: [],
+
+ getCount() {
+ return this.captchas.length;
+ },
+
+ neededRaw() {
+ return !(
+ this.haveCookie() || this.captchas.length || QR.req || this.submitCB
+ ) && (
+ (QR.posts.length > 1) || Conf['Auto-load captcha'] || !QR.posts[0].isOnlyQuotes() || QR.posts[0].file
+ );
+ },
+
+ needed() {
+ return this.neededRaw() && $.event('LoadCaptcha');
+ },
+
+ prerequest() {
+ if (!Conf['Prerequest Captcha']) { return; }
+ // Post count temporarily off by 1 when called from QR.post.rm, QR.close, or QR.submit
+ return $.queueTask(() => {
+ if (
+ !this.prerequested &&
+ this.neededRaw() &&
+ !$.event('LoadCaptcha') &&
+ !QR.captcha.occupied() &&
+ (QR.cooldown.seconds <= 60) &&
+ (QR.selected === QR.posts[QR.posts.length - 1]) &&
+ !QR.selected.isOnlyQuotes()
+ ) {
+ const isReply = (QR.selected.thread !== 'new');
+ if (!$.event('RequestCaptcha', { isReply })) {
+ this.prerequested = true;
+ this.submitCB = captcha => {
+ if (captcha) { return this.save(captcha); }
+ };
+ return this.updateCount();
+ }
+ }
+ });
+ },
+
+ haveCookie() {
+ return /\b_ct=/.test(d.cookie) && (QR.posts[0].thread !== 'new');
+ },
+
+ getOne() {
+ let captcha;
+ delete this.prerequested;
+ this.clear();
+ if (captcha = this.captchas.shift()) {
+ this.count();
+ return captcha;
+ } else {
+ return null;
+ }
+ },
+
+ request(isReply) {
+ if (!this.submitCB) {
+ if ($.event('RequestCaptcha', { isReply })) { return; }
+ }
+ return cb => {
+ this.submitCB = cb;
+ return this.updateCount();
+ };
+ },
+
+ abort() {
+ if (this.submitCB) {
+ delete this.submitCB;
+ $.event('AbortCaptcha');
+ return this.updateCount();
+ }
+ },
+
+ saveAPI(captcha) {
+ let cb;
+ if (cb = this.submitCB) {
+ delete this.submitCB;
+ cb(captcha);
+ return this.updateCount();
+ } else {
+ return this.save(captcha);
+ }
+ },
+
+ noCaptcha(detail) {
+ let cb;
+ if (cb = this.submitCB) {
+ if (!this.haveCookie() || detail?.error) {
+ QR.error(detail?.error || 'Failed to retrieve captcha.');
+ QR.captcha.setup(d.activeElement === QR.nodes.status);
+ }
+ delete this.submitCB;
+ cb();
+ return this.updateCount();
+ }
+ },
+
+ save(captcha) {
+ let cb;
+ if (cb = this.submitCB) {
+ this.abort();
+ cb(captcha);
+ return;
+ }
+ this.captchas.push(captcha);
+ this.captchas.sort((a, b) => a.timeout - b.timeout);
+ return this.count();
+ },
+
+ clear() {
+ if (this.captchas.length) {
+ let i;
+ const now = Date.now();
+ for (i = 0; i < this.captchas.length; i++) {
+ var captcha = this.captchas[i];
+ if (captcha.timeout > now) { break; }
+ }
+ if (i) {
+ this.captchas = this.captchas.slice(i);
+ return this.count();
+ }
+ }
+ },
+
+ count() {
+ clearTimeout(this.timer);
+ if (this.captchas.length) {
+ this.timer = setTimeout(this.clear.bind(this), this.captchas[0].timeout - Date.now());
+ }
+ return this.updateCount();
+ },
+
+ updateCount() {
+ return $.event('CaptchaCount', this.captchas.length);
+ }
+ }, Replace: CaptchaReplace, t: CaptchaT, v2: {
+ lifetime: 2 * MINUTE,
+
+ init() {
+ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; }
+ if (!(this.isEnabled = !!$('#g-recaptcha, #captcha-forced-noscript') || !$.id('postForm'))) { return; }
+
+ if (this.noscript = Conf['Force Noscript Captcha'] || !Main.jsEnabled) {
+ $.addClass(QR.nodes.el, 'noscript-captcha');
+ }
+
+ Captcha.cache.init();
+ $.on(d, 'CaptchaCount', this.count.bind(this));
+
+ const root = $.el('div', { className: 'captcha-root' });
+ $.extend(root, {
+ innerHTML:
+ ''
+ }
+ );
+ const counter = $('.captcha-counter > a', root);
+ this.nodes = { root, counter };
+ this.count();
+ $.addClass(QR.nodes.el, 'has-captcha', 'captcha-v2');
+ $.after(QR.nodes.com.parentNode, root);
+
+ $.on(counter, 'click', this.toggle.bind(this));
+ $.on(counter, 'keydown', e => {
+ if (Keybinds.keyCode(e) !== 'Space') { return; }
+ this.toggle();
+ e.preventDefault();
+ return e.stopPropagation();
+ });
+ return $.on(window, 'captcha:success', () => {
+ // XXX Greasemonkey 1.x workaround to gain access to GM_* functions.
+ return $.queueTask(() => this.save(false));
+ });
+ },
+
+ timeouts: {},
+ prevNeeded: 0,
+
+ noscriptURL() {
+ let lang;
+ let url = `https://www.google.com/recaptcha/api/fallback?k=${meta.recaptchaKey}`;
+ if (lang = Conf['captchaLanguage'].trim()) {
+ url += `&hl=${encodeURIComponent(lang)}`;
+ }
+ return url;
+ },
+
+ moreNeeded() {
+ // Post count temporarily off by 1 when called from QR.post.rm, QR.close, or QR.submit
+ return $.queueTask(() => {
+ const needed = Captcha.cache.needed();
+ if (needed && !this.prevNeeded) {
+ this.setup(QR.cooldown.auto && (d.activeElement === QR.nodes.status));
+ }
+ return this.prevNeeded = needed;
+ });
+ },
+
+ toggle() {
+ if (this.nodes.container && !this.timeouts.destroy) {
+ return this.destroy();
+ } else {
+ return this.setup(true, true);
+ }
+ },
+
+ setup(focus, force) {
+ if (!this.isEnabled || (!Captcha.cache.needed() && !force)) { return; }
+
+ if (focus) {
+ $.addClass(QR.nodes.el, 'focus');
+ this.nodes.counter.focus();
+ }
+
+ if (this.timeouts.destroy) {
+ clearTimeout(this.timeouts.destroy);
+ delete this.timeouts.destroy;
+ return this.reload();
+ }
+
+ if (this.nodes.container) {
+ // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1226835
+ $.queueTask(() => {
+ let iframe;
+ if (this.nodes.container && (d.activeElement === this.nodes.counter) && (iframe = $('iframe[src^="https://www.google.com/recaptcha/"]', this.nodes.container))) {
+ iframe.focus();
+ return QR.focus();
+ }
+ }); // Event handler not fired in Firefox
+ return;
+ }
+
+ this.nodes.container = $.el('div', { className: 'captcha-container' });
+ $.prepend(this.nodes.root, this.nodes.container);
+ new MutationObserver(this.afterSetup.bind(this)).observe(this.nodes.container, {
+ childList: true,
+ subtree: true
+ }
+ );
+
+ if (this.noscript) {
+ return this.setupNoscript();
+ } else {
+ return this.setupJS();
+ }
+ },
+
+ setupNoscript() {
+ const iframe = $.el('iframe', {
+ id: 'qr-captcha-iframe',
+ scrolling: 'no',
+ src: this.noscriptURL()
+ }
+ );
+ const div = $.el('div');
+ const textarea = $.el('textarea');
+ $.add(div, textarea);
+ return $.add(this.nodes.container, [iframe, div]);
+ },
+
+ setupJS() {
+ return $.global(function () {
+ const render = function () {
+ const { classList } = document.documentElement;
+ const container = document.querySelector('#qr .captcha-container');
+ return container.dataset.widgetID = window.grecaptcha.render(container, {
+ sitekey: meta.recaptchaKey,
+ theme: classList.contains('tomorrow') || classList.contains('spooky') || classList.contains('dark-captcha') ? 'dark' : 'light',
+ callback(response) {
+ return window.dispatchEvent(new CustomEvent('captcha:success', { detail: response }));
+ }
+ }
+ );
+ };
+ if (window.grecaptcha) {
+ return render();
+ } else {
+ const cbNative = window.onRecaptchaLoaded;
+ window.onRecaptchaLoaded = function () {
+ render();
+ return cbNative();
+ };
+ if (!document.head.querySelector('script[src^="https://www.google.com/recaptcha/api.js"]')) {
+ const script = document.createElement('script');
+ script.src = 'https://www.google.com/recaptcha/api.js?onload=onRecaptchaLoaded&render=explicit';
+ return document.head.appendChild(script);
+ }
+ }
+ });
+ },
+
+ afterSetup(mutations) {
+ for (var mutation of mutations) {
+ for (var node of mutation.addedNodes) {
+ var iframe, textarea;
+ if (iframe = $.x('./descendant-or-self::iframe[starts-with(@src, "https://www.google.com/recaptcha/")]', node)) { this.setupIFrame(iframe); }
+ if (textarea = $.x('./descendant-or-self::textarea', node)) { this.setupTextArea(textarea); }
+ }
+ }
+ },
+
+ setupIFrame(iframe) {
+ let needle;
+ if (!doc.contains(iframe)) { return; }
+ Captcha.replace.iframe(iframe);
+ $.addClass(QR.nodes.el, 'captcha-open');
+ this.fixQRPosition();
+ $.on(iframe, 'load', this.fixQRPosition);
+ if (d.activeElement === this.nodes.counter) { iframe.focus(); }
+ // XXX Make sure scroll on space prevention (see src/css/style.css) doesn't cause scrolling of div
+ if (['blink', 'edge'].includes($.engine) && (needle = iframe.parentNode, $$('#qr .captcha-container > div > div:first-of-type').includes(needle))) {
+ return $.on(iframe.parentNode, 'scroll', function () { return this.scrollTop = 0; });
+ }
+ },
+
+ fixQRPosition() {
+ if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) {
+ QR.nodes.el.style.top = '';
+ return QR.nodes.el.style.bottom = '0px';
+ }
+ },
+
+ setupTextArea(textarea) {
+ return $.one(textarea, 'input', () => this.save(true));
+ },
+
+ destroy() {
+ if (!this.isEnabled) { return; }
+ delete this.timeouts.destroy;
+ $.rmClass(QR.nodes.el, 'captcha-open');
+ if (this.nodes.container) {
+ $.global(function () {
+ const container = document.querySelector('#qr .captcha-container');
+ return window.grecaptcha.reset(container.dataset.widgetID);
+ });
+ $.rm(this.nodes.container);
+ return delete this.nodes.container;
+ }
+ },
+
+ getOne(isReply) {
+ return Captcha.cache.getOne(isReply);
+ },
+
+ save(pasted, token) {
+ Captcha.cache.save({
+ response: token || $('textarea', this.nodes.container).value,
+ timeout: Date.now() + this.lifetime
+ });
+
+ const focus = (d.activeElement?.nodeName === 'IFRAME') && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src);
+ if (Captcha.cache.needed()) {
+ if (focus) {
+ if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
+ this.nodes.counter.focus();
+ } else {
+ QR.nodes.status.focus();
+ }
+ }
+ this.reload();
+ } else {
+ if (pasted) {
+ this.destroy();
+ } else {
+ if (this.timeouts.destroy == null) { this.timeouts.destroy = setTimeout(this.destroy.bind(this), 3 * SECOND); }
+ }
+ if (focus) { QR.nodes.status.focus(); }
+ }
+
+ if (Conf['Post on Captcha Completion'] && !QR.cooldown.auto) { return QR.submit(); }
+ },
+
+ count() {
+ const count = Captcha.cache.getCount();
+ const loading = Captcha.cache.submitCB ? '...' : '';
+ this.nodes.counter.textContent = `Captchas: ${count}${loading}`;
+ return this.moreNeeded();
+ },
+
+ reload() {
+ if ($('iframe[src^="https://www.google.com/recaptcha/api/fallback?"]', this.nodes.container)) {
+ this.destroy();
+ return this.setup(false, true);
+ } else {
+ return $.global(function () {
+ const container = document.querySelector('#qr .captcha-container');
+ return window.grecaptcha.reset(container.dataset.widgetID);
+ });
+ }
+ },
+
+ occupied() {
+ return !!this.nodes.container && !this.timeouts.destroy;
+ }
+ }
+};
+export default Captcha;
diff --git a/src/Posting/Captcha.replace.js b/src/Posting/Captcha.replace.js
index 80bdcb8fb1..d19184c0c5 100644
--- a/src/Posting/Captcha.replace.js
+++ b/src/Posting/Captcha.replace.js
@@ -1,9 +1,13 @@
+import { g, Conf, doc, d } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+import Captcha from "./Captcha";
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-Captcha.replace = {
+const CaptchaReplace = {
init() {
if ((g.SITE.software !== 'yotsuba') || (d.cookie.indexOf('pass_enabled=1') >= 0)) { return; }
@@ -50,3 +54,4 @@ Captcha.replace = {
}
}
};
+export default CaptchaReplace;
diff --git a/src/Posting/Captcha.t.js b/src/Posting/Captcha.t.js
index f61d7886d7..724a6d7e1b 100644
--- a/src/Posting/Captcha.t.js
+++ b/src/Posting/Captcha.t.js
@@ -1,9 +1,13 @@
+import { d, g } from "../globals/globals";
+import $ from "../platform/$";
+import QR from "./QR";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-Captcha.t = {
+const CaptchaT = {
init() {
if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; }
if (!(this.isEnabled = !!$('#t-root') || !$.id('postForm'))) { return; }
@@ -35,7 +39,7 @@ Captcha.t = {
if (!this.nodes.container) {
this.nodes.container = $.el('div', {className: 'captcha-container'});
$.prepend(this.nodes.root, this.nodes.container);
- Captcha.t.currentThread = Captcha.t.getThread();
+ CaptchaT.currentThread = CaptchaT.getThread();
$.global(function() {
const el = document.querySelector('#qr .captcha-container');
window.TCaptcha.init(el, this.boardID, +this.threadID);
@@ -45,7 +49,7 @@ Captcha.t = {
}})
));
}
- , Captcha.t.currentThread);
+ , CaptchaT.currentThread);
}
if (focus) {
@@ -62,11 +66,11 @@ Captcha.t = {
updateThread() {
if (!this.isEnabled) { return; }
- const {boardID, threadID} = (Captcha.t.currentThread || {});
- const newThread = Captcha.t.getThread();
+ const {boardID, threadID} = (CaptchaT.currentThread || {});
+ const newThread = CaptchaT.getThread();
if ((newThread.boardID !== boardID) || (newThread.threadID !== threadID)) {
- Captcha.t.destroy();
- return Captcha.t.setup();
+ CaptchaT.destroy();
+ return CaptchaT.setup();
}
},
@@ -95,3 +99,4 @@ Captcha.t = {
return !!this.nodes.container;
}
};
+export default CaptchaT;
diff --git a/src/Posting/Captcha.v2.js b/src/Posting/Captcha.v2.js
deleted file mode 100644
index 1addcfd9cf..0000000000
--- a/src/Posting/Captcha.v2.js
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS104: Avoid inline assignments
- * DS204: Change includes calls to have a more natural evaluation order
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-Captcha.v2 = {
- lifetime: 2 * $.MINUTE,
-
- init() {
- if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; }
- if (!(this.isEnabled = !!$('#g-recaptcha, #captcha-forced-noscript') || !$.id('postForm'))) { return; }
-
- if (this.noscript = Conf['Force Noscript Captcha'] || !Main.jsEnabled) {
- $.addClass(QR.nodes.el, 'noscript-captcha');
- }
-
- Captcha.cache.init();
- $.on(d, 'CaptchaCount', this.count.bind(this));
-
- const root = $.el('div', {className: 'captcha-root'});
- $.extend(root, { innerHTML:
- ''
- }
- );
- const counter = $('.captcha-counter > a', root);
- this.nodes = {root, counter};
- this.count();
- $.addClass(QR.nodes.el, 'has-captcha', 'captcha-v2');
- $.after(QR.nodes.com.parentNode, root);
-
- $.on(counter, 'click', this.toggle.bind(this));
- $.on(counter, 'keydown', e => {
- if (Keybinds.keyCode(e) !== 'Space') { return; }
- this.toggle();
- e.preventDefault();
- return e.stopPropagation();
- });
- return $.on(window, 'captcha:success', () => {
- // XXX Greasemonkey 1.x workaround to gain access to GM_* functions.
- return $.queueTask(() => this.save(false));
- });
- },
-
- timeouts: {},
- prevNeeded: 0,
-
- noscriptURL() {
- let lang;
- let url = 'https://www.google.com/recaptcha/api/fallback?k=<%= meta.recaptchaKey %>';
- if (lang = Conf['captchaLanguage'].trim()) {
- url += `&hl=${encodeURIComponent(lang)}`;
- }
- return url;
- },
-
- moreNeeded() {
- // Post count temporarily off by 1 when called from QR.post.rm, QR.close, or QR.submit
- return $.queueTask(() => {
- const needed = Captcha.cache.needed();
- if (needed && !this.prevNeeded) {
- this.setup(QR.cooldown.auto && (d.activeElement === QR.nodes.status));
- }
- return this.prevNeeded = needed;
- });
- },
-
- toggle() {
- if (this.nodes.container && !this.timeouts.destroy) {
- return this.destroy();
- } else {
- return this.setup(true, true);
- }
- },
-
- setup(focus, force) {
- if (!this.isEnabled || (!Captcha.cache.needed() && !force)) { return; }
-
- if (focus) {
- $.addClass(QR.nodes.el, 'focus');
- this.nodes.counter.focus();
- }
-
- if (this.timeouts.destroy) {
- clearTimeout(this.timeouts.destroy);
- delete this.timeouts.destroy;
- return this.reload();
- }
-
- if (this.nodes.container) {
- // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1226835
- $.queueTask(() => {
- let iframe;
- if (this.nodes.container && (d.activeElement === this.nodes.counter) && (iframe = $('iframe[src^="https://www.google.com/recaptcha/"]', this.nodes.container))) {
- iframe.focus();
- return QR.focus();
- }
- }); // Event handler not fired in Firefox
- return;
- }
-
- this.nodes.container = $.el('div', {className: 'captcha-container'});
- $.prepend(this.nodes.root, this.nodes.container);
- new MutationObserver(this.afterSetup.bind(this)).observe(this.nodes.container, {
- childList: true,
- subtree: true
- }
- );
-
- if (this.noscript) {
- return this.setupNoscript();
- } else {
- return this.setupJS();
- }
- },
-
- setupNoscript() {
- const iframe = $.el('iframe', {
- id: 'qr-captcha-iframe',
- scrolling: 'no',
- src: this.noscriptURL()
- }
- );
- const div = $.el('div');
- const textarea = $.el('textarea');
- $.add(div, textarea);
- return $.add(this.nodes.container, [iframe, div]);
- },
-
- setupJS() {
- return $.global(function() {
- const render = function() {
- const {classList} = document.documentElement;
- const container = document.querySelector('#qr .captcha-container');
- return container.dataset.widgetID = window.grecaptcha.render(container, {
- sitekey: '<%= meta.recaptchaKey %>',
- theme: classList.contains('tomorrow') || classList.contains('spooky') || classList.contains('dark-captcha') ? 'dark' : 'light',
- callback(response) {
- return window.dispatchEvent(new CustomEvent('captcha:success', {detail: response}));
- }
- }
- );
- };
- if (window.grecaptcha) {
- return render();
- } else {
- const cbNative = window.onRecaptchaLoaded;
- window.onRecaptchaLoaded = function() {
- render();
- return cbNative();
- };
- if (!document.head.querySelector('script[src^="https://www.google.com/recaptcha/api.js"]')) {
- const script = document.createElement('script');
- script.src = 'https://www.google.com/recaptcha/api.js?onload=onRecaptchaLoaded&render=explicit';
- return document.head.appendChild(script);
- }
- }
- });
- },
-
- afterSetup(mutations) {
- for (var mutation of mutations) {
- for (var node of mutation.addedNodes) {
- var iframe, textarea;
- if (iframe = $.x('./descendant-or-self::iframe[starts-with(@src, "https://www.google.com/recaptcha/")]', node)) { this.setupIFrame(iframe); }
- if (textarea = $.x('./descendant-or-self::textarea', node)) { this.setupTextArea(textarea); }
- }
- }
- },
-
- setupIFrame(iframe) {
- let needle;
- if (!doc.contains(iframe)) { return; }
- Captcha.replace.iframe(iframe);
- $.addClass(QR.nodes.el, 'captcha-open');
- this.fixQRPosition();
- $.on(iframe, 'load', this.fixQRPosition);
- if (d.activeElement === this.nodes.counter) { iframe.focus(); }
- // XXX Make sure scroll on space prevention (see src/css/style.css) doesn't cause scrolling of div
- if (['blink', 'edge'].includes($.engine) && (needle = iframe.parentNode, $$('#qr .captcha-container > div > div:first-of-type').includes(needle))) {
- return $.on(iframe.parentNode, 'scroll', function() { return this.scrollTop = 0; });
- }
- },
-
- fixQRPosition() {
- if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) {
- QR.nodes.el.style.top = '';
- return QR.nodes.el.style.bottom = '0px';
- }
- },
-
- setupTextArea(textarea) {
- return $.one(textarea, 'input', () => this.save(true));
- },
-
- destroy() {
- if (!this.isEnabled) { return; }
- delete this.timeouts.destroy;
- $.rmClass(QR.nodes.el, 'captcha-open');
- if (this.nodes.container) {
- $.global(function() {
- const container = document.querySelector('#qr .captcha-container');
- return window.grecaptcha.reset(container.dataset.widgetID);
- });
- $.rm(this.nodes.container);
- return delete this.nodes.container;
- }
- },
-
- getOne(isReply) {
- return Captcha.cache.getOne(isReply);
- },
-
- save(pasted, token) {
- Captcha.cache.save({
- response: token || $('textarea', this.nodes.container).value,
- timeout: Date.now() + this.lifetime
- });
-
- const focus = (d.activeElement?.nodeName === 'IFRAME') && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src);
- if (Captcha.cache.needed()) {
- if (focus) {
- if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
- this.nodes.counter.focus();
- } else {
- QR.nodes.status.focus();
- }
- }
- this.reload();
- } else {
- if (pasted) {
- this.destroy();
- } else {
- if (this.timeouts.destroy == null) { this.timeouts.destroy = setTimeout(this.destroy.bind(this), 3 * $.SECOND); }
- }
- if (focus) { QR.nodes.status.focus(); }
- }
-
- if (Conf['Post on Captcha Completion'] && !QR.cooldown.auto) { return QR.submit(); }
- },
-
- count() {
- const count = Captcha.cache.getCount();
- const loading = Captcha.cache.submitCB ? '...' : '';
- this.nodes.counter.textContent = `Captchas: ${count}${loading}`;
- return this.moreNeeded();
- },
-
- reload() {
- if ($('iframe[src^="https://www.google.com/recaptcha/api/fallback?"]', this.nodes.container)) {
- this.destroy();
- return this.setup(false, true);
- } else {
- return $.global(function() {
- const container = document.querySelector('#qr .captcha-container');
- return window.grecaptcha.reset(container.dataset.widgetID);
- });
- }
- },
-
- occupied() {
- return !!this.nodes.container && !this.timeouts.destroy;
- }
-};
diff --git a/src/Posting/PassLink.js b/src/Posting/PassLink.js
index bc5432358e..68016f64a5 100644
--- a/src/Posting/PassLink.js
+++ b/src/Posting/PassLink.js
@@ -1,3 +1,6 @@
+import { g, Conf } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -22,3 +25,4 @@ const PassLink = {
return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]);
}
};
+export default PassLink;
diff --git a/src/Posting/PostRedirect.js b/src/Posting/PostRedirect.js
index f0a042f6d2..d61526b953 100644
--- a/src/Posting/PostRedirect.js
+++ b/src/Posting/PostRedirect.js
@@ -1,3 +1,6 @@
+import { d } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -32,3 +35,4 @@ const PostRedirect = {
};
}
};
+export default PostRedirect;
diff --git a/src/Posting/PostSuccessful.js b/src/Posting/PostSuccessful.js
index 7dcb9a91ba..86623b88c9 100644
--- a/src/Posting/PostSuccessful.js
+++ b/src/Posting/PostSuccessful.js
@@ -1,3 +1,7 @@
+import DataBoard from "../classes/DataBoard";
+import { Conf, d, g } from "../globals/globals";
+import $ from "../platform/$";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -26,3 +30,4 @@ const PostSuccessful = {
});
}
};
+export default PostSuccessful;
diff --git a/src/Posting/QR.cooldown.js b/src/Posting/QR.cooldown.js
deleted file mode 100644
index 48e15dcbca..0000000000
--- a/src/Posting/QR.cooldown.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-QR.cooldown = {
- seconds: 0,
- delays: {
- deletion: 60
- }, // cooldown for deleting posts/files
-
- // Called from Main
- init() {
- if (!Conf['Quick Reply']) { return; }
- this.data = Conf['cooldowns'];
- this.changes = $.dict();
- return $.sync('cooldowns', this.sync);
- },
-
- // Called from QR
- setup() {
- // Read cooldown times
- $.extend(QR.cooldown.delays, g.BOARD.cooldowns());
-
- // The longest reply cooldown, for use in pruning old reply data
- QR.cooldown.maxDelay = 0;
- for (var type in QR.cooldown.delays) {
- var delay = QR.cooldown.delays[type];
- if (!['thread', 'thread_global'].includes(type)) {
- QR.cooldown.maxDelay = Math.max(QR.cooldown.maxDelay, delay);
- }
- }
-
- QR.cooldown.isSetup = true;
- return QR.cooldown.start();
- },
-
- start() {
- const {data} = QR.cooldown;
- if (
- !Conf['Cooldown'] ||
- !QR.cooldown.isSetup ||
- !!QR.cooldown.isCounting ||
- ((Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length) <= 0)
- ) { return; }
- QR.cooldown.isCounting = true;
- return QR.cooldown.count();
- },
-
- sync(data) {
- QR.cooldown.data = data || $.dict();
- return QR.cooldown.start();
- },
-
- add(threadID, postID) {
- if (!Conf['Cooldown']) { return; }
- const start = Date.now();
- const boardID = g.BOARD.ID;
- QR.cooldown.set(boardID, start, {threadID, postID});
- if (threadID === postID) { QR.cooldown.set('global', start, {boardID, threadID, postID}); }
- QR.cooldown.save();
- return QR.cooldown.start();
- },
-
- addDelay(post, delay) {
- if (!Conf['Cooldown']) { return; }
- const cooldown = QR.cooldown.categorize(post);
- cooldown.delay = delay;
- QR.cooldown.set(g.BOARD.ID, Date.now(), cooldown);
- QR.cooldown.save();
- return QR.cooldown.start();
- },
-
- addMute(delay) {
- if (!Conf['Cooldown']) { return; }
- QR.cooldown.set(g.BOARD.ID, Date.now(), {type: 'mute', delay});
- QR.cooldown.save();
- return QR.cooldown.start();
- },
-
- delete(post) {
- let cooldown;
- if (!QR.cooldown.data) { return; }
- const cooldowns = (QR.cooldown.data[post.board.ID] || (QR.cooldown.data[post.board.ID] = $.dict()));
- for (var id in cooldowns) {
- cooldown = cooldowns[id];
- if ((cooldown.delay == null) && (cooldown.threadID === post.thread.ID) && (cooldown.postID === post.ID)) {
- QR.cooldown.set(post.board.ID, id, null);
- }
- }
- return QR.cooldown.save();
- },
-
- secondsDeletion(post) {
- if (!QR.cooldown.data || !Conf['Cooldown']) { return 0; }
- const cooldowns = QR.cooldown.data[post.board.ID] || $.dict();
- for (var start in cooldowns) {
- var cooldown = cooldowns[start];
- if ((cooldown.delay == null) && (cooldown.threadID === post.thread.ID) && (cooldown.postID === post.ID)) {
- var seconds = QR.cooldown.delays.deletion - Math.floor((Date.now() - start) / $.SECOND);
- return Math.max(seconds, 0);
- }
- }
- return 0;
- },
-
- categorize(post) {
- if (post.thread === 'new') {
- return {type: 'thread'};
- } else {
- return {
- type: !!post.file ? 'image' : 'reply',
- threadID: +post.thread
- };
- }
- },
-
- mergeChange(data, scope, id, value) {
- if (value) {
- return (data[scope] || (data[scope] = $.dict()))[id] = value;
- } else if (scope in data) {
- delete data[scope][id];
- if (Object.keys(data[scope]).length === 0) { return delete data[scope]; }
- }
- },
-
- set(scope, id, value) {
- QR.cooldown.mergeChange(QR.cooldown.data, scope, id, value);
- return (QR.cooldown.changes[scope] || (QR.cooldown.changes[scope] = $.dict()))[id] = value;
- },
-
- save() {
- const {changes} = QR.cooldown;
- if (!Object.keys(changes).length) { return; }
- return $.get('cooldowns', $.dict(), function({cooldowns}) {
- for (var scope in QR.cooldown.changes) {
- for (var id in QR.cooldown.changes[scope]) {
- var value = QR.cooldown.changes[scope][id];
- QR.cooldown.mergeChange(cooldowns, scope, id, value);
- }
- QR.cooldown.data = cooldowns;
- }
- return $.set('cooldowns', cooldowns, () => QR.cooldown.changes = $.dict());
- });
- },
-
- clear() {
- QR.cooldown.data = $.dict();
- QR.cooldown.changes = $.dict();
- QR.cooldown.auto = false;
- QR.cooldown.update();
- return $.queueTask($.delete, 'cooldowns');
- },
-
- update() {
- let cooldown;
- if (!QR.cooldown.isCounting) { return; }
-
- let save = false;
- let nCooldowns = 0;
- const now = Date.now();
- const {type, threadID} = QR.cooldown.categorize(QR.posts[0]);
- let seconds = 0;
-
- if (Conf['Cooldown']) { for (var scope of [g.BOARD.ID, 'global']) {
- var cooldowns = (QR.cooldown.data[scope] || (QR.cooldown.data[scope] = $.dict()));
-
- for (var start in cooldowns) {
- cooldown = cooldowns[start];
- start = +start;
- var elapsed = Math.floor((now - start) / $.SECOND);
- if (elapsed < 0) { // clock changed since then?
- QR.cooldown.set(scope, start, null);
- save = true;
- continue;
- }
-
- // Explicit delays from error messages
- if (cooldown.delay != null) {
- if (cooldown.delay <= elapsed) {
- QR.cooldown.set(scope, start, null);
- save = true;
- } else if (((cooldown.type === type) && (cooldown.threadID === threadID)) || (cooldown.type === 'mute')) {
- // Delays only apply to the given post type and thread.
- seconds = Math.max(seconds, cooldown.delay - elapsed);
- }
- continue;
- }
-
- // Clean up expired cooldowns
- var maxDelay = cooldown.threadID !== cooldown.postID ?
- QR.cooldown.maxDelay
- :
- QR.cooldown.delays[scope === 'global' ? 'thread_global' : 'thread'];
- if (QR.cooldown.customCooldown) {
- maxDelay = Math.max(maxDelay, parseInt(Conf['customCooldown'], 10));
- }
- if (maxDelay <= elapsed) {
- QR.cooldown.set(scope, start, null);
- save = true;
- continue;
- }
-
- if (((type === 'thread') === (cooldown.threadID === cooldown.postID)) && (cooldown.boardID !== g.BOARD.ID)) {
- // Only cooldowns relevant to this post can set the seconds variable:
- // reply cooldown with a reply, thread cooldown with a thread.
- // Inter-board thread cooldowns only apply on boards other than the one they were posted on.
- var suffix = scope === 'global' ?
- '_global'
- :
- '';
- seconds = Math.max(seconds, QR.cooldown.delays[type + suffix] - elapsed);
-
- // If additional cooldown is enabled, add the configured seconds to the count.
- if (QR.cooldown.customCooldown) {
- seconds = Math.max(seconds, parseInt(Conf['customCooldown'], 10) - elapsed);
- }
- }
- }
-
- nCooldowns += Object.keys(cooldowns).length;
- } }
-
- if (save) { QR.cooldown.save; }
-
- if (nCooldowns) {
- clearTimeout(QR.cooldown.timeout);
- QR.cooldown.timeout = setTimeout(QR.cooldown.count, $.SECOND);
- } else {
- delete QR.cooldown.isCounting;
- }
-
- // Update the status when we change posting type.
- // Don't get stuck at some random number.
- // Don't interfere with progress status updates.
- const update = seconds !== QR.cooldown.seconds;
- QR.cooldown.seconds = seconds;
- if (update) { return QR.status(); }
- },
-
- count() {
- QR.cooldown.update();
- if ((QR.cooldown.seconds === 0) && QR.cooldown.auto && !QR.req) { return QR.submit(); }
- }
-};
diff --git a/src/Posting/QR.js b/src/Posting/QR.js
index d3015a2de9..5de7265f84 100644
--- a/src/Posting/QR.js
+++ b/src/Posting/QR.js
@@ -1,3 +1,21 @@
+import QuickReplyPage from './QR/QuickReply.html';
+import $ from '../platform/$';
+import Callbacks from '../classes/Callbacks';
+import Notice from '../classes/Notice';
+import Main from '../main/Main';
+import Favicon from '../Monitoring/Favicon';
+import $$ from '../platform/$$';
+import CrossOrigin from '../platform/CrossOrigin';
+import Captcha from './Captcha';
+import meta from '../../package.json';
+import Header from '../General/Header';
+import { Conf, E, d, doc, g } from '../globals/globals';
+import Menu from '../Menu/Menu';
+import UI from '../General/UI';
+import BoardConfig from '../General/BoardConfig';
+import Get from '../General/Get';
+import { DAY, dict, SECOND } from '../platform/helpers';
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -6,7 +24,6 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-import QuickReplyPage from './QR/QuickReply.html';
var QR = {
mimeTypes: ['image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/vnd.adobe.flash.movie', 'application/x-shockwave-flash', 'video/webm'],
@@ -92,7 +109,10 @@ var QR = {
if (origToggle = $.id('togglePostFormLink')) {
const link = $.el('h1',
{className: "qr-link-container"});
- $.extend(link, {innerHTML: '?{g.VIEW === "thread"}{Reply to Thread}{Start a Thread}'});
+ $.extend(link, {
+ innerHTML:
+ `${g.VIEW === "thread" ? "Reply to Thread" : "Start a Thread"}`
+ });
QR.link = link.firstElementChild;
$.on(link.firstChild, 'click', function() {
@@ -294,7 +314,7 @@ var QR = {
notif.onclose = null;
return notif.close();
}
- , 7 * $.SECOND);
+ , 7 * SECOND);
}
}
},
@@ -452,7 +472,10 @@ var QR = {
openError() {
const div = $.el('div');
- $.extend(div, { innerHTML: 'Could not open file. [More info]'});
+ $.extend(div, {
+ innerHTML:
+ 'Could not open file. [More info]'
+ });
return QR.error(div);
},
@@ -947,8 +970,8 @@ var QR = {
post.unlock();
if (err = this.response?.getElementById('errmsg')) { // error!
- // TODO: check if exists
- $('a', err).target = '_blank'; // duplicate image link
+ const el = $('a', err);
+ if (el) el.target = '_blank'; // duplicate image link
} else if (connErr = (!this.response || (this.response.title !== 'Post successful!'))) {
err = QR.connectionError();
if ((QR.captcha === Captcha.v2) && QR.currentCaptcha) { Captcha.cache.save(QR.currentCaptcha); }
@@ -1078,7 +1101,7 @@ var QR = {
if ((attempts >= 6) || (this.status === 200)) {
return cb();
} else {
- return setTimeout(check, attempts * $.SECOND);
+ return setTimeout(check, attempts * SECOND);
}
},
responseType: 'text',
@@ -1101,5 +1124,1028 @@ var QR = {
QR.notifications.push(new Notice('info', 'QR upload aborted.', 5));
}
return QR.status();
+ },
+
+ cooldown: {
+ seconds: 0,
+ delays: {
+ deletion: 60
+ }, // cooldown for deleting posts/files
+
+ // Called from Main
+ init() {
+ if (!Conf['Quick Reply']) { return; }
+ this.data = Conf['cooldowns'];
+ this.changes = dict();
+ return $.sync('cooldowns', this.sync);
+ },
+
+ // Called from QR
+ setup() {
+ // Read cooldown times
+ $.extend(QR.cooldown.delays, g.BOARD.cooldowns());
+
+ // The longest reply cooldown, for use in pruning old reply data
+ QR.cooldown.maxDelay = 0;
+ for (var type in QR.cooldown.delays) {
+ var delay = QR.cooldown.delays[type];
+ if (!['thread', 'thread_global'].includes(type)) {
+ QR.cooldown.maxDelay = Math.max(QR.cooldown.maxDelay, delay);
+ }
+ }
+
+ QR.cooldown.isSetup = true;
+ return QR.cooldown.start();
+ },
+
+ start() {
+ const { data } = QR.cooldown;
+ if (
+ !Conf['Cooldown'] ||
+ !QR.cooldown.isSetup ||
+ !!QR.cooldown.isCounting ||
+ ((Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length) <= 0)
+ ) { return; }
+ QR.cooldown.isCounting = true;
+ return QR.cooldown.count();
+ },
+
+ sync(data) {
+ QR.cooldown.data = data || dict();
+ return QR.cooldown.start();
+ },
+
+ add(threadID, postID) {
+ if (!Conf['Cooldown']) { return; }
+ const start = Date.now();
+ const boardID = g.BOARD.ID;
+ QR.cooldown.set(boardID, start, { threadID, postID });
+ if (threadID === postID) { QR.cooldown.set('global', start, { boardID, threadID, postID }); }
+ QR.cooldown.save();
+ return QR.cooldown.start();
+ },
+
+ addDelay(post, delay) {
+ if (!Conf['Cooldown']) { return; }
+ const cooldown = QR.cooldown.categorize(post);
+ cooldown.delay = delay;
+ QR.cooldown.set(g.BOARD.ID, Date.now(), cooldown);
+ QR.cooldown.save();
+ return QR.cooldown.start();
+ },
+
+ addMute(delay) {
+ if (!Conf['Cooldown']) { return; }
+ QR.cooldown.set(g.BOARD.ID, Date.now(), { type: 'mute', delay });
+ QR.cooldown.save();
+ return QR.cooldown.start();
+ },
+
+ delete(post) {
+ let cooldown;
+ if (!QR.cooldown.data) { return; }
+ const cooldowns = (QR.cooldown.data[post.board.ID] || (QR.cooldown.data[post.board.ID] = dict()));
+ for (var id in cooldowns) {
+ cooldown = cooldowns[id];
+ if ((cooldown.delay == null) && (cooldown.threadID === post.thread.ID) && (cooldown.postID === post.ID)) {
+ QR.cooldown.set(post.board.ID, id, null);
+ }
+ }
+ return QR.cooldown.save();
+ },
+
+ secondsDeletion(post) {
+ if (!QR.cooldown.data || !Conf['Cooldown']) { return 0; }
+ const cooldowns = QR.cooldown.data[post.board.ID] || dict();
+ for (var start in cooldowns) {
+ var cooldown = cooldowns[start];
+ if ((cooldown.delay == null) && (cooldown.threadID === post.thread.ID) && (cooldown.postID === post.ID)) {
+ var seconds = QR.cooldown.delays.deletion - Math.floor((Date.now() - start) / SECOND);
+ return Math.max(seconds, 0);
+ }
+ }
+ return 0;
+ },
+
+ categorize(post) {
+ if (post.thread === 'new') {
+ return { type: 'thread' };
+ } else {
+ return {
+ type: !!post.file ? 'image' : 'reply',
+ threadID: +post.thread
+ };
+ }
+ },
+
+ mergeChange(data, scope, id, value) {
+ if (value) {
+ return (data[scope] || (data[scope] = dict()))[id] = value;
+ } else if (scope in data) {
+ delete data[scope][id];
+ if (Object.keys(data[scope]).length === 0) { return delete data[scope]; }
+ }
+ },
+
+ set(scope, id, value) {
+ QR.cooldown.mergeChange(QR.cooldown.data, scope, id, value);
+ return (QR.cooldown.changes[scope] || (QR.cooldown.changes[scope] = dict()))[id] = value;
+ },
+
+ save() {
+ const { changes } = QR.cooldown;
+ if (!Object.keys(changes).length) { return; }
+ return $.get('cooldowns', dict(), function ({ cooldowns }) {
+ for (var scope in QR.cooldown.changes) {
+ for (var id in QR.cooldown.changes[scope]) {
+ var value = QR.cooldown.changes[scope][id];
+ QR.cooldown.mergeChange(cooldowns, scope, id, value);
+ }
+ QR.cooldown.data = cooldowns;
+ }
+ return $.set('cooldowns', cooldowns, () => QR.cooldown.changes = dict());
+ });
+ },
+
+ clear() {
+ QR.cooldown.data = dict();
+ QR.cooldown.changes = dict();
+ QR.cooldown.auto = false;
+ QR.cooldown.update();
+ return $.queueTask($.delete, 'cooldowns');
+ },
+
+ update() {
+ let cooldown;
+ if (!QR.cooldown.isCounting) { return; }
+
+ let save = false;
+ let nCooldowns = 0;
+ const now = Date.now();
+ const { type, threadID } = QR.cooldown.categorize(QR.posts[0]);
+ let seconds = 0;
+
+ if (Conf['Cooldown']) {
+ for (var scope of [g.BOARD.ID, 'global']) {
+ var cooldowns = (QR.cooldown.data[scope] || (QR.cooldown.data[scope] = dict()));
+
+ for (var start in cooldowns) {
+ cooldown = cooldowns[start];
+ start = +start;
+ var elapsed = Math.floor((now - start) / SECOND);
+ if (elapsed < 0) { // clock changed since then?
+ QR.cooldown.set(scope, start, null);
+ save = true;
+ continue;
+ }
+
+ // Explicit delays from error messages
+ if (cooldown.delay != null) {
+ if (cooldown.delay <= elapsed) {
+ QR.cooldown.set(scope, start, null);
+ save = true;
+ } else if (((cooldown.type === type) && (cooldown.threadID === threadID)) || (cooldown.type === 'mute')) {
+ // Delays only apply to the given post type and thread.
+ seconds = Math.max(seconds, cooldown.delay - elapsed);
+ }
+ continue;
+ }
+
+ // Clean up expired cooldowns
+ var maxDelay = cooldown.threadID !== cooldown.postID ?
+ QR.cooldown.maxDelay
+ :
+ QR.cooldown.delays[scope === 'global' ? 'thread_global' : 'thread'];
+ if (QR.cooldown.customCooldown) {
+ maxDelay = Math.max(maxDelay, parseInt(Conf['customCooldown'], 10));
+ }
+ if (maxDelay <= elapsed) {
+ QR.cooldown.set(scope, start, null);
+ save = true;
+ continue;
+ }
+
+ if (((type === 'thread') === (cooldown.threadID === cooldown.postID)) && (cooldown.boardID !== g.BOARD.ID)) {
+ // Only cooldowns relevant to this post can set the seconds variable:
+ // reply cooldown with a reply, thread cooldown with a thread.
+ // Inter-board thread cooldowns only apply on boards other than the one they were posted on.
+ var suffix = scope === 'global' ?
+ '_global'
+ :
+ '';
+ seconds = Math.max(seconds, QR.cooldown.delays[type + suffix] - elapsed);
+
+ // If additional cooldown is enabled, add the configured seconds to the count.
+ if (QR.cooldown.customCooldown) {
+ seconds = Math.max(seconds, parseInt(Conf['customCooldown'], 10) - elapsed);
+ }
+ }
+ }
+
+ nCooldowns += Object.keys(cooldowns).length;
+ }
+ }
+
+ if (save) { QR.cooldown.save; }
+
+ if (nCooldowns) {
+ clearTimeout(QR.cooldown.timeout);
+ QR.cooldown.timeout = setTimeout(QR.cooldown.count, SECOND);
+ } else {
+ delete QR.cooldown.isCounting;
+ }
+
+ // Update the status when we change posting type.
+ // Don't get stuck at some random number.
+ // Don't interfere with progress status updates.
+ const update = seconds !== QR.cooldown.seconds;
+ QR.cooldown.seconds = seconds;
+ if (update) { return QR.status(); }
+ },
+
+ count() {
+ QR.cooldown.update();
+ if ((QR.cooldown.seconds === 0) && QR.cooldown.auto && !QR.req) { return QR.submit(); }
+ }
+ },
+
+ oekaki: {
+ menu: {
+ init() {
+ if (!['index', 'thread'].includes(g.VIEW) || !Conf['Menu'] || !Conf['Edit Link'] || !Conf['Quick Reply']) { return; }
+
+ const a = $.el('a', {
+ className: 'edit-link',
+ href: 'javascript:;',
+ textContent: 'Edit image'
+ }
+ );
+ $.on(a, 'click', this.editFile);
+
+ return Menu.menu.addEntry({
+ el: a,
+ order: 90,
+ open(post) {
+ QR.oekaki.menu.post = post;
+ const { file } = post;
+ return QR.postingIsEnabled && !!file && (file.isImage || file.isVideo);
+ }
+ });
+ },
+
+ editFile() {
+ const { post } = QR.oekaki.menu;
+ QR.quote.call(post.nodes.post);
+ const { isVideo } = post.file;
+ const currentTime = post.file.fullImage?.currentTime || 0;
+ return CrossOrigin.file(post.file.url, function (blob) {
+ if (!blob) {
+ return QR.error("Can't load file.");
+ } else if (isVideo) {
+ const video = $.el('video');
+ $.on(video, 'loadedmetadata', function () {
+ $.on(video, 'seeked', function () {
+ const canvas = $.el('canvas', {
+ width: video.videoWidth,
+ height: video.videoHeight
+ }
+ );
+ canvas.getContext('2d').drawImage(video, 0, 0);
+ return canvas.toBlob(function (snapshot) {
+ snapshot.name = post.file.name.replace(/\.\w+$/, '') + '.png';
+ QR.handleFiles([snapshot]);
+ return QR.oekaki.edit();
+ });
+ });
+ return video.currentTime = currentTime;
+ });
+ $.on(video, 'error', () => QR.openError());
+ return video.src = URL.createObjectURL(blob);
+ } else {
+ blob.name = post.file.name;
+ QR.handleFiles([blob]);
+ return QR.oekaki.edit();
+ }
+ });
+ }
+ },
+
+ setup() {
+ return $.global(function () {
+ const { FCX } = window;
+ FCX.oekakiCB = () => window.Tegaki.flatten().toBlob(function (file) {
+ const source = `oekaki-${Date.now()}`;
+ FCX.oekakiLatest = source;
+ return document.dispatchEvent(new CustomEvent('QRSetFile', {
+ bubbles: true,
+ detail: { file, name: FCX.oekakiName, source }
+ }));
+ });
+ if (window.Tegaki) {
+ return document.querySelector('#qr .oekaki').hidden = false;
+ }
+ });
+ },
+
+ load(cb) {
+ if ($('script[src^="//s.4cdn.org/js/tegaki"]', d.head)) {
+ return cb();
+ } else {
+ const style = $.el('link', {
+ rel: 'stylesheet',
+ href: `//s.4cdn.org/css/tegaki.${Date.now()}.css`
+ }
+ );
+ const script = $.el('script',
+ { src: `//s.4cdn.org/js/tegaki.min.${Date.now()}.js` });
+ let n = 0;
+ const onload = function () {
+ if (++n === 2) { return cb(); }
+ };
+ $.on(style, 'load', onload);
+ $.on(script, 'load', onload);
+ return $.add(d.head, [style, script]);
+ }
+ },
+
+ draw() {
+ return $.global(function () {
+ const { Tegaki, FCX } = window;
+ if (Tegaki.bg) { Tegaki.destroy(); }
+ FCX.oekakiName = 'tegaki.png';
+ return Tegaki.open({
+ onDone: FCX.oekakiCB,
+ onCancel() { return Tegaki.bgColor = '#ffffff'; },
+ width: +document.querySelector('#qr [name=oekaki-width]').value,
+ height: +document.querySelector('#qr [name=oekaki-height]').value,
+ bgColor:
+ document.querySelector('#qr [name=oekaki-bg]').checked ?
+ document.querySelector('#qr [name=oekaki-bgcolor]').value
+ :
+ 'transparent'
+ });
+ });
+ },
+
+ button() {
+ if (QR.selected.file) {
+ return QR.oekaki.edit();
+ } else {
+ return QR.oekaki.toggle();
+ }
+ },
+
+ edit() {
+ return QR.oekaki.load(() => $.global(function () {
+ const { Tegaki, FCX } = window;
+ const name = document.getElementById('qr-filename').value.replace(/\.\w+$/, '') + '.png';
+ const { source } = document.getElementById('file-n-submit').dataset;
+ const error = content => document.dispatchEvent(new CustomEvent('CreateNotification', {
+ bubbles: true,
+ detail: { type: 'warning', content, lifetime: 20 }
+ }));
+ var cb = function (e) {
+ if (e) { this.removeEventListener('QRMetadata', cb, false); }
+ const selected = document.getElementById('selected');
+ if (!selected?.dataset.type) { return error('No file to edit.'); }
+ if (!/^(image|video)\//.test(selected.dataset.type)) { return error('Not an image.'); }
+ if (!selected.dataset.height) { return error('Metadata not available.'); }
+ if (selected.dataset.height === 'loading') {
+ selected.addEventListener('QRMetadata', cb, false);
+ return;
+ }
+ if (Tegaki.bg) { Tegaki.destroy(); }
+ FCX.oekakiName = name;
+ Tegaki.open({
+ onDone: FCX.oekakiCB,
+ onCancel() { return Tegaki.bgColor = '#ffffff'; },
+ width: +selected.dataset.width,
+ height: +selected.dataset.height,
+ bgColor: 'transparent'
+ });
+ const canvas = document.createElement('canvas');
+ canvas.width = (canvas.naturalWidth = +selected.dataset.width);
+ canvas.height = (canvas.naturalHeight = +selected.dataset.height);
+ canvas.hidden = true;
+ document.body.appendChild(canvas);
+ canvas.addEventListener('QRImageDrawn', function () {
+ this.remove();
+ return Tegaki.onOpenImageLoaded.call(this);
+ }
+ , false);
+ return canvas.dispatchEvent(new CustomEvent('QRDrawFile', { bubbles: true }));
+ };
+ if (Tegaki.bg && (Tegaki.onDoneCb === FCX.oekakiCB) && (source === FCX.oekakiLatest)) {
+ FCX.oekakiName = name;
+ return Tegaki.resume();
+ } else {
+ return cb();
+ }
+ }));
+ },
+
+ toggle() {
+ return QR.oekaki.load(() => QR.nodes.oekaki.hidden = !QR.nodes.oekaki.hidden);
+ }
+ },
+
+ persona: {
+ always: {},
+ types: {
+ name: [],
+ email: [],
+ sub: []
+ },
+
+ init() {
+ if (!Conf['Quick Reply'] && (!Conf['Menu'] || !Conf['Delete Link'])) { return; }
+ for (var item of Conf['QR.personas'].split('\n')) {
+ QR.persona.parseItem(item.trim());
+ }
+ },
+
+ parseItem(item) {
+ let match, needle, type, val;
+ if (item[0] === '#') { return; }
+ if (!(match = item.match(/(name|options|email|subject|password):"(.*)"/i))) { return; }
+ [match, type, val] = Array.from(match);
+
+ // Don't mix up item settings with val.
+ item = item.replace(match, '');
+
+ const boards = item.match(/boards:([^;]+)/i)?.[1].toLowerCase() || 'global';
+ if ((boards !== 'global') && (needle = g.BOARD.ID, !boards.split(',').includes(needle))) { return; }
+
+
+ if (type === 'password') {
+ QR.persona.pwd = val;
+ return;
+ }
+
+ if (type === 'options') { type = 'email'; }
+ if (type === 'subject') { type = 'sub'; }
+
+ if (/always/i.test(item)) {
+ QR.persona.always[type] = val;
+ }
+
+ if (!QR.persona.types[type].includes(val)) {
+ return QR.persona.types[type].push(val);
+ }
+ },
+
+ load() {
+ for (var type in QR.persona.types) {
+ var arr = QR.persona.types[type];
+ var list = $(`#list-${type}`, QR.nodes.el);
+ for (var val of arr) {
+ if (val) {
+ $.add(list, $.el('option',
+ { textContent: val })
+ );
+ }
+ }
+ }
+ },
+
+ getPassword() {
+ let m;
+ if (QR.persona.pwd != null) {
+ return QR.persona.pwd;
+ } else if (m = d.cookie.match(/4chan_pass=([^;]+)/)) {
+ return decodeURIComponent(m[1]);
+ } else {
+ return '';
+ }
+ },
+
+ get(cb) {
+ return $.get('QR.persona', {}, ({ 'QR.persona': persona }) => cb(persona));
+ },
+
+ set(post) {
+ return $.get('QR.persona', {}, function ({ 'QR.persona': persona }) {
+ persona = {
+ name: post.name,
+ flag: post.flag
+ };
+ return $.set('QR.persona', persona);
+ });
+ }
+ },
+
+ post: class {
+ constructor(select) {
+ this.select = this.select.bind(this);
+ const el = $.el('a', {
+ className: 'qr-preview',
+ draggable: true,
+ href: 'javascript:;'
+ }
+ );
+ $.extend(el, { innerHTML: '' });
+
+ this.nodes = {
+ el,
+ rm: el.firstChild,
+ spoiler: $('.qr-preview-spoiler input', el),
+ span: el.lastChild
+ };
+
+ $.on(el, 'click', this.select);
+ $.on(this.nodes.rm, 'click', e => { e.stopPropagation(); return this.rm(); });
+ $.on(this.nodes.spoiler, 'change', e => {
+ this.spoiler = e.target.checked;
+ if (this === QR.selected) { QR.nodes.spoiler.checked = this.spoiler; }
+ return this.preventAutoPost();
+ });
+ for (var label of $$('label', el)) {
+ $.on(label, 'click', e => e.stopPropagation());
+ }
+ $.add(QR.nodes.dumpList, el);
+
+ for (var event of ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']) {
+ $.on(el, event.toLowerCase(), this[event]);
+ }
+
+ this.thread = g.VIEW === 'thread' ?
+ g.THREADID
+ :
+ 'new';
+
+ const prev = QR.posts[QR.posts.length - 1];
+ QR.posts.push(this);
+ this.nodes.spoiler.checked = (this.spoiler = prev && Conf['Remember Spoiler'] ?
+ prev.spoiler
+ :
+ false);
+ QR.persona.get(persona => {
+ this.name = 'name' in QR.persona.always ?
+ QR.persona.always.name
+ : prev ?
+ prev.name
+ :
+ persona.name;
+
+ this.email = 'email' in QR.persona.always ?
+ QR.persona.always.email
+ :
+ '';
+
+ this.sub = 'sub' in QR.persona.always ?
+ QR.persona.always.sub
+ :
+ '';
+
+ if (QR.nodes.flag) {
+ this.flag = (() => {
+ if (prev) {
+ return prev.flag;
+ } else if (persona.flag && persona.flag in g.BOARD.config.board_flags) {
+ return persona.flag;
+ }
+ })();
+ }
+ if (QR.selected === this) { return this.load(); }
+ }); // load persona
+ if (select) { this.select(); }
+ this.unlock();
+ QR.captcha.moreNeeded();
+ }
+
+ rm() {
+ this.delete();
+ const index = QR.posts.indexOf(this);
+ if (QR.posts.length === 1) {
+ new QR.post(true);
+ $.rmClass(QR.nodes.el, 'dump');
+ } else if (this === QR.selected) {
+ (QR.posts[index - 1] || QR.posts[index + 1]).select();
+ }
+ QR.posts.splice(index, 1);
+ QR.status();
+ return QR.captcha.updateThread?.();
+ }
+
+ delete() {
+ $.rm(this.nodes.el);
+ URL.revokeObjectURL(this.URL);
+ return this.dismissErrors();
+ }
+
+ lock(lock = true) {
+ this.isLocked = lock;
+ if (this !== QR.selected) { return; }
+ for (var name of ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag']) {
+ var node;
+ if ((node = QR.nodes[name])) {
+ node.disabled = lock;
+ }
+ }
+ this.nodes.rm.style.visibility = lock ? 'hidden' : '';
+ this.nodes.spoiler.disabled = lock;
+ return this.nodes.el.draggable = !lock;
+ }
+
+ unlock() {
+ return this.lock(false);
+ }
+
+ select() {
+ if (QR.selected) {
+ QR.selected.nodes.el.removeAttribute('id');
+ QR.selected.forceSave();
+ }
+ QR.selected = this;
+ this.lock(this.isLocked);
+ this.nodes.el.id = 'selected';
+ // Scroll the list to center the focused post.
+ const rectEl = this.nodes.el.getBoundingClientRect();
+ const rectList = this.nodes.el.parentNode.getBoundingClientRect();
+ this.nodes.el.parentNode.scrollLeft += (rectEl.left + (rectEl.width / 2)) - rectList.left - (rectList.width / 2);
+ return this.load();
+ }
+
+ load() {
+ // Load this post's values.
+
+ for (var name of ['thread', 'name', 'email', 'sub', 'com', 'filename', 'flag']) {
+ var node;
+ if (!(node = QR.nodes[name])) { continue; }
+ node.value = this[name] || node.dataset.default || '';
+ }
+
+ (this.thread !== 'new' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread');
+
+ this.showFileData();
+ return QR.characterCount();
+ }
+
+ save(input, forced) {
+ if (input.type === 'checkbox') {
+ this.spoiler = input.checked;
+ return;
+ }
+ const { name } = input.dataset;
+ if (!['thread', 'name', 'email', 'sub', 'com', 'filename', 'flag'].includes(name)) { return; }
+ const prev = this[name] || input.dataset.default || null;
+ this[name] = input.value || input.dataset.default || null;
+ switch (name) {
+ case 'thread':
+ (this.thread !== 'new' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread');
+ QR.status();
+ QR.captcha.updateThread?.();
+ break;
+ case 'com':
+ this.updateComment();
+ break;
+ case 'filename':
+ if (!this.file) { return; }
+ this.saveFilename();
+ this.updateFilename();
+ break;
+ case 'name': case 'flag':
+ if (this[name] !== prev) { // only save manual changes, not values filled in by persona settings
+ QR.persona.set(this);
+ }
+ break;
+ }
+ if (!forced) { return this.preventAutoPost(); }
+ }
+
+ forceSave() {
+ if (this !== QR.selected) { return; }
+ // Do this in case people use extensions
+ // that do not trigger the `input` event.
+ for (var name of ['thread', 'name', 'email', 'sub', 'com', 'filename', 'spoiler', 'flag']) {
+ var node;
+ if (!(node = QR.nodes[name])) { continue; }
+ this.save(node, true);
+ }
+ }
+
+ preventAutoPost() {
+ // Disable auto-posting if you're editing the first post
+ // during the last 5 seconds of the cooldown.
+ if (QR.cooldown.auto && (this === QR.posts[0])) {
+ QR.cooldown.update(); // adding/removing file can change cooldown
+ if (QR.cooldown.seconds <= 5) { return QR.cooldown.auto = false; }
+ }
+ }
+
+ setComment(com) {
+ this.com = com || null;
+ if (this === QR.selected) {
+ QR.nodes.com.value = this.com;
+ }
+ return this.updateComment();
+ }
+
+ updateComment() {
+ if (this === QR.selected) {
+ QR.characterCount();
+ }
+ this.nodes.span.textContent = this.com;
+ QR.captcha.moreNeeded();
+ if (QR.captcha === Captcha.v2) {
+ return Captcha.cache.prerequest();
+ }
+ }
+
+ isOnlyQuotes() {
+ return (this.com || '').trim() === (this.quotedText || '').trim();
+ }
+
+ static rmErrored(e) {
+ e.stopPropagation();
+ for (let i = QR.posts.length - 1; i >= 0; i--) {
+ var errors;
+ var post = QR.posts[i];
+ if ((errors = post.errors)) {
+ for (var error of errors) {
+ if (doc.contains(error)) {
+ post.rm();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ error(className, message, link) {
+ const div = $.el('div', { className });
+ $.extend(div, {
+ innerHTML: message + (link ? ` [More info]` : '') +
+ `
+ Check the 4chan X wiki for alternative solutions.
+
+[delete post] [delete all]` + }); + (this.errors || (this.errors = [])).push(div); + const [rm, rmAll] = Array.from($$('a', div)); + $.on(div, 'click', () => { + if (QR.posts.includes(this)) { return this.select(); } + }); + $.on(rm, 'click', e => { + e.stopPropagation(); + if (QR.posts.includes(this)) { return this.rm(); } + }); + $.on(rmAll, 'click', QR.post.rmErrored); + return QR.error(div, true); + } + + fileError(message, link) { + return this.error('file-error', `${this.filename}: ${message}`, link); + } + + dismissErrors(test = () => true) { + if (this.errors) { + for (var error of this.errors) { + if (doc.contains(error) && test(error)) { + error.parentNode.previousElementSibling.click(); + } + } + } + } + + setFile(file) { + this.file = file; + if (Conf['Randomize Filename'] && (g.BOARD.ID !== 'f')) { + let ext; + this.filename = `${Date.now() - Math.floor(Math.random() * 365 * DAY)}`; + if (ext = this.file.name.match(QR.validExtension)) { this.filename += ext[0]; } + } else { + this.filename = this.file.name; + } + this.filesize = $.bytesToString(this.file.size); + this.checkSize(); + $.addClass(this.nodes.el, 'has-file'); + QR.captcha.moreNeeded(); + URL.revokeObjectURL(this.URL); + this.saveFilename(); + if (this === QR.selected) { + this.showFileData(); + } else { + this.updateFilename(); + } + this.rmMetadata(); + this.nodes.el.dataset.type = this.file.type; + this.nodes.el.style.backgroundImage = ''; + if (!QR.mimeTypes.includes(this.file.type)) { + this.fileError('Unsupported file type.'); + } else if (/^(image|video)\//.test(this.file.type)) { + this.readFile(); + } + return this.preventAutoPost(); + } + + checkSize() { + let max = QR.max_size; + if (/^video\//.test(this.file.type)) { max = Math.min(max, QR.max_size_video); } + if (this.file.size > max) { + return this.fileError(`File too large (file: ${this.filesize}, max: ${$.bytesToString(max)}).`); + } + } + + readFile() { + const isVideo = /^video\//.test(this.file.type); + const el = $.el(isVideo ? 'video' : 'img'); + if (isVideo && !el.canPlayType(this.file.type)) { return; } + + const event = isVideo ? 'loadeddata' : 'load'; + var onload = () => { + $.off(el, event, onload); + $.off(el, 'error', onerror); + this.checkDimensions(el); + this.setThumbnail(el); + return $.event('QRMetadata', null, this.nodes.el); + }; + var onerror = () => { + $.off(el, event, onload); + $.off(el, 'error', onerror); + this.fileError(`Corrupt ${isVideo ? 'video' : 'image'} or error reading metadata.`, meta.faq + '#error-reading-metadata'); + URL.revokeObjectURL(el.src); + // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289 + this.nodes.el.removeAttribute('data-height'); + return $.event('QRMetadata', null, this.nodes.el); + }; + this.nodes.el.dataset.height = 'loading'; + $.on(el, event, onload); + $.on(el, 'error', onerror); + return el.src = URL.createObjectURL(this.file); + } + + checkDimensions(el) { + let height, width; + if (el.tagName === 'IMG') { + ({ height, width } = el); + this.nodes.el.dataset.height = height; + this.nodes.el.dataset.width = width; + if ((height > QR.max_height) || (width > QR.max_width)) { + this.fileError(`Image too large (image: ${height}x${width}px, max: ${QR.max_height}x${QR.max_width}px)`); + } + if ((height < QR.min_height) || (width < QR.min_width)) { + return this.fileError(`Image too small (image: ${height}x${width}px, min: ${QR.min_height}x${QR.min_width}px)`); + } + } else { + const { videoHeight, videoWidth, duration } = el; + this.nodes.el.dataset.height = videoHeight; + this.nodes.el.dataset.width = videoWidth; + this.nodes.el.dataset.duration = duration; + const max_height = Math.min(QR.max_height, QR.max_height_video); + const max_width = Math.min(QR.max_width, QR.max_width_video); + if ((videoHeight > max_height) || (videoWidth > max_width)) { + this.fileError(`Video too large (video: ${videoHeight}x${videoWidth}px, max: ${max_height}x${max_width}px)`); + } + if ((videoHeight < QR.min_height) || (videoWidth < QR.min_width)) { + this.fileError(`Video too small (video: ${videoHeight}x${videoWidth}px, min: ${QR.min_height}x${QR.min_width}px)`); + } + if (!isFinite(duration)) { + this.fileError('Video lacks duration metadata (try remuxing)'); + } else if (duration > QR.max_duration_video) { + this.fileError(`Video too long (video: ${duration}s, max: ${QR.max_duration_video}s)`); + } + if (BoardConfig.noAudio(g.BOARD.ID) && $.hasAudio(el)) { + return this.fileError('Audio not allowed'); + } + } + } + + setThumbnail(el) { + // Create a redimensioned thumbnail. + let height, width; + const isVideo = el.tagName === 'VIDEO'; + + // Generate thumbnails only if they're really big. + // Resized pictures through canvases look like ass, + // so we generate thumbnails `s` times bigger then expected + // to avoid crappy resized quality. + let s = 90 * 2 * window.devicePixelRatio; + if (this.file.type === 'image/gif') { s *= 3; } // let them animate + if (isVideo) { + height = el.videoHeight; + width = el.videoWidth; + } else { + ({ height, width } = el); + if ((height < s) || (width < s)) { + this.URL = el.src; + this.nodes.el.style.backgroundImage = `url(${this.URL})`; + return; + } + } + + if (height <= width) { + width = (s / height) * width; + height = s; + } else { + height = (s / width) * height; + width = s; + } + const cv = $.el('canvas'); + cv.height = height; + cv.width = width; + cv.getContext('2d').drawImage(el, 0, 0, width, height); + URL.revokeObjectURL(el.src); + return cv.toBlob(blob => { + this.URL = URL.createObjectURL(blob); + return this.nodes.el.style.backgroundImage = `url(${this.URL})`; + }); + } + + rmFile() { + if (this.isLocked) { return; } + delete this.file; + delete this.filename; + delete this.filesize; + this.nodes.el.removeAttribute('title'); + QR.nodes.filename.removeAttribute('title'); + this.rmMetadata(); + this.nodes.el.style.backgroundImage = ''; + $.rmClass(this.nodes.el, 'has-file'); + this.showFileData(); + URL.revokeObjectURL(this.URL); + this.dismissErrors(error => $.hasClass(error, 'file-error')); + return this.preventAutoPost(); + } + + rmMetadata() { + for (var attr of ['type', 'height', 'width', 'duration']) { + // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289 + this.nodes.el.removeAttribute(`data-${attr}`); + } + } + + saveFilename() { + this.file.newName = (this.filename || '').replace(/[/\\]/g, '-'); + if (!QR.validExtension.test(this.filename)) { + // 4chan will truncate the filename if it has no extension. + return this.file.newName += `.${$.getOwn(QR.extensionFromType, this.file.type) || 'jpg'}`; + } + } + + updateFilename() { + const long = `${this.filename} (${this.filesize})`; + this.nodes.el.title = long; + if (this !== QR.selected) { return; } + return QR.nodes.filename.title = long; + } + + showFileData() { + if (this.file) { + this.updateFilename(); + QR.nodes.filename.value = this.filename; + $.addClass(QR.nodes.oekaki, 'has-file'); + $.addClass(QR.nodes.fileSubmit, 'has-file'); + } else { + $.rmClass(QR.nodes.oekaki, 'has-file'); + $.rmClass(QR.nodes.fileSubmit, 'has-file'); + } + if (this.file?.source != null) { + QR.nodes.fileSubmit.dataset.source = this.file.source; + } else { + QR.nodes.fileSubmit.removeAttribute('data-source'); + } + return QR.nodes.spoiler.checked = this.spoiler; + } + + pasteText(file) { + this.pasting = true; + this.preventAutoPost(); + const reader = new FileReader(); + reader.onload = e => { + const { result } = e.target; + this.setComment((this.com ? `${this.com}\n${result}` : result)); + return delete this.pasting; + }; + return reader.readAsText(file); + } + + dragStart(e) { + const { left, top } = this.getBoundingClientRect(); + e.dataTransfer.setDragImage(this, e.clientX - left, e.clientY - top); + return $.addClass(this, 'drag'); + } + dragEnd() { return $.rmClass(this, 'drag'); } + dragEnter() { return $.addClass(this, 'over'); } + dragLeave() { return $.rmClass(this, 'over'); } + + dragOver(e) { + e.preventDefault(); + return e.dataTransfer.dropEffect = 'move'; + } + + drop() { + $.rmClass(this, 'over'); + if (!this.draggable) { return; } + const el = $('.drag', this.parentNode); + const index = el => [...Array.from(el.parentNode.children)].indexOf(el); + const oldIndex = index(el); + const newIndex = index(this); + if (QR.posts[oldIndex].isLocked || QR.posts[newIndex].isLocked) { return; } + (oldIndex < newIndex ? $.after : $.before)(this, el); + const post = QR.posts.splice(oldIndex, 1)[0]; + QR.posts.splice(newIndex, 0, post); + QR.status(); + return QR.captcha.updateThread?.(); + } } + }; +export default QR; diff --git a/src/Posting/QR.oekaki.js b/src/Posting/QR.oekaki.js deleted file mode 100644 index e1342fa394..0000000000 --- a/src/Posting/QR.oekaki.js +++ /dev/null @@ -1,183 +0,0 @@ -/* - * decaffeinate suggestions: - * DS102: Remove unnecessary code created because of implicit returns - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md - */ -QR.oekaki = { - menu: { - init() { - if (!['index', 'thread'].includes(g.VIEW) || !Conf['Menu'] || !Conf['Edit Link'] || !Conf['Quick Reply']) { return; } - - const a = $.el('a', { - className: 'edit-link', - href: 'javascript:;', - textContent: 'Edit image' - } - ); - $.on(a, 'click', this.editFile); - - return Menu.menu.addEntry({ - el: a, - order: 90, - open(post) { - QR.oekaki.menu.post = post; - const {file} = post; - return QR.postingIsEnabled && !!file && (file.isImage || file.isVideo); - } - }); - }, - - editFile() { - const {post} = QR.oekaki.menu; - QR.quote.call(post.nodes.post); - const {isVideo} = post.file; - const currentTime = post.file.fullImage?.currentTime || 0; - return CrossOrigin.file(post.file.url, function(blob) { - if (!blob) { - return QR.error("Can't load file."); - } else if (isVideo) { - const video = $.el('video'); - $.on(video, 'loadedmetadata', function() { - $.on(video, 'seeked', function() { - const canvas = $.el('canvas', { - width: video.videoWidth, - height: video.videoHeight - } - ); - canvas.getContext('2d').drawImage(video, 0, 0); - return canvas.toBlob(function(snapshot) { - snapshot.name = post.file.name.replace(/\.\w+$/, '') + '.png'; - QR.handleFiles([snapshot]); - return QR.oekaki.edit(); - }); - }); - return video.currentTime = currentTime; - }); - $.on(video, 'error', () => QR.openError()); - return video.src = URL.createObjectURL(blob); - } else { - blob.name = post.file.name; - QR.handleFiles([blob]); - return QR.oekaki.edit(); - } - }); - } - }, - - setup() { - return $.global(function() { - const {FCX} = window; - FCX.oekakiCB = () => window.Tegaki.flatten().toBlob(function(file) { - const source = `oekaki-${Date.now()}`; - FCX.oekakiLatest = source; - return document.dispatchEvent(new CustomEvent('QRSetFile', { - bubbles: true, - detail: {file, name: FCX.oekakiName, source} - }));}); - if (window.Tegaki) { - return document.querySelector('#qr .oekaki').hidden = false; - } - }); - }, - - load(cb) { - if ($('script[src^="//s.4cdn.org/js/tegaki"]', d.head)) { - return cb(); - } else { - const style = $.el('link', { - rel: 'stylesheet', - href: `//s.4cdn.org/css/tegaki.${Date.now()}.css` - } - ); - const script = $.el('script', - {src: `//s.4cdn.org/js/tegaki.min.${Date.now()}.js`}); - let n = 0; - const onload = function() { - if (++n === 2) { return cb(); } - }; - $.on(style, 'load', onload); - $.on(script, 'load', onload); - return $.add(d.head, [style, script]); - } - }, - - draw() { - return $.global(function() { - const {Tegaki, FCX} = window; - if (Tegaki.bg) { Tegaki.destroy(); } - FCX.oekakiName = 'tegaki.png'; - return Tegaki.open({ - onDone: FCX.oekakiCB, - onCancel() { return Tegaki.bgColor = '#ffffff'; }, - width: +document.querySelector('#qr [name=oekaki-width]').value, - height: +document.querySelector('#qr [name=oekaki-height]').value, - bgColor: - document.querySelector('#qr [name=oekaki-bg]').checked ? - document.querySelector('#qr [name=oekaki-bgcolor]').value - : - 'transparent' - }); - }); - }, - - button() { - if (QR.selected.file) { - return QR.oekaki.edit(); - } else { - return QR.oekaki.toggle(); - } - }, - - edit() { - return QR.oekaki.load(() => $.global(function() { - const {Tegaki, FCX} = window; - const name = document.getElementById('qr-filename').value.replace(/\.\w+$/, '') + '.png'; - const {source} = document.getElementById('file-n-submit').dataset; - const error = content => document.dispatchEvent(new CustomEvent('CreateNotification', { - bubbles: true, - detail: {type: 'warning', content, lifetime: 20} - })); - var cb = function(e) { - if (e) { this.removeEventListener('QRMetadata', cb, false); } - const selected = document.getElementById('selected'); - if (!selected?.dataset.type) { return error('No file to edit.'); } - if (!/^(image|video)\//.test(selected.dataset.type)) { return error('Not an image.'); } - if (!selected.dataset.height) { return error('Metadata not available.'); } - if (selected.dataset.height === 'loading') { - selected.addEventListener('QRMetadata', cb, false); - return; - } - if (Tegaki.bg) { Tegaki.destroy(); } - FCX.oekakiName = name; - Tegaki.open({ - onDone: FCX.oekakiCB, - onCancel() { return Tegaki.bgColor = '#ffffff'; }, - width: +selected.dataset.width, - height: +selected.dataset.height, - bgColor: 'transparent' - }); - const canvas = document.createElement('canvas'); - canvas.width = (canvas.naturalWidth = +selected.dataset.width); - canvas.height = (canvas.naturalHeight = +selected.dataset.height); - canvas.hidden = true; - document.body.appendChild(canvas); - canvas.addEventListener('QRImageDrawn', function() { - this.remove(); - return Tegaki.onOpenImageLoaded.call(this); - } - , false); - return canvas.dispatchEvent(new CustomEvent('QRDrawFile', {bubbles: true})); - }; - if (Tegaki.bg && (Tegaki.onDoneCb === FCX.oekakiCB) && (source === FCX.oekakiLatest)) { - FCX.oekakiName = name; - return Tegaki.resume(); - } else { - return cb(); - } - })); - }, - - toggle() { - return QR.oekaki.load(() => QR.nodes.oekaki.hidden = !QR.nodes.oekaki.hidden); - } -}; diff --git a/src/Posting/QR.persona.js b/src/Posting/QR.persona.js deleted file mode 100644 index 174daf4e49..0000000000 --- a/src/Posting/QR.persona.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * decaffeinate suggestions: - * DS101: Remove unnecessary use of Array.from - * DS102: Remove unnecessary code created because of implicit returns - * DS104: Avoid inline assignments - * DS204: Change includes calls to have a more natural evaluation order - * DS207: Consider shorter variations of null checks - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md - */ -QR.persona = { - always: {}, - types: { - name: [], - email: [], - sub: [] - }, - - init() { - if (!Conf['Quick Reply'] && (!Conf['Menu'] || !Conf['Delete Link'])) { return; } - for (var item of Conf['QR.personas'].split('\n')) { - QR.persona.parseItem(item.trim()); - } - }, - - parseItem(item) { - let match, needle, type, val; - if (item[0] === '#') { return; } - if (!(match = item.match(/(name|options|email|subject|password):"(.*)"/i))) { return; } - [match, type, val] = Array.from(match); - - // Don't mix up item settings with val. - item = item.replace(match, ''); - - const boards = item.match(/boards:([^;]+)/i)?.[1].toLowerCase() || 'global'; - if ((boards !== 'global') && (needle = g.BOARD.ID, !boards.split(',').includes(needle))) { return; } - - - if (type === 'password') { - QR.persona.pwd = val; - return; - } - - if (type === 'options') { type = 'email'; } - if (type === 'subject') { type = 'sub'; } - - if (/always/i.test(item)) { - QR.persona.always[type] = val; - } - - if (!QR.persona.types[type].includes(val)) { - return QR.persona.types[type].push(val); - } - }, - - load() { - for (var type in QR.persona.types) { - var arr = QR.persona.types[type]; - var list = $(`#list-${type}`, QR.nodes.el); - for (var val of arr) { - if (val) { - $.add(list, $.el('option', - {textContent: val}) - ); - } - } - } - }, - - getPassword() { - let m; - if (QR.persona.pwd != null) { - return QR.persona.pwd; - } else if (m = d.cookie.match(/4chan_pass=([^;]+)/)) { - return decodeURIComponent(m[1]); - } else { - return ''; - } - }, - - get(cb) { - return $.get('QR.persona', {}, ({'QR.persona': persona}) => cb(persona)); - }, - - set(post) { - return $.get('QR.persona', {}, function({'QR.persona': persona}) { - persona = { - name: post.name, - flag: post.flag - }; - return $.set('QR.persona', persona); - }); - } -}; diff --git a/src/Posting/QR.post.js b/src/Posting/QR.post.js deleted file mode 100644 index 41c3c29a23..0000000000 --- a/src/Posting/QR.post.js +++ /dev/null @@ -1,517 +0,0 @@ -/* - * decaffeinate suggestions: - * DS101: Remove unnecessary use of Array.from - * DS102: Remove unnecessary code created because of implicit returns - * DS205: Consider reworking code to avoid use of IIFEs - * DS207: Consider shorter variations of null checks - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md - */ -QR.post = class { - constructor(select) { - this.select = this.select.bind(this); - const el = $.el('a', { - className: 'qr-preview', - draggable: true, - href: 'javascript:;' - } - ); - $.extend(el, {innerHTML: ''}); - - this.nodes = { - el, - rm: el.firstChild, - spoiler: $('.qr-preview-spoiler input', el), - span: el.lastChild - }; - - $.on(el, 'click', this.select); - $.on(this.nodes.rm, 'click', e => { e.stopPropagation(); return this.rm(); }); - $.on(this.nodes.spoiler, 'change', e => { - this.spoiler = e.target.checked; - if (this === QR.selected) { QR.nodes.spoiler.checked = this.spoiler; } - return this.preventAutoPost(); - }); - for (var label of $$('label', el)) { - $.on(label, 'click', e => e.stopPropagation()); - } - $.add(QR.nodes.dumpList, el); - - for (var event of ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']) { - $.on(el, event.toLowerCase(), this[event]); - } - - this.thread = g.VIEW === 'thread' ? - g.THREADID - : - 'new'; - - const prev = QR.posts[QR.posts.length - 1]; - QR.posts.push(this); - this.nodes.spoiler.checked = (this.spoiler = prev && Conf['Remember Spoiler'] ? - prev.spoiler - : - false); - QR.persona.get(persona => { - this.name = 'name' in QR.persona.always ? - QR.persona.always.name - : prev ? - prev.name - : - persona.name; - - this.email = 'email' in QR.persona.always ? - QR.persona.always.email - : - ''; - - this.sub = 'sub' in QR.persona.always ? - QR.persona.always.sub - : - ''; - - if (QR.nodes.flag) { - this.flag = (() => { - if (prev) { - return prev.flag; - } else if (persona.flag && persona.flag in g.BOARD.config.board_flags) { - return persona.flag; - } - })(); - } - if (QR.selected === this) { return this.load(); } - }); // load persona - if (select) { this.select(); } - this.unlock(); - QR.captcha.moreNeeded(); - } - - rm() { - this.delete(); - const index = QR.posts.indexOf(this); - if (QR.posts.length === 1) { - new QR.post(true); - $.rmClass(QR.nodes.el, 'dump'); - } else if (this === QR.selected) { - (QR.posts[index-1] || QR.posts[index+1]).select(); - } - QR.posts.splice(index, 1); - QR.status(); - return QR.captcha.updateThread?.(); - } - - delete() { - $.rm(this.nodes.el); - URL.revokeObjectURL(this.URL); - return this.dismissErrors(); - } - - lock(lock=true) { - this.isLocked = lock; - if (this !== QR.selected) { return; } - for (var name of ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag']) { - var node; - if ((node = QR.nodes[name])) { - node.disabled = lock; - } - } - this.nodes.rm.style.visibility = lock ? 'hidden' : ''; - this.nodes.spoiler.disabled = lock; - return this.nodes.el.draggable = !lock; - } - - unlock() { - return this.lock(false); - } - - select() { - if (QR.selected) { - QR.selected.nodes.el.removeAttribute('id'); - QR.selected.forceSave(); - } - QR.selected = this; - this.lock(this.isLocked); - this.nodes.el.id = 'selected'; - // Scroll the list to center the focused post. - const rectEl = this.nodes.el.getBoundingClientRect(); - const rectList = this.nodes.el.parentNode.getBoundingClientRect(); - this.nodes.el.parentNode.scrollLeft += (rectEl.left + (rectEl.width/2)) - rectList.left - (rectList.width/2); - return this.load(); - } - - load() { - // Load this post's values. - - for (var name of ['thread', 'name', 'email', 'sub', 'com', 'filename', 'flag']) { - var node; - if (!(node = QR.nodes[name])) { continue; } - node.value = this[name] || node.dataset.default || ''; - } - - (this.thread !== 'new' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread'); - - this.showFileData(); - return QR.characterCount(); - } - - save(input, forced) { - if (input.type === 'checkbox') { - this.spoiler = input.checked; - return; - } - const {name} = input.dataset; - if (!['thread', 'name', 'email', 'sub', 'com', 'filename', 'flag'].includes(name)) { return; } - const prev = this[name] || input.dataset.default || null; - this[name] = input.value || input.dataset.default || null; - switch (name) { - case 'thread': - (this.thread !== 'new' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread'); - QR.status(); - QR.captcha.updateThread?.(); - break; - case 'com': - this.updateComment(); - break; - case 'filename': - if (!this.file) { return; } - this.saveFilename(); - this.updateFilename(); - break; - case 'name': case 'flag': - if (this[name] !== prev) { // only save manual changes, not values filled in by persona settings - QR.persona.set(this); - } - break; - } - if (!forced) { return this.preventAutoPost(); } - } - - forceSave() { - if (this !== QR.selected) { return; } - // Do this in case people use extensions - // that do not trigger the `input` event. - for (var name of ['thread', 'name', 'email', 'sub', 'com', 'filename', 'spoiler', 'flag']) { - var node; - if (!(node = QR.nodes[name])) { continue; } - this.save(node, true); - } - } - - preventAutoPost() { - // Disable auto-posting if you're editing the first post - // during the last 5 seconds of the cooldown. - if (QR.cooldown.auto && (this === QR.posts[0])) { - QR.cooldown.update(); // adding/removing file can change cooldown - if (QR.cooldown.seconds <= 5) { return QR.cooldown.auto = false; } - } - } - - setComment(com) { - this.com = com || null; - if (this === QR.selected) { - QR.nodes.com.value = this.com; - } - return this.updateComment(); - } - - updateComment() { - if (this === QR.selected) { - QR.characterCount(); - } - this.nodes.span.textContent = this.com; - QR.captcha.moreNeeded(); - if (QR.captcha === Captcha.v2) { - return Captcha.cache.prerequest(); - } - } - - isOnlyQuotes() { - return (this.com || '').trim() === (this.quotedText || '').trim(); - } - - static rmErrored(e) { - e.stopPropagation(); - for (let i = QR.posts.length - 1; i >= 0; i--) { - var errors; - var post = QR.posts[i]; - if ((errors = post.errors)) { - for (var error of errors) { - if (doc.contains(error)) { - post.rm(); - break; - } - } - } - } - } - - error(className, message, link) { - const div = $.el('div', {className}); - $.extend(div, {innerHTML: '${message}?{link}{ [More info]}
[delete post] [delete all]'}); - (this.errors || (this.errors = [])).push(div); - const [rm, rmAll] = Array.from($$('a', div)); - $.on(div, 'click', () => { - if (QR.posts.includes(this)) { return this.select(); } - }); - $.on(rm, 'click', e => { - e.stopPropagation(); - if (QR.posts.includes(this)) { return this.rm(); } - }); - $.on(rmAll, 'click', QR.post.rmErrored); - return QR.error(div, true); - } - - fileError(message, link) { - return this.error('file-error', `${this.filename}: ${message}`, link); - } - - dismissErrors(test = () => true) { - if (this.errors) { - for (var error of this.errors) { - if (doc.contains(error) && test(error)) { - error.parentNode.previousElementSibling.click(); - } - } - } - } - - setFile(file) { - this.file = file; - if (Conf['Randomize Filename'] && (g.BOARD.ID !== 'f')) { - let ext; - this.filename = `${Date.now() - Math.floor(Math.random() * 365 * $.DAY)}`; - if (ext = this.file.name.match(QR.validExtension)) { this.filename += ext[0]; } - } else { - this.filename = this.file.name; - } - this.filesize = $.bytesToString(this.file.size); - this.checkSize(); - $.addClass(this.nodes.el, 'has-file'); - QR.captcha.moreNeeded(); - URL.revokeObjectURL(this.URL); - this.saveFilename(); - if (this === QR.selected) { - this.showFileData(); - } else { - this.updateFilename(); - } - this.rmMetadata(); - this.nodes.el.dataset.type = this.file.type; - this.nodes.el.style.backgroundImage = ''; - if (!QR.mimeTypes.includes(this.file.type)) { - this.fileError('Unsupported file type.'); - } else if (/^(image|video)\//.test(this.file.type)) { - this.readFile(); - } - return this.preventAutoPost(); - } - - checkSize() { - let max = QR.max_size; - if (/^video\//.test(this.file.type)) { max = Math.min(max, QR.max_size_video); } - if (this.file.size > max) { - return this.fileError(`File too large (file: ${this.filesize}, max: ${$.bytesToString(max)}).`); - } - } - - readFile() { - const isVideo = /^video\//.test(this.file.type); - const el = $.el(isVideo ? 'video' : 'img'); - if (isVideo && !el.canPlayType(this.file.type)) { return; } - - const event = isVideo ? 'loadeddata' : 'load'; - var onload = () => { - $.off(el, event, onload); - $.off(el, 'error', onerror); - this.checkDimensions(el); - this.setThumbnail(el); - return $.event('QRMetadata', null, this.nodes.el); - }; - var onerror = () => { - $.off(el, event, onload); - $.off(el, 'error', onerror); - this.fileError(`Corrupt ${isVideo ? 'video' : 'image'} or error reading metadata.`, '<%= meta.faq %>#error-reading-metadata'); - URL.revokeObjectURL(el.src); - // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289 - this.nodes.el.removeAttribute('data-height'); - return $.event('QRMetadata', null, this.nodes.el); - }; - this.nodes.el.dataset.height = 'loading'; - $.on(el, event, onload); - $.on(el, 'error', onerror); - return el.src = URL.createObjectURL(this.file); - } - - checkDimensions(el) { - let height, width; - if (el.tagName === 'IMG') { - ({height, width} = el); - this.nodes.el.dataset.height = height; - this.nodes.el.dataset.width = width; - if ((height > QR.max_height) || (width > QR.max_width)) { - this.fileError(`Image too large (image: ${height}x${width}px, max: ${QR.max_height}x${QR.max_width}px)`); - } - if ((height < QR.min_height) || (width < QR.min_width)) { - return this.fileError(`Image too small (image: ${height}x${width}px, min: ${QR.min_height}x${QR.min_width}px)`); - } - } else { - const {videoHeight, videoWidth, duration} = el; - this.nodes.el.dataset.height = videoHeight; - this.nodes.el.dataset.width = videoWidth; - this.nodes.el.dataset.duration = duration; - const max_height = Math.min(QR.max_height, QR.max_height_video); - const max_width = Math.min(QR.max_width, QR.max_width_video); - if ((videoHeight > max_height) || (videoWidth > max_width)) { - this.fileError(`Video too large (video: ${videoHeight}x${videoWidth}px, max: ${max_height}x${max_width}px)`); - } - if ((videoHeight < QR.min_height) || (videoWidth < QR.min_width)) { - this.fileError(`Video too small (video: ${videoHeight}x${videoWidth}px, min: ${QR.min_height}x${QR.min_width}px)`); - } - if (!isFinite(duration)) { - this.fileError('Video lacks duration metadata (try remuxing)'); - } else if (duration > QR.max_duration_video) { - this.fileError(`Video too long (video: ${duration}s, max: ${QR.max_duration_video}s)`); - } - if (BoardConfig.noAudio(g.BOARD.ID) && $.hasAudio(el)) { - return this.fileError('Audio not allowed'); - } - } - } - - setThumbnail(el) { - // Create a redimensioned thumbnail. - let height, width; - const isVideo = el.tagName === 'VIDEO'; - - // Generate thumbnails only if they're really big. - // Resized pictures through canvases look like ass, - // so we generate thumbnails `s` times bigger then expected - // to avoid crappy resized quality. - let s = 90 * 2 * window.devicePixelRatio; - if (this.file.type === 'image/gif') { s *= 3; } // let them animate - if (isVideo) { - height = el.videoHeight; - width = el.videoWidth; - } else { - ({height, width} = el); - if ((height < s) || (width < s)) { - this.URL = el.src; - this.nodes.el.style.backgroundImage = `url(${this.URL})`; - return; - } - } - - if (height <= width) { - width = (s / height) * width; - height = s; - } else { - height = (s / width) * height; - width = s; - } - const cv = $.el('canvas'); - cv.height = height; - cv.width = width; - cv.getContext('2d').drawImage(el, 0, 0, width, height); - URL.revokeObjectURL(el.src); - return cv.toBlob(blob => { - this.URL = URL.createObjectURL(blob); - return this.nodes.el.style.backgroundImage = `url(${this.URL})`; - }); - } - - rmFile() { - if (this.isLocked) { return; } - delete this.file; - delete this.filename; - delete this.filesize; - this.nodes.el.removeAttribute('title'); - QR.nodes.filename.removeAttribute('title'); - this.rmMetadata(); - this.nodes.el.style.backgroundImage = ''; - $.rmClass(this.nodes.el, 'has-file'); - this.showFileData(); - URL.revokeObjectURL(this.URL); - this.dismissErrors(error => $.hasClass(error, 'file-error')); - return this.preventAutoPost(); - } - - rmMetadata() { - for (var attr of ['type', 'height', 'width', 'duration']) { - // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289 - this.nodes.el.removeAttribute(`data-${attr}`); - } - } - - saveFilename() { - this.file.newName = (this.filename || '').replace(/[/\\]/g, '-'); - if (!QR.validExtension.test(this.filename)) { - // 4chan will truncate the filename if it has no extension. - return this.file.newName += `.${$.getOwn(QR.extensionFromType, this.file.type) || 'jpg'}`; - } - } - - updateFilename() { - const long = `${this.filename} (${this.filesize})`; - this.nodes.el.title = long; - if (this !== QR.selected) { return; } - return QR.nodes.filename.title = long; - } - - showFileData() { - if (this.file) { - this.updateFilename(); - QR.nodes.filename.value = this.filename; - $.addClass(QR.nodes.oekaki, 'has-file'); - $.addClass(QR.nodes.fileSubmit, 'has-file'); - } else { - $.rmClass(QR.nodes.oekaki, 'has-file'); - $.rmClass(QR.nodes.fileSubmit, 'has-file'); - } - if (this.file?.source != null) { - QR.nodes.fileSubmit.dataset.source = this.file.source; - } else { - QR.nodes.fileSubmit.removeAttribute('data-source'); - } - return QR.nodes.spoiler.checked = this.spoiler; - } - - pasteText(file) { - this.pasting = true; - this.preventAutoPost(); - const reader = new FileReader(); - reader.onload = e => { - const {result} = e.target; - this.setComment((this.com ? `${this.com}\n${result}` : result)); - return delete this.pasting; - }; - return reader.readAsText(file); - } - - dragStart(e) { - const {left, top} = this.getBoundingClientRect(); - e.dataTransfer.setDragImage(this, e.clientX - left, e.clientY - top); - return $.addClass(this, 'drag'); - } - dragEnd() { return $.rmClass(this, 'drag'); } - dragEnter() { return $.addClass(this, 'over'); } - dragLeave() { return $.rmClass(this, 'over'); } - - dragOver(e) { - e.preventDefault(); - return e.dataTransfer.dropEffect = 'move'; - } - - drop() { - $.rmClass(this, 'over'); - if (!this.draggable) { return; } - const el = $('.drag', this.parentNode); - const index = el => [...Array.from(el.parentNode.children)].indexOf(el); - const oldIndex = index(el); - const newIndex = index(this); - if (QR.posts[oldIndex].isLocked || QR.posts[newIndex].isLocked) { return; } - (oldIndex < newIndex ? $.after : $.before)(this, el); - const post = QR.posts.splice(oldIndex, 1)[0]; - QR.posts.splice(newIndex, 0, post); - QR.status(); - return QR.captcha.updateThread?.(); - } -}; diff --git a/src/Quotelinks/QuoteBacklink.js b/src/Quotelinks/QuoteBacklink.js index 213cb5c905..a0fe8b646d 100644 --- a/src/Quotelinks/QuoteBacklink.js +++ b/src/Quotelinks/QuoteBacklink.js @@ -1,3 +1,11 @@ +import Callbacks from "../classes/Callbacks"; +import { g, Conf, doc } from "../globals/globals"; +import $ from "../platform/$"; +import { dict } from "../platform/helpers"; +import QuoteInline from "./QuoteInline"; +import QuotePreview from "./QuotePreview"; +import QuoteYou from "./QuoteYou"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -15,7 +23,7 @@ var QuoteBacklink = { // Second callback adds relevant containers into posts. // This is is so that fetched posts can get their backlinks, // and that as much backlinks are appended in the background as possible. - containers: $.dict(), + containers: dict(), init() { if (!['index', 'thread'].includes(g.VIEW) || !Conf['Quote Backlinks']) { return; } @@ -91,3 +99,4 @@ var QuoteBacklink = { (this.containers[id] = $.el('span', {className: 'container'})); } }; +export default QuoteBacklink; diff --git a/src/Quotelinks/QuoteCT.js b/src/Quotelinks/QuoteCT.js index 2af14e5c47..00eaba5224 100644 --- a/src/Quotelinks/QuoteCT.js +++ b/src/Quotelinks/QuoteCT.js @@ -1,3 +1,9 @@ +import $ from "../platform/$"; +import Callbacks from "../classes/Callbacks"; +import ExpandComment from "../Miscellaneous/ExpandComment"; +import { g, Conf } from "../globals/globals"; +import Get from "../General/Get"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -39,3 +45,4 @@ var QuoteCT = { } } }; +export default QuoteCT; diff --git a/src/Quotelinks/QuoteInline.js b/src/Quotelinks/QuoteInline.js index 1d47fdc327..131f2d7e2b 100644 --- a/src/Quotelinks/QuoteInline.js +++ b/src/Quotelinks/QuoteInline.js @@ -1,3 +1,11 @@ +import Callbacks from "../classes/Callbacks"; +import Fetcher from "../classes/Fetcher"; +import Get from "../General/Get"; +import { g, Conf, doc } from "../globals/globals"; +import ExpandComment from "../Miscellaneous/ExpandComment"; +import Unread from "../Monitoring/Unread"; +import $ from "../platform/$"; + /* * decaffeinate suggestions: * DS101: Remove unnecessary use of Array.from @@ -143,3 +151,4 @@ var QuoteInline = { } } }; +export default QuoteInline; diff --git a/src/Quotelinks/QuoteOP.js b/src/Quotelinks/QuoteOP.js index beb953a10a..5c986f8e64 100644 --- a/src/Quotelinks/QuoteOP.js +++ b/src/Quotelinks/QuoteOP.js @@ -1,3 +1,9 @@ +import Callbacks from "../classes/Callbacks"; +import Get from "../General/Get"; +import { g, Conf } from "../globals/globals"; +import ExpandComment from "../Miscellaneous/ExpandComment"; +import $ from "../platform/$"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -52,3 +58,4 @@ var QuoteOP = { } } }; +export default QuoteOP; diff --git a/src/Quotelinks/QuotePreview.js b/src/Quotelinks/QuotePreview.js index a73d822f1b..9128704a59 100644 --- a/src/Quotelinks/QuotePreview.js +++ b/src/Quotelinks/QuotePreview.js @@ -1,3 +1,12 @@ +import Callbacks from "../classes/Callbacks"; +import Fetcher from "../classes/Fetcher"; +import Get from "../General/Get"; +import Header from "../General/Header"; +import UI from "../General/UI"; +import { Conf, d, g } from "../globals/globals"; +import ExpandComment from "../Miscellaneous/ExpandComment"; +import $ from "../platform/$"; + /* * decaffeinate suggestions: * DS101: Remove unnecessary use of Array.from @@ -84,3 +93,4 @@ var QuotePreview = { } } }; +export default QuotePreview; diff --git a/src/Quotelinks/QuoteStrikeThrough.js b/src/Quotelinks/QuoteStrikeThrough.js index 2cb38efb48..ceabbef4df 100644 --- a/src/Quotelinks/QuoteStrikeThrough.js +++ b/src/Quotelinks/QuoteStrikeThrough.js @@ -1,3 +1,8 @@ +import Callbacks from "../classes/Callbacks"; +import Get from "../General/Get"; +import { g, Conf } from "../globals/globals"; +import $ from "../platform/$"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -24,3 +29,4 @@ const QuoteStrikeThrough = { } } }; +export default QuoteStrikeThrough; diff --git a/src/Quotelinks/QuoteThreading.js b/src/Quotelinks/QuoteThreading.js index b170da2597..4cf265fdc6 100644 --- a/src/Quotelinks/QuoteThreading.js +++ b/src/Quotelinks/QuoteThreading.js @@ -1,3 +1,12 @@ +import Callbacks from "../classes/Callbacks"; +import RandomAccessList from "../classes/RandomAccessList"; +import Header from "../General/Header"; +import { Conf, d, g } from "../globals/globals"; +import ReplyPruning from "../Monitoring/ReplyPruning"; +import Unread from "../Monitoring/Unread"; +import $ from "../platform/$"; +import { dict } from "../platform/helpers"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -46,9 +55,9 @@ var QuoteThreading = { }); }, - parent: $.dict(), - children: $.dict(), - inserted: $.dict(), + parent: dict(), + children: dict(), + inserted: dict(), toggleThreading() { return this.setThreadingState(!Conf['Thread Quotes']); @@ -181,7 +190,7 @@ var QuoteThreading = { } else { const nodes = []; Unread.order = new RandomAccessList(); - QuoteThreading.inserted = $.dict(); + QuoteThreading.inserted = dict(); posts.forEach(function(post) { if (post.isFetchedQuote) { return; } Unread.order.push(post); @@ -203,3 +212,4 @@ var QuoteThreading = { return Unread.update(); } }; +export default QuoteThreading; diff --git a/src/Quotelinks/QuoteYou.js b/src/Quotelinks/QuoteYou.js index f44807f2b3..b6d9b9a6fd 100644 --- a/src/Quotelinks/QuoteYou.js +++ b/src/Quotelinks/QuoteYou.js @@ -1,3 +1,15 @@ +import Callbacks from "../classes/Callbacks"; +import DataBoard from "../classes/DataBoard"; +import Notice from "../classes/Notice"; +import Get from "../General/Get"; +import Header from "../General/Header"; +import { Conf, d, doc, g } from "../globals/globals"; +import Menu from "../Menu/Menu"; +import ExpandComment from "../Miscellaneous/ExpandComment"; +import $ from "../platform/$"; +import $$ from "../platform/$$"; +import PostRedirect from "../Posting/PostRedirect"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -164,3 +176,4 @@ var QuoteYou = { } } }; +export default QuoteYou; diff --git a/src/Quotelinks/Quotify.js b/src/Quotelinks/Quotify.js index 4ed31e708f..6f11c740fa 100644 --- a/src/Quotelinks/Quotify.js +++ b/src/Quotelinks/Quotify.js @@ -1,3 +1,11 @@ +import Redirect from "../Archive/Redirect"; +import Callbacks from "../classes/Callbacks"; +import Post from "../classes/Post"; +import { g, Conf, doc } from "../globals/globals"; +import ExpandComment from "../Miscellaneous/ExpandComment"; +import $ from "../platform/$"; +import $$ from "../platform/$$"; + /* * decaffeinate suggestions: * DS101: Remove unnecessary use of Array.from @@ -138,3 +146,4 @@ var Quotify = { return $.replace(deadlink, [...Array.from(deadlink.childNodes)]); } }; +export default Quotify; diff --git a/src/classes/Board.js b/src/classes/Board.js index 02dc8b1c1b..88e55a5cb3 100644 --- a/src/classes/Board.js +++ b/src/classes/Board.js @@ -1,9 +1,13 @@ +import BoardConfig from "../General/BoardConfig"; +import { d, g } from "../globals/globals"; +import SimpleDict from "./SimpleDict"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class Board { +export default class Board { toString() { return this.ID; } constructor(ID) { diff --git a/src/classes/Callbacks.js b/src/classes/Callbacks.js index 143c794af3..24aed5edba 100644 --- a/src/classes/Callbacks.js +++ b/src/classes/Callbacks.js @@ -1,10 +1,12 @@ +import Main from "../main/Main"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns * DS206: Consider reworking classes to avoid initClass * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class Callbacks { +export default class Callbacks { static initClass() { this.Post = new Callbacks('Post'); this.Thread = new Callbacks('Thread'); diff --git a/src/classes/CatalogThread.js b/src/classes/CatalogThread.js index e6337a4a3d..510308280d 100644 --- a/src/classes/CatalogThread.js +++ b/src/classes/CatalogThread.js @@ -1,4 +1,6 @@ -class CatalogThread { +import $ from "../platform/$"; + +export default class CatalogThread { toString() { return this.ID; } constructor(root, thread) { diff --git a/src/classes/CatalogThreadNative.js b/src/classes/CatalogThreadNative.js index dfe097aaf6..93c8696fd4 100644 --- a/src/classes/CatalogThreadNative.js +++ b/src/classes/CatalogThreadNative.js @@ -1,4 +1,9 @@ -class CatalogThreadNative { +import { g } from "../globals/globals"; +import $ from "../platform/$"; +import Board from "./Board"; +import Thread from "./Thread"; + +export default class CatalogThreadNative { toString() { return this.ID; } constructor(root) { diff --git a/src/classes/Connection.js b/src/classes/Connection.js index 2ea41ba3d5..58a280e430 100644 --- a/src/classes/Connection.js +++ b/src/classes/Connection.js @@ -1,9 +1,12 @@ +import $ from "../platform/$"; +import { g } from "../globals/globals"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class Connection { +export default class Connection { constructor(target, origin, cb={}) { this.send = this.send.bind(this); this.onMessage = this.onMessage.bind(this); diff --git a/src/classes/DataBoard.js b/src/classes/DataBoard.js index 03e9938a1f..0271cf7f3b 100644 --- a/src/classes/DataBoard.js +++ b/src/classes/DataBoard.js @@ -1,3 +1,7 @@ +import { Conf, d, g } from "../globals/globals"; +import $ from "../platform/$"; +import { dict, HOUR } from "../platform/helpers"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -6,11 +10,11 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class DataBoard { +export default class DataBoard { static initClass() { this.keys = ['hiddenThreads', 'hiddenPosts', 'lastReadPosts', 'yourPosts', 'watchedThreads', 'watcherLastModified', 'customTitles']; - - this.prototype.changes = []; + + this.changes = []; } constructor(key, sync, dontClean) { @@ -39,20 +43,20 @@ class DataBoard { delete this.data.boards; delete this.data.lastChecked; } - return this.data[g.SITE.ID] || (this.data[g.SITE.ID] = {boards: $.dict()}); + return this.data[g.SITE.ID] || (this.data[g.SITE.ID] = { boards: dict() }); } save(change, cb) { change(); - this.changes.push(change); - return $.get(this.key, {boards: $.dict()}, items => { - if (!this.changes.length) { return; } + DataBoard.changes.push(change); + return $.get(this.key, { boards: dict() }, items => { + if (!DataBoard.changes.length) { return; } const needSync = ((items[this.key].version || 0) > (this.data.version || 0)); if (needSync) { this.initData(items[this.key]); - for (change of this.changes) { change(); } + for (change of DataBoard.changes) { change(); } } - this.changes = []; + DataBoard.changes = []; this.data.version = (this.data.version || 0) + 1; return $.set(this.key, this.data, () => { if (needSync) { this.sync?.(); } @@ -62,10 +66,10 @@ class DataBoard { } forceSync(cb) { - return $.get(this.key, {boards: $.dict()}, items => { + return $.get(this.key, { boards: dict() }, items => { if ((items[this.key].version || 0) > (this.data.version || 0)) { this.initData(items[this.key]); - for (var change of this.changes) { change(); } + for (var change of DataBoard.changes) { change(); } this.sync?.(); } return cb?.(); @@ -112,12 +116,12 @@ class DataBoard { setUnsafe({siteID, boardID, threadID, postID, val}) { if (!siteID) { siteID = g.SITE.ID; } - if (!this.data[siteID]) { this.data[siteID] = {boards: $.dict()}; } + if (!this.data[siteID]) { this.data[siteID] = { boards: dict() }; } if (postID !== undefined) { let base; - return (((base = this.data[siteID].boards[boardID] || (this.data[siteID].boards[boardID] = $.dict())))[threadID] || (base[threadID] = $.dict()))[postID] = val; + return (((base = this.data[siteID].boards[boardID] || (this.data[siteID].boards[boardID] = dict())))[threadID] || (base[threadID] = dict()))[postID] = val; } else if (threadID !== undefined) { - return (this.data[siteID].boards[boardID] || (this.data[siteID].boards[boardID] = $.dict()))[threadID] = val; + return (this.data[siteID].boards[boardID] || (this.data[siteID].boards[boardID] = dict()))[threadID] = val; } else { return this.data[siteID].boards[boardID] = val; } @@ -125,7 +129,7 @@ class DataBoard { extend({siteID, boardID, threadID, postID, val}, cb) { return this.save(() => { - const oldVal = this.get({siteID, boardID, threadID, postID, defaultValue: $.dict()}); + const oldVal = this.get({ siteID, boardID, threadID, postID, defaultValue: dict() }); for (var key in val) { var subVal = val[key]; if (typeof subVal === 'undefined') { @@ -180,7 +184,7 @@ class DataBoard { this.deleteIfEmpty({siteID, boardID}); } const now = Date.now(); - if (now - (2 * $.HOUR) >= ((middle = this.data[siteID].lastChecked || 0)) || middle > now) { + if (now - (2 * HOUR) >= ((middle = this.data[siteID].lastChecked || 0)) || middle > now) { this.data[siteID].lastChecked = now; for (boardID in this.data[siteID].boards) { this.ajaxClean(boardID); @@ -209,7 +213,7 @@ class DataBoard { let board, ID; const siteID = g.SITE.ID; if (!(board = this.data[siteID].boards[boardID])) { return; } - const threads = $.dict(); + const threads = dict(); if (response1) { for (var page of response1) { for (var thread of page.threads) { diff --git a/src/classes/Fetcher.js b/src/classes/Fetcher.js index 721547f243..4b2498770a 100644 --- a/src/classes/Fetcher.js +++ b/src/classes/Fetcher.js @@ -1,3 +1,16 @@ +import Redirect from "../Archive/Redirect"; +import Board from "./Board"; +import Post from "./Post"; +import Thread from "./Thread"; +import $ from "../platform/$"; +import Main from "../main/Main"; +import Index from "../General/Index"; +import { E, g, Conf, d } from "../globals/globals"; +import ImageHost from "../Images/ImageHost"; +import CrossOrigin from "../platform/CrossOrigin"; +import Get from "../General/Get"; +import { dict } from "../platform/helpers"; + /* * decaffeinate suggestions: * DS101: Remove unnecessary use of Array.from @@ -7,7 +20,7 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class Fetcher { +export default class Fetcher { static initClass() { this.prototype.archiveTags = { @@ -79,7 +92,8 @@ class Fetcher { $.add(nodes.root, nodes.post); // Indicate links to the containing post. - for (var quote of clone.nodes.quotelinks.concat([...Array.from(clone.nodes.backlinks)])) { + const quotes = [...clone.nodes.quotelinks, ...clone.nodes.backlinks]; + for (var quote of quotes) { var {boardID, postID} = Get.postDataFromLink(quote); if ((postID === this.quoter.ID) && (boardID === this.quoter.board.ID)) { $.addClass(quote, 'forwardlink'); @@ -218,7 +232,7 @@ class Fetcher { for (let i = 0; i < comment.length; i++) { var text = comment[i]; if ((i % 2) === 1) { - var tag = this.archiveTags[text.replace(/\ .*\]/, ']')]; + var tag = Fetcher.archiveTags[text.replace(/\ .*\]/, ']')]; if (typeof tag === 'function') { result.push(tag(text)); } else { result.push(tag); } } else { var greentext = text[0] === '>'; @@ -291,7 +305,7 @@ class Fetcher { if (!/\.pdf$/.test(o.file.url)) { o.file.dimensions = `${o.file.width}x${o.file.height}`; } if ((this.boardID === 'f') && data.media.exif) { o.file.tag = JSON.parse(data.media.exif).Tag; } } - o.extra = $.dict(); + o.extra = dict(); const board = g.boards[this.boardID] || new Board(this.boardID); diff --git a/src/classes/Notice.js b/src/classes/Notice.js index 8290f1643d..7e1f212fd5 100644 --- a/src/classes/Notice.js +++ b/src/classes/Notice.js @@ -1,9 +1,14 @@ +import Header from "../General/Header"; +import { d } from "../globals/globals"; +import $ from "../platform/$"; +import { SECOND } from "../platform/helpers"; + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class Notice { +export default class Notice { constructor(type, content, timeout, onclose) { this.add = this.add.bind(this); this.close = this.close.bind(this); @@ -36,7 +41,7 @@ class Notice { $.add(Header.noticesRoot, this.el); this.el.clientHeight; // force reflow this.el.style.opacity = 1; - if (this.timeout) { return setTimeout(this.close, this.timeout * $.SECOND); } + if (this.timeout) { return setTimeout(this.close, this.timeout * SECOND); } } close() { diff --git a/src/classes/Post.Clone.js b/src/classes/Post.Clone.js deleted file mode 100644 index 9b78253789..0000000000 --- a/src/classes/Post.Clone.js +++ /dev/null @@ -1,112 +0,0 @@ -/* - * decaffeinate suggestions: - * DS002: Fix invalid constructor - * DS101: Remove unnecessary use of Array.from - * DS102: Remove unnecessary code created because of implicit returns - * DS206: Consider reworking classes to avoid initClass - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md - */ -Post.Clone = (function() { - const Cls = class extends Post { - static initClass() { - this.prototype.isClone = true; - } - - constructor() { - const that = Object.create(Post.Clone.prototype); - that.construct(...arguments); - return that; - } - - construct(origin, context, contractThumb) { - let file, fileRoots, key; - this.origin = origin; - this.context = context; - for (key of ['ID', 'postID', 'threadID', 'boardID', 'siteID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply']) { - // Copy or point to the origin's key value. - this[key] = this.origin[key]; - } - - const {nodes} = this.origin; - const root = contractThumb ? - this.cloneWithoutVideo(nodes.root) - : - nodes.root.cloneNode(true); - if (!Post.Clone.suffix) { Post.Clone.suffix = 0; } - for (var node of [root, ...Array.from($$('[id]', root))]) { - node.id += `_${Post.Clone.suffix}`; - } - Post.Clone.suffix++; - - // Remove inlined posts inside of this post. - for (var inline of $$('.inline', root)) { - $.rm(inline); - } - for (var inlined of $$('.inlined', root)) { - $.rmClass(inlined, 'inlined'); - } - - this.nodes = this.parseNodes(root); - - root.hidden = false; // post hiding - $.rmClass(root, 'forwarded'); // quote inlining - $.rmClass(this.nodes.post, 'highlight'); // keybind navigation, ID highlighting - - // Remove catalog stuff. - if (!this.isReply) { - this.setCatalogOP(false); - $.rm($('.catalog-link', this.nodes.post)); - $.rm($('.catalog-stats', this.nodes.post)); - $.rm($('.catalog-replies', this.nodes.post)); - } - - this.parseQuotes(); - this.quotes = [...Array.from(this.origin.quotes)]; - - this.files = []; - if (this.origin.files.length) { fileRoots = this.fileRoots(); } - for (var originFile of this.origin.files) { - // Copy values, point to relevant elements. - file = {}; - for (key in originFile) { - var val = originFile[key]; - file[key] = val; - } - var fileRoot = fileRoots[file.docIndex]; - for (key in g.SITE.selectors.file) { - var selector = g.SITE.selectors.file[key]; - file[key] = $(selector, fileRoot); - } - file.thumbLink = file.thumb?.parentNode; - if (file.thumbLink) { file.fullImage = $('.full-image', file.thumbLink); } - file.videoControls = $('.video-controls', file.text); - if (file.videoThumb) { file.thumb.muted = true; } - this.files.push(file); - } - - if (this.files.length) { - this.file = this.files[0]; - - // Contract thumbnails in quote preview - if (this.file.thumb && contractThumb) { ImageExpand.contract(this); } - } - - if (this.origin.isDead) { this.isDead = true; } - return root.dataset.clone = this.origin.clones.push(this) - 1; - } - - cloneWithoutVideo(node) { - if ((node.tagName === 'VIDEO') && !node.dataset.md5) { // (exception for WebM thumbnails) - return []; - } else if ((node.nodeType === Node.ELEMENT_NODE) && $('video', node)) { - const clone = node.cloneNode(false); - for (var child of node.childNodes) { $.add(clone, this.cloneWithoutVideo(child)); } - return clone; - } else { - return node.cloneNode(true); - } - } - }; - Cls.initClass(); - return Cls; -})(); diff --git a/src/classes/Post.js b/src/classes/Post.js index 1292990fb1..e73c5c67e8 100644 --- a/src/classes/Post.js +++ b/src/classes/Post.js @@ -1,20 +1,32 @@ +import Get from "../General/Get"; +import { g, Conf } from "../globals/globals"; +import ImageExpand from "../Images/ImageExpand"; +import $ from "../platform/$"; +import $$ from "../platform/$$"; +import Callbacks from "./Callbacks"; + +/** + * Original coffeescript version added a child class that somehow skips the original constructor in the compilation + * output? In es classes we have to do tha manually. + */ +const skipConstructor = Symbol('skip post constructor'); + /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns * DS206: Consider reworking classes to avoid initClass * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class Post { - static initClass() { - - this.deadMark = - // \u00A0 is nbsp - $.el('span', { - textContent: '\u00A0(Dead)', - className: 'qmark-dead' - } - ); - } +export default class Post { + // because of a circular dependency $ might not be initialized, so we can't use $.el + static deadMark = (() => { + const el = document.createElement('span'); + // \u00A0 is nbsp + el.textContent = '\u00A0(Dead)'; + el.className = 'qmark-dead'; + return el; + })(); + toString() { return this.ID; } constructor(root, thread, board, flags={}) { @@ -22,6 +34,9 @@ class Post { // @normalizedOriginal = Test.normalize root // <% } %> + if (root === skipConstructor) return; + + this.root = root; this.thread = thread; this.board = board; $.extend(this, flags); @@ -95,6 +110,9 @@ class Post { this.board.posts.push(this.ID, this); this.thread.posts.push(this.ID, this); g.posts.push(this.fullID, this); + + this.isFetchedQuote = false; + this.isClone = false; } parseNodes(root) { @@ -337,7 +355,7 @@ class Post { addClone(context, contractThumb) { // Callbacks may not have been run yet due to anti-browser-lock delay in Main.callbackNodesDB. Callbacks.Post.execute(this); - return new Post.Clone(this, context, contractThumb); + return new PostClone(skipConstructor).construct(this, context, contractThumb); } rmClone(index) { @@ -354,5 +372,95 @@ class Post { this.nodes.post.classList.toggle('op', !isCatalogOP); return this.nodes.post.style.left = (this.nodes.post.style.right = null); } -} -Post.initClass(); +}; + +export class PostClone extends Post { + static suffix = 0; + + constructor(root, thread, board, flags = {}) { + super(root, thread, board, flags = {}); + this.isClone = true; + } + + construct(origin, context, contractThumb) { + let file, fileRoots, key; + this.origin = origin; + this.context = context; + for (key of ['ID', 'postID', 'threadID', 'boardID', 'siteID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply']) { + // Copy or point to the origin's key value. + this[key] = this.origin[key]; + } + + const { nodes } = this.origin; + const root = contractThumb ? this.cloneWithoutVideo(nodes.root) : nodes.root.cloneNode(true); + for (var node of [root, ...$$('[id]', root)]) { + node.id += `_${PostClone.suffix}`; + } + PostClone.suffix++; + + // Remove inlined posts inside of this post. + for (var inline of $$('.inline', root)) { + $.rm(inline); + } + for (var inlined of $$('.inlined', root)) { + $.rmClass(inlined, 'inlined'); + } + + this.nodes = this.parseNodes(root); + + root.hidden = false; // post hiding + $.rmClass(root, 'forwarded'); // quote inlining + $.rmClass(this.nodes.post, 'highlight'); // keybind navigation, ID highlighting + + // Remove catalog stuff. + if (!this.isReply) { + this.setCatalogOP(false); + $.rm($('.catalog-link', this.nodes.post)); + $.rm($('.catalog-stats', this.nodes.post)); + $.rm($('.catalog-replies', this.nodes.post)); + } + + this.parseQuotes(); + this.quotes = [...this.origin.quotes]; + + this.files = []; + if (this.origin.files.length) { fileRoots = this.fileRoots(); } + for (var originFile of this.origin.files) { + // Copy values, point to relevant elements. + file = { ...originFile }; + var fileRoot = fileRoots[file.docIndex]; + for (key in g.SITE.selectors.file) { + var selector = g.SITE.selectors.file[key]; + file[key] = $(selector, fileRoot); + } + file.thumbLink = file.thumb?.parentNode; + if (file.thumbLink) { file.fullImage = $('.full-image', file.thumbLink); } + file.videoControls = $('.video-controls', file.text); + if (file.videoThumb) { file.thumb.muted = true; } + this.files.push(file); + } + + if (this.files.length) { + this.file = this.files[0]; + + // Contract thumbnails in quote preview + if (this.file.thumb && contractThumb) { ImageExpand.contract(this); } + } + + if (this.origin.isDead) { this.isDead = true; } + root.dataset.clone = this.origin.clones.push(this) - 1; + return this; + } + + cloneWithoutVideo(node) { + if ((node.tagName === 'VIDEO') && !node.dataset.md5) { // (exception for WebM thumbnails) + return []; + } else if ((node.nodeType === Node.ELEMENT_NODE) && $('video', node)) { + const clone = node.cloneNode(false); + for (var child of node.childNodes) { $.add(clone, this.cloneWithoutVideo(child)); } + return clone; + } else { + return node.cloneNode(true); + } + } +}; diff --git a/src/classes/RandomAccessList.js b/src/classes/RandomAccessList.js index 48c50e9c67..5a4dfa2e7a 100644 --- a/src/classes/RandomAccessList.js +++ b/src/classes/RandomAccessList.js @@ -3,7 +3,7 @@ * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class RandomAccessList { +export default class RandomAccessList { constructor(items) { this.length = 0; if (items) { for (var item of items) { this.push(item); } } diff --git a/src/classes/SimpleDict.js b/src/classes/SimpleDict.ts similarity index 85% rename from src/classes/SimpleDict.js rename to src/classes/SimpleDict.ts index 6e0b9461ed..7ab5ca9020 100644 --- a/src/classes/SimpleDict.js +++ b/src/classes/SimpleDict.ts @@ -1,15 +1,19 @@ +import $ from "../platform/$"; + /* * decaffeinate suggestions: * DS101: Remove unnecessary use of Array.from * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md */ -class SimpleDict { +export default class SimpleDict
-
- ${postCount} /
- ${fileCount} /
- ${pageCount}
-
-
- ?{thread.isSticky}{
}
- ?{thread.isClosed}{
}
-
-
diff --git a/src/site/SW.yotsuba.Build/CatalogThreadHtml.tsx b/src/site/SW.yotsuba.Build/CatalogThreadHtml.tsx
new file mode 100644
index 0000000000..43f5be7271
--- /dev/null
+++ b/src/site/SW.yotsuba.Build/CatalogThreadHtml.tsx
@@ -0,0 +1,25 @@
+import h, { hFragment, EscapedHtml } from "../../globals/jsx";
+
+export default function generateCatalogThreadHtml(
+ thread, src, imgClass, data, postCount, fileCount, pageCount, staticPath, gifIcon,
+): EscapedHtml {
+ return <>
+
+ {imgClass ?
+
+
+ {postCount}{' / '}
+ {fileCount}{' / '}
+ {pageCount}
+
+
+ {thread.isSticky ? 
: ''}
+ {thread.isClosed ? 
: ''}
+
+
+ ;
+}
diff --git a/src/site/SW.yotsuba.Build/File.html b/src/site/SW.yotsuba.Build/File.html
deleted file mode 100644
index 504ae42946..0000000000
--- a/src/site/SW.yotsuba.Build/File.html
+++ /dev/null
@@ -1,36 +0,0 @@
-?{file}{
-
- ?{boardID === "f"}{
- 
-
- }
-
-}{
- ?{o.fileDeleted}{
-
- File:
- ${file.name}
- -(${file.size}, ${file.dimensions}?{file.tag}{, ${file.tag}})
-
- }{
-
- File:
-
- ?{file.isSpoiler}{Spoiler Image}{${shortFilename}}
-
- (${file.size}, ${file.dimensions || "PDF"})
-
-
-
-
- 
-
-
- }
-}
diff --git a/src/site/SW.yotsuba.Build/FileHtml.tsx b/src/site/SW.yotsuba.Build/FileHtml.tsx
new file mode 100644
index 0000000000..ce08287887
--- /dev/null
+++ b/src/site/SW.yotsuba.Build/FileHtml.tsx
@@ -0,0 +1,49 @@
+import h, { EscapedHtml, isEscaped } from "../../globals/jsx";
+
+export default function generateFileHtml(
+ file, ID, boardID, fileURL, shortFilename, fileThumb, o, staticPath, gifIcon
+): EscapedHtml {
+ if (file) {
+ const fileContent: (EscapedHtml | string)[] = [];
+ if (boardID === "f") {
+ fileContent.push(
+
+ {'File: '}
+ {file.name}
+ -({file.size}, {file.dimensions}{file.tag ? ', ' + file.tag : ''})
+
+ );
+ } else {
+ fileContent.push(
+
+ {'File: '}
+
+ {file.isSpoiler ? 'Spoiler Image' : shortFilename}
+
+ {` (${file.size}, ${file.dimensions || "PDF"})`}
+
,
+
+ {...fileContent}
;
+ } else if (o.fileDeleted) {
+ return
+
+ 
+
+
;
+ }
+ return { innerHTML: '', [isEscaped]: true };
+}
diff --git a/src/site/SW.yotsuba.Build/Post.html b/src/site/SW.yotsuba.Build/Post.html
deleted file mode 100644
index 655c4ea45e..0000000000
--- a/src/site/SW.yotsuba.Build/Post.html
+++ /dev/null
@@ -1,5 +0,0 @@
-?{o.isReply}{>>
}
-
- ?{o.isReply}{&{postInfo}&{fileBlock}}{&{fileBlock}&{postInfo}}
-
diff --git a/src/site/SW.yotsuba.Build/PostInfo.html b/src/site/SW.yotsuba.Build/PostInfo.html
deleted file mode 100644
index 9fc75a063c..0000000000
--- a/src/site/SW.yotsuba.Build/PostInfo.html
+++ /dev/null
@@ -1,26 +0,0 @@
-&{commentHTML}-
-
- ?{!o.isReply || boardID === "f" || subject}{${subject || ""} }
-
- ?{email}{}
- ${name}
- ?{tripcode}{ ${tripcode}}
- ?{pass}{ }
- ?{capcode}{ ## ${capcode}}
- ?{email}{}
- ?{boardID === "f" && !o.isReply || capcodeDescription}{}{ }
- ?{capcodeDescription}{ 
}
- ?{uniqueID && !capcode}{ (ID: ${uniqueID})}
- ?{flagCode}{ }
- ?{flagCodeTroll}{ }
-
- ${dateText}
-
- No.
- ${ID}
- ?{o.isSticky}{ }
- ?{o.isClosed && !o.isArchived}{ }
- ?{o.isArchived}{ 
}
- ?{!o.isReply && g.VIEW === "index"}{ [Reply]}
-
-
diff --git a/src/site/SW.yotsuba.Build/PostInfoHtml.tsx b/src/site/SW.yotsuba.Build/PostInfoHtml.tsx
new file mode 100644
index 0000000000..e226fb2b08
--- /dev/null
+++ b/src/site/SW.yotsuba.Build/PostInfoHtml.tsx
@@ -0,0 +1,91 @@
+import { g } from "../../globals/globals";
+import h, { EscapedHtml } from "../../globals/jsx";
+
+export default function generatePostInfoHtml(
+ ID, o, subject, capcode, email, name, tripcode, pass, capcodeLC, capcodePlural, staticPath, gifIcon,
+ capcodeDescription, uniqueID, flag, flagCode, flagCodeTroll, dateUTC, dateText, postLink, quoteLink, boardID,
+ threadID,
+): EscapedHtml {
+ const nameHtml: (EscapedHtml | string)[] = [{name}];
+ if (tripcode) nameHtml.push(' ', {tripcode});
+ if (pass) nameHtml.push(' ', )
+ if (capcode) {
+ nameHtml.push(
+ ' ',
+ ## {capcode}
+ )
+ }
+
+ const nameBlockContent: (EscapedHtml | string)[] =
+ email ? [' ', {...nameHtml}] : nameHtml;
+ if (!(boardID === "f" && !o.isReply || capcodeDescription)) nameBlockContent.push(' ');
+ if (capcodeDescription) {
+ nameBlockContent.push(
+
+
+ {' '}
+ {...((!o.isReply || boardID === "f" || subject) ? [{subject}, ' '] : [])}
+
+ {...nameBlockContent}
+
+ {' '}
+ {dateText}
+ {' '}
+
+ {...postNumContent}
+
+
;
+}
diff --git a/src/site/SW.yotsuba.js b/src/site/SW.yotsuba.js
deleted file mode 100644
index 0917395135..0000000000
--- a/src/site/SW.yotsuba.js
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS205: Consider reworking code to avoid use of IIFEs
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-SW.yotsuba = {
- isOPContainerThread: false,
- hasIPCount: true,
- archivedBoardsKnown: true,
-
- urls: {
- thread({boardID, threadID}) { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/thread/${threadID}`; },
- post({postID}) { return `#p${postID}`; },
- index({boardID}) { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/`; },
- catalog({boardID}) { if (boardID === 'f') { return undefined; } else { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/catalog`; } },
- archive({boardID}) { if (BoardConfig.isArchived(boardID)) { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/archive`; } else { return undefined; } },
- threadJSON({boardID, threadID}) { return `${location.protocol}//a.4cdn.org/${boardID}/thread/${threadID}.json`; },
- threadsListJSON({boardID}) { return `${location.protocol}//a.4cdn.org/${boardID}/threads.json`; },
- archiveListJSON({boardID}) { if (BoardConfig.isArchived(boardID)) { return `${location.protocol}//a.4cdn.org/${boardID}/archive.json`; } else { return ''; } },
- catalogJSON({boardID}) { return `${location.protocol}//a.4cdn.org/${boardID}/catalog.json`; },
- file({boardID}, filename) {
- const hostname = boardID === 'f' ? ImageHost.flashHost() : ImageHost.host();
- return `${location.protocol}//${hostname}/${boardID}/${filename}`;
- },
- thumb({boardID}, filename) {
- return `${location.protocol}//${ImageHost.thumbHost()}/${boardID}/${filename}`;
- }
- },
-
- isPrunedByAge({boardID}) { return boardID === 'f'; },
- areMD5sDeferred({boardID}) { return boardID === 'f'; },
- isOnePage({boardID}) { return boardID === 'f'; },
- noAudio({boardID}) { return BoardConfig.noAudio(boardID); },
-
- selectors: {
- board: '.board',
- thread: '.thread',
- threadDivider: '.board > hr',
- summary: '.summary',
- postContainer: '.postContainer',
- replyOriginal: '.replyContainer:not([data-clone])',
- sideArrows: 'div.sideArrows',
- post: '.post',
- infoRoot: '.postInfo',
- info: {
- subject: '.subject',
- name: '.name',
- email: '.useremail',
- tripcode: '.postertrip',
- uniqueIDRoot: '.posteruid',
- uniqueID: '.posteruid > .hand',
- capcode: '.capcode.hand',
- pass: '.n-pu',
- flag: '.flag, .bfl',
- date: '.dateTime',
- nameBlock: '.nameBlock',
- quote: '.postNum > a:nth-of-type(2)',
- reply: '.replylink'
- },
- icons: {
- isSticky: '.stickyIcon',
- isClosed: '.closedIcon',
- isArchived: '.archivedIcon'
- },
- file: {
- text: '.file > :first-child',
- link: '.fileText > a',
- thumb: 'a.fileThumb > [data-md5]'
- },
- thumbLink: 'a.fileThumb',
- highlightable: {
- op: '.opContainer',
- reply: ' > .reply',
- catalog: ''
- },
- comment: '.postMessage',
- spoiler: 's',
- quotelink: ':not(pre) > .quotelink', // XXX https://github.com/4chan/4chan-JS/issues/77: 4chan currently creates quote links inside [code] tags; ignore them
- catalog: {
- board: '#threads',
- thread: '.thread',
- thumb: '.thumb'
- },
- boardList: '#boardNavDesktop > .boardList',
- boardListBottom: '#boardNavDesktopFoot > .boardList',
- styleSheet: 'link[title=switch]',
- psa: '#globalMessage',
- psaTop: '#globalToggle',
- searchBox: '#search-box',
- nav: {
- prev: '.prev > form > [type=submit]',
- next: '.next > form > [type=submit]'
- }
- },
-
- classes: {
- highlight: 'highlight'
- },
-
- xpath: {
- thread: 'div[contains(concat(" ",@class," ")," thread ")]',
- postContainer: 'div[contains(@class,"postContainer")]',
- replyContainer: 'div[contains(@class,"replyContainer")]'
- },
-
- regexp: {
- quotelink:
- new RegExp(`\
-^https?://boards\\.4chan(?:nel)?\\.org/+\
-([^/]+)\
-/+thread/+\
-(\\d+)\
-(?:[/?][^#]*)?\
-(?:#p\
-(\\d+)\
-)?\
-$\
-`),
- quotelinkHTML:
- /]*\bhref="(?:(?:\/\/boards\.4chan(?:nel)?\.org)?\/([^\/]+)\/thread\/)?(\d+)?(?:#p(\d+))?"/g,
- pass:
- /^https?:\/\/www\.4chan(?:nel)?\.org\/+pass(?:$|[?#])/
- },
-
- bgColoredEl() {
- return $.el('div', {className: 'reply'});
- },
-
- isThisPageLegit() {
- // not 404 error page or similar.
- return ['boards.4chan.org', 'boards.4channel.org'].includes(location.hostname) &&
- d.doctype &&
- !$('link[href*="favicon-status.ico"]', d.head) &&
- !['4chan - Temporarily Offline', '4chan - Error', '504 Gateway Time-out', 'MathJax Equation Source'].includes(d.title);
- },
-
- is404() {
- // XXX Sometimes threads don't 404 but are left over as stubs containing one garbage reply post.
- return ['4chan - Temporarily Offline', '4chan - 404 Not Found'].includes(d.title) || ((g.VIEW === 'thread') && $('.board') && !$('.opContainer'));
- },
-
- isIncomplete() {
- return ['index', 'thread'].includes(g.VIEW) && !$('.board + *');
- },
-
- isBoardlessPage(url) {
- return ['www.4chan.org', 'www.4channel.org'].includes(url.hostname);
- },
-
- isAuxiliaryPage(url) {
- return !['boards.4chan.org', 'boards.4channel.org'].includes(url.hostname);
- },
-
- isFileURL(url) {
- return ImageHost.test(url.hostname);
- },
-
- initAuxiliary() {
- switch (location.hostname) {
- case 'www.4chan.org': case 'www.4channel.org':
- if (SW.yotsuba.regexp.pass.test(location.href)) {
- PassMessage.init();
- } else {
- $.onExists(doc, 'body', () => $.addStyle(CSS.www));
- Captcha.replace.init();
- }
- return;
- case 'sys.4chan.org': case 'sys.4channel.org':
- var pathname = location.pathname.split(/\/+/);
- if (pathname[2] === 'imgboard.php') {
- let match;
- if (/\bmode=report\b/.test(location.search)) {
- Report.init();
- } else if (match = location.search.match(/\bres=(\d+)/)) {
- $.ready(function() {
- if (Conf['404 Redirect'] && ($.id('errmsg')?.textContent === 'Error: Specified thread does not exist.')) {
- return Redirect.navigate('thread', {
- boardID: g.BOARD.ID,
- postID: +match[1]
- });
- }});
- }
- } else if (pathname[2] === 'post') {
- PostSuccessful.init();
- }
- return;
- }
- },
-
- scriptData() {
- for (var script of $$('script:not([src])', d.head)) {
- if (/\bcooldowns *=/.test(script.textContent)) { return script.textContent; }
- }
- return '';
- },
-
- parseThreadMetadata(thread) {
- let m;
- const scriptData = this.scriptData();
- thread.postLimit = /\bbumplimit *= *1\b/.test(scriptData);
- thread.fileLimit = /\bimagelimit *= *1\b/.test(scriptData);
- thread.ipCount = (m = scriptData.match(/\bunique_ips *= *(\d+)\b/)) ? +m[1] : undefined;
-
- if ((g.BOARD.ID === 'f') && thread.OP.file) {
- const {file} = thread.OP;
- return $.ajax(this.urls.threadJSON({boardID: 'f', threadID: thread.ID}), {
- timeout: $.MINUTE,
- onloadend() {
- if (this.response) {
- return file.text.dataset.md5 = (file.MD5 = this.response.posts[0].md5);
- }
- }
- }
- );
- }
- },
-
- parseNodes(post, nodes) {
- // Add CSS classes to sticky/closed icons on /f/ to match other boards.
- if (post.boardID === 'f') {
- return (() => {
- const result = [];
- for (var type of ['Sticky', 'Closed']) {
- var icon;
- if (icon = $(`img[alt=${type}]`, nodes.info)) {
- result.push($.addClass(icon, `${type.toLowerCase()}Icon`, 'retina'));
- }
- }
- return result;
- })();
- }
- },
-
- parseDate(node) {
- return new Date(node.dataset.utc * 1000);
- },
-
- parseFile(post, file) {
- let info;
- const {text, link, thumb} = file;
- if (!(info = link.nextSibling?.textContent.match(/\(([\d.]+ [KMG]?B).*\)/))) { return false; }
- $.extend(file, {
- name: text.title || link.title || link.textContent,
- size: info[1],
- dimensions: info[0].match(/\d+x\d+/)?.[0],
- tag: info[0].match(/,[^,]*, ([a-z]+)\)/i)?.[1],
- MD5: text.dataset.md5
- }
- );
- if (thumb) {
- $.extend(file, {
- thumbURL: thumb.src,
- MD5: thumb.dataset.md5,
- isSpoiler: $.hasClass(thumb.parentNode, 'imgspoiler')
- }
- );
- if (file.isSpoiler) {
- let m;
- file.thumbURL = (m = link.href.match(/\d+(?=\.\w+$)/)) ? `${location.protocol}//${ImageHost.thumbHost()}/${post.board}/${m[0]}s.jpg` : undefined;
- }
- }
- return true;
- },
-
- cleanComment(bq) {
- let abbr;
- if (abbr = $('.abbr', bq)) { // 'Comment too long' or 'EXIF data available'
- for (var node of $$('.abbr + br, .exif', bq)) {
- $.rm(node);
- }
- for (let i = 0; i < 2; i++) {
- var br;
- if ((br = abbr.previousSibling) && (br.nodeName === 'BR')) { $.rm(br); }
- }
- return $.rm(abbr);
- }
- },
-
- cleanCommentDisplay(bq) {
- let b;
- if ((b = $('b', bq)) && /^Rolled /.test(b.textContent)) { $.rm(b); }
- return $.rm($('.fortune', bq));
- },
-
- insertTags(bq) {
- let node;
- for (node of $$('s, .removed-spoiler', bq)) {
- $.replace(node, [$.tn('[spoiler]'), ...Array.from(node.childNodes), $.tn('[/spoiler]')]);
- }
- for (node of $$('.prettyprint', bq)) {
- $.replace(node, [$.tn('[code]'), ...Array.from(node.childNodes), $.tn('[/code]')]);
- }
- },
-
- hasCORS(url) {
- return url.split('/').slice(0, 3).join('/') === (location.protocol + '//a.4cdn.org');
- },
-
- sfwBoards(sfw) {
- return BoardConfig.sfwBoards(sfw);
- },
-
- uidColor(uid) {
- let msg = 0;
- let i = 0;
- while (i < 8) {
- msg = ((msg << 5) - msg) + uid.charCodeAt(i++);
- }
- return (msg >> 8) & 0xFFFFFF;
- },
-
- isLinkified(link) {
- return ImageHost.test(link.hostname);
- },
-
- testNativeExtension() {
- return $.global(function() {
- if (window.Parser.postMenuIcon) { return this.enabled = 'true'; }
- });
- },
-
- transformBoardList() {
- let node;
- const nodes = [];
- const spacer = () => $.el('span', {className: 'spacer'});
- const items = $.X('.//a|.//text()[not(ancestor::a)]', $(SW.yotsuba.selectors.boardList));
- let i = 0;
- while ((node = items.snapshotItem(i++))) {
- switch (node.nodeName) {
- case '#text':
- for (var chr of node.nodeValue) {
- var span = $.el('span', {textContent: chr});
- if (chr === ' ') { span.className = 'space'; }
- if (chr === ']') { nodes.push(spacer()); }
- nodes.push(span);
- if (chr === '[') { nodes.push(spacer()); }
- }
- break;
- case 'A':
- var a = node.cloneNode(true);
- nodes.push(a);
- break;
- }
- }
- return nodes;
- }
-};
diff --git a/src/site/SW.yotsuba.tsx b/src/site/SW.yotsuba.tsx
new file mode 100644
index 0000000000..1331b5a220
--- /dev/null
+++ b/src/site/SW.yotsuba.tsx
@@ -0,0 +1,718 @@
+import Redirect from "../Archive/Redirect";
+import PassMessage from "../Miscellaneous/PassMessage";
+import Report from "../Miscellaneous/Report";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import Captcha from "../Posting/Captcha";
+import PostSuccessful from "../Posting/PostSuccessful";
+import ImageHost from "../Images/ImageHost";
+import { g, Conf, E, d, doc } from "../globals/globals";
+import BoardConfig from "../General/BoardConfig";
+import CSS from "../css/CSS";
+
+import generatePostInfoHtml from './SW.yotsuba.Build/PostInfoHtml';
+import generateFileHtml from "./SW.yotsuba.Build/FileHtml";
+import generateCatalogThreadHtml from "./SW.yotsuba.Build/CatalogThreadHtml";
+import h, { hFragment, isEscaped } from "../globals/jsx";
+import { dict, MINUTE } from "../platform/helpers";
+
+/*
+ * decaffeinate suggestions:
+ * DS101: Remove unnecessary use of Array.from
+ * DS102: Remove unnecessary code created because of implicit returns
+ * DS205: Consider reworking code to avoid use of IIFEs
+ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
+ */
+const SWYotsuba = {
+ isOPContainerThread: false,
+ hasIPCount: true,
+ archivedBoardsKnown: true,
+
+ urls: {
+ thread({boardID, threadID}) { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/thread/${threadID}`; },
+ post({postID}) { return `#p${postID}`; },
+ index({boardID}) { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/`; },
+ catalog({boardID}) { if (boardID === 'f') { return undefined; } else { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/catalog`; } },
+ archive({boardID}) { if (BoardConfig.isArchived(boardID)) { return `${location.protocol}//${BoardConfig.domain(boardID)}/${boardID}/archive`; } else { return undefined; } },
+ threadJSON({boardID, threadID}) { return `${location.protocol}//a.4cdn.org/${boardID}/thread/${threadID}.json`; },
+ threadsListJSON({boardID}) { return `${location.protocol}//a.4cdn.org/${boardID}/threads.json`; },
+ archiveListJSON({boardID}) { if (BoardConfig.isArchived(boardID)) { return `${location.protocol}//a.4cdn.org/${boardID}/archive.json`; } else { return ''; } },
+ catalogJSON({boardID}) { return `${location.protocol}//a.4cdn.org/${boardID}/catalog.json`; },
+ file({boardID}, filename) {
+ const hostname = boardID === 'f' ? ImageHost.flashHost() : ImageHost.host();
+ return `${location.protocol}//${hostname}/${boardID}/${filename}`;
+ },
+ thumb({boardID}, filename) {
+ return `${location.protocol}//${ImageHost.thumbHost()}/${boardID}/${filename}`;
+ }
+ },
+
+ isPrunedByAge({boardID}) { return boardID === 'f'; },
+ areMD5sDeferred({boardID}) { return boardID === 'f'; },
+ isOnePage({boardID}) { return boardID === 'f'; },
+ noAudio({boardID}) { return BoardConfig.noAudio(boardID); },
+
+ selectors: {
+ board: '.board',
+ thread: '.thread',
+ threadDivider: '.board > hr',
+ summary: '.summary',
+ postContainer: '.postContainer',
+ replyOriginal: '.replyContainer:not([data-clone])',
+ sideArrows: 'div.sideArrows',
+ post: '.post',
+ infoRoot: '.postInfo',
+ info: {
+ subject: '.subject',
+ name: '.name',
+ email: '.useremail',
+ tripcode: '.postertrip',
+ uniqueIDRoot: '.posteruid',
+ uniqueID: '.posteruid > .hand',
+ capcode: '.capcode.hand',
+ pass: '.n-pu',
+ flag: '.flag, .bfl',
+ date: '.dateTime',
+ nameBlock: '.nameBlock',
+ quote: '.postNum > a:nth-of-type(2)',
+ reply: '.replylink'
+ },
+ icons: {
+ isSticky: '.stickyIcon',
+ isClosed: '.closedIcon',
+ isArchived: '.archivedIcon'
+ },
+ file: {
+ text: '.file > :first-child',
+ link: '.fileText > a',
+ thumb: 'a.fileThumb > [data-md5]'
+ },
+ thumbLink: 'a.fileThumb',
+ highlightable: {
+ op: '.opContainer',
+ reply: ' > .reply',
+ catalog: ''
+ },
+ comment: '.postMessage',
+ spoiler: 's',
+ quotelink: ':not(pre) > .quotelink', // XXX https://github.com/4chan/4chan-JS/issues/77: 4chan currently creates quote links inside [code] tags; ignore them
+ catalog: {
+ board: '#threads',
+ thread: '.thread',
+ thumb: '.thumb'
+ },
+ boardList: '#boardNavDesktop > .boardList',
+ boardListBottom: '#boardNavDesktopFoot > .boardList',
+ styleSheet: 'link[title=switch]',
+ psa: '#globalMessage',
+ psaTop: '#globalToggle',
+ searchBox: '#search-box',
+ nav: {
+ prev: '.prev > form > [type=submit]',
+ next: '.next > form > [type=submit]'
+ }
+ },
+
+ classes: {
+ highlight: 'highlight'
+ },
+
+ xpath: {
+ thread: 'div[contains(concat(" ",@class," ")," thread ")]',
+ postContainer: 'div[contains(@class,"postContainer")]',
+ replyContainer: 'div[contains(@class,"replyContainer")]'
+ },
+
+ regexp: {
+ quotelink:
+ new RegExp(`\
+^https?://boards\\.4chan(?:nel)?\\.org/+\
+([^/]+)\
+/+thread/+\
+(\\d+)\
+(?:[/?][^#]*)?\
+(?:#p\
+(\\d+)\
+)?\
+$\
+`),
+ quotelinkHTML:
+ /]*\bhref="(?:(?:\/\/boards\.4chan(?:nel)?\.org)?\/([^\/]+)\/thread\/)?(\d+)?(?:#p(\d+))?"/g,
+ pass:
+ /^https?:\/\/www\.4chan(?:nel)?\.org\/+pass(?:$|[?#])/
+ },
+
+ bgColoredEl() {
+ return $.el('div', {className: 'reply'});
+ },
+
+ isThisPageLegit() {
+ // not 404 error page or similar.
+ return ['boards.4chan.org', 'boards.4channel.org'].includes(location.hostname) &&
+ d.doctype &&
+ !$('link[href*="favicon-status.ico"]', d.head) &&
+ !['4chan - Temporarily Offline', '4chan - Error', '504 Gateway Time-out', 'MathJax Equation Source'].includes(d.title);
+ },
+
+ is404() {
+ // XXX Sometimes threads don't 404 but are left over as stubs containing one garbage reply post.
+ return ['4chan - Temporarily Offline', '4chan - 404 Not Found'].includes(d.title) || ((g.VIEW === 'thread') && $('.board') && !$('.opContainer'));
+ },
+
+ isIncomplete() {
+ return ['index', 'thread'].includes(g.VIEW) && !$('.board + *');
+ },
+
+ isBoardlessPage(url) {
+ return ['www.4chan.org', 'www.4channel.org'].includes(url.hostname);
+ },
+
+ isAuxiliaryPage(url) {
+ return !['boards.4chan.org', 'boards.4channel.org'].includes(url.hostname);
+ },
+
+ isFileURL(url) {
+ return ImageHost.test(url.hostname);
+ },
+
+ initAuxiliary() {
+ switch (location.hostname) {
+ case 'www.4chan.org': case 'www.4channel.org':
+ if (SWYotsuba.regexp.pass.test(location.href)) {
+ PassMessage.init();
+ } else {
+ $.onExists(doc, 'body', () => $.addStyle(CSS.www));
+ Captcha.replace.init();
+ }
+ return;
+ case 'sys.4chan.org': case 'sys.4channel.org':
+ var pathname = location.pathname.split(/\/+/);
+ if (pathname[2] === 'imgboard.php') {
+ let match;
+ if (/\bmode=report\b/.test(location.search)) {
+ Report.init();
+ } else if (match = location.search.match(/\bres=(\d+)/)) {
+ $.ready(function() {
+ if (Conf['404 Redirect'] && ($.id('errmsg')?.textContent === 'Error: Specified thread does not exist.')) {
+ return Redirect.navigate('thread', {
+ boardID: g.BOARD.ID,
+ postID: +match[1]
+ });
+ }});
+ }
+ } else if (pathname[2] === 'post') {
+ PostSuccessful.init();
+ }
+ return;
+ }
+ },
+
+ scriptData() {
+ for (var script of $$('script:not([src])', d.head)) {
+ if (/\bcooldowns *=/.test(script.textContent)) { return script.textContent; }
+ }
+ return '';
+ },
+
+ parseThreadMetadata(thread) {
+ let m;
+ const scriptData = this.scriptData();
+ thread.postLimit = /\bbumplimit *= *1\b/.test(scriptData);
+ thread.fileLimit = /\bimagelimit *= *1\b/.test(scriptData);
+ thread.ipCount = (m = scriptData.match(/\bunique_ips *= *(\d+)\b/)) ? +m[1] : undefined;
+
+ if ((g.BOARD.ID === 'f') && thread.OP.file) {
+ const {file} = thread.OP;
+ return $.ajax(this.urls.threadJSON({boardID: 'f', threadID: thread.ID}), {
+ timeout: MINUTE,
+ onloadend() {
+ if (this.response) {
+ return file.text.dataset.md5 = (file.MD5 = this.response.posts[0].md5);
+ }
+ }
+ }
+ );
+ }
+ },
+
+ parseNodes(post, nodes) {
+ // Add CSS classes to sticky/closed icons on /f/ to match other boards.
+ if (post.boardID === 'f') {
+ return (() => {
+ const result = [];
+ for (var type of ['Sticky', 'Closed']) {
+ var icon;
+ if (icon = $(`img[alt=${type}]`, nodes.info)) {
+ result.push($.addClass(icon, `${type.toLowerCase()}Icon`, 'retina'));
+ }
+ }
+ return result;
+ })();
+ }
+ },
+
+ parseDate(node) {
+ return new Date(node.dataset.utc * 1000);
+ },
+
+ parseFile(post, file) {
+ let info;
+ const {text, link, thumb} = file;
+ if (!(info = link.nextSibling?.textContent.match(/\(([\d.]+ [KMG]?B).*\)/))) { return false; }
+ $.extend(file, {
+ name: text.title || link.title || link.textContent,
+ size: info[1],
+ dimensions: info[0].match(/\d+x\d+/)?.[0],
+ tag: info[0].match(/,[^,]*, ([a-z]+)\)/i)?.[1],
+ MD5: text.dataset.md5
+ }
+ );
+ if (thumb) {
+ $.extend(file, {
+ thumbURL: thumb.src,
+ MD5: thumb.dataset.md5,
+ isSpoiler: $.hasClass(thumb.parentNode, 'imgspoiler')
+ }
+ );
+ if (file.isSpoiler) {
+ let m;
+ file.thumbURL = (m = link.href.match(/\d+(?=\.\w+$)/)) ? `${location.protocol}//${ImageHost.thumbHost()}/${post.board}/${m[0]}s.jpg` : undefined;
+ }
+ }
+ return true;
+ },
+
+ cleanComment(bq) {
+ let abbr;
+ if (abbr = $('.abbr', bq)) { // 'Comment too long' or 'EXIF data available'
+ for (var node of $$('.abbr + br, .exif', bq)) {
+ $.rm(node);
+ }
+ for (let i = 0; i < 2; i++) {
+ var br;
+ if ((br = abbr.previousSibling) && (br.nodeName === 'BR')) { $.rm(br); }
+ }
+ return $.rm(abbr);
+ }
+ },
+
+ cleanCommentDisplay(bq) {
+ let b;
+ if ((b = $('b', bq)) && /^Rolled /.test(b.textContent)) { $.rm(b); }
+ return $.rm($('.fortune', bq));
+ },
+
+ insertTags(bq) {
+ let node;
+ for (node of $$('s, .removed-spoiler', bq)) {
+ $.replace(node, [$.tn('[spoiler]'), ...Array.from(node.childNodes), $.tn('[/spoiler]')]);
+ }
+ for (node of $$('.prettyprint', bq)) {
+ $.replace(node, [$.tn('[code]'), ...Array.from(node.childNodes), $.tn('[/code]')]);
+ }
+ },
+
+ hasCORS(url) {
+ return url.split('/').slice(0, 3).join('/') === (location.protocol + '//a.4cdn.org');
+ },
+
+ sfwBoards(sfw) {
+ return BoardConfig.sfwBoards(sfw);
+ },
+
+ uidColor(uid) {
+ let msg = 0;
+ let i = 0;
+ while (i < 8) {
+ msg = ((msg << 5) - msg) + uid.charCodeAt(i++);
+ }
+ return (msg >> 8) & 0xFFFFFF;
+ },
+
+ isLinkified(link) {
+ return ImageHost.test(link.hostname);
+ },
+
+ testNativeExtension() {
+ return $.global(function() {
+ if (window.Parser?.postMenuIcon) { return this.enabled = 'true'; }
+ });
+ },
+
+ transformBoardList() {
+ let node;
+ const nodes = [];
+ const spacer = () => $.el('span', {className: 'spacer'});
+ const items = $.X('.//a|.//text()[not(ancestor::a)]', $(SWYotsuba.selectors.boardList));
+ let i = 0;
+ while ((node = items.snapshotItem(i++))) {
+ switch (node.nodeName) {
+ case '#text':
+ for (var chr of node.nodeValue) {
+ var span = $.el('span', {textContent: chr});
+ if (chr === ' ') { span.className = 'space'; }
+ if (chr === ']') { nodes.push(spacer()); }
+ nodes.push(span);
+ if (chr === '[') { nodes.push(spacer()); }
+ }
+ break;
+ case 'A':
+ var a = node.cloneNode(true);
+ nodes.push(a);
+ break;
+ }
+ }
+ return nodes;
+ },
+
+ Build: {
+ staticPath: '//s.4cdn.org/image/',
+ gifIcon: window.devicePixelRatio >= 2 ? '@2x.gif' : '.gif',
+ spoilerRange: Object.create(null),
+
+ shortFilename(filename) {
+ const ext = filename.match(/\.?[^\.]*$/)[0];
+ if ((filename.length - ext.length) > 30) {
+ return `${filename.match(/(?:[\uD800-\uDBFF][\uDC00-\uDFFF]|[^]){0,25}/)[0]}(...)${ext}`;
+ } else {
+ return filename;
+ }
+ },
+
+ spoilerThumb(boardID) {
+ let spoilerRange;
+ if ((spoilerRange = this.spoilerRange[boardID])) {
+ // Randomize the spoiler image.
+ return `${this.staticPath}spoiler-${boardID}${Math.floor(1 + (spoilerRange * Math.random()))}.png`;
+ } else {
+ return `${this.staticPath}spoiler.png`;
+ }
+ },
+
+ sameThread(boardID, threadID) {
+ return (g.VIEW === 'thread') && (g.BOARD.ID === boardID) && (g.THREADID === +threadID);
+ },
+
+ threadURL(boardID, threadID) {
+ if (boardID !== g.BOARD.ID) {
+ return `//${BoardConfig.domain(boardID)}/${boardID}/thread/${threadID}`;
+ } else if ((g.VIEW !== 'thread') || (+threadID !== g.THREADID)) {
+ return `/${boardID}/thread/${threadID}`;
+ } else {
+ return '';
+ }
+ },
+
+ postURL(boardID, threadID, postID) {
+ return `${this.threadURL(boardID, threadID)}#p${postID}`;
+ },
+
+ parseJSON(data, { siteID, boardID }) {
+ const o = {
+ // id
+ ID: data.no,
+ postID: data.no,
+ threadID: data.resto || data.no,
+ boardID,
+ siteID,
+ isReply: !!data.resto,
+ // thread status
+ isSticky: !!data.sticky,
+ isClosed: !!data.closed,
+ isArchived: !!data.archived,
+ // file status
+ fileDeleted: !!data.filedeleted,
+ filesDeleted: data.filedeleted ? [0] : []
+ };
+ o.info = {
+ subject: $.unescape(data.sub),
+ email: $.unescape(data.email),
+ name: $.unescape(data.name) || '',
+ tripcode: data.trip,
+ pass: (data.since4pass != null) ? `${data.since4pass}` : undefined,
+ uniqueID: data.id,
+ flagCode: data.country,
+ flagCodeTroll: data.board_flag,
+ flag: $.unescape((data.country_name || data.flag_name)),
+ dateUTC: data.time,
+ dateText: data.now,
+ // Yes, we use the raw string here
+ commentHTML: { innerHTML: data.com || '', [isEscaped]: true }
+ };
+ if (data.capcode) {
+ o.info.capcode = data.capcode.replace(/_highlight$/, '').replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
+ o.capcodeHighlight = /_highlight$/.test(data.capcode);
+ delete o.info.uniqueID;
+ }
+ o.files = [];
+ if (data.ext) {
+ o.file = this.parseJSONFile(data, { siteID, boardID });
+ o.files.push(o.file);
+ }
+ // Temporary JSON properties for events such as April 1 / Halloween
+ o.extra = dict();
+ for (var key in data) {
+ if (key[0] === 'x') {
+ o.extra[key] = data[key];
+ }
+ }
+ return o;
+ },
+
+ parseJSONFile(data, { siteID, boardID }) {
+ const site = g.sites[siteID];
+ const filename = (site.software === 'yotsuba') && (boardID === 'f') ?
+ `${encodeURIComponent(data.filename)}${data.ext}`
+ :
+ `${data.tim}${data.ext}`;
+ const o = {
+ name: ($.unescape(data.filename)) + data.ext,
+ url: site.urls.file({ siteID, boardID }, filename),
+ height: data.h,
+ width: data.w,
+ MD5: data.md5,
+ size: $.bytesToString(data.fsize),
+ thumbURL: site.urls.thumb({ siteID, boardID }, `${data.tim}s.jpg`),
+ theight: data.tn_h,
+ twidth: data.tn_w,
+ isSpoiler: !!data.spoiler,
+ tag: data.tag,
+ hasDownscale: !!data.m_img
+ };
+ if ((data.h != null) && !/\.pdf$/.test(o.url)) { o.dimensions = `${o.width}x${o.height}`; }
+ return o;
+ },
+
+ parseComment(html) {
+ html = html
+ .replace(/>>
: '')}
+
+ {(o.isReply ? <>{postInfo}{fileBlock} : <>{fileBlock}{postInfo})}
+
+ ;
+
+ const container = $.el('div', {
+ className: `postContainer ${postClass}Container`,
+ id: `pc${ID}`
+ });
+ $.extend(container, wholePost);
+
+ // Fix quotelinks
+ for (var quote of $$('.quotelink', container)) {
+ var href = quote.getAttribute('href');
+ if (href[0] === '#') {
+ if (!this.sameThread(boardID, threadID)) {
+ quote.href = this.threadURL(boardID, threadID) + href;
+ }
+ } else {
+ var match;
+ if ((match = quote.href.match(SWYotsuba.regexp.quotelink)) && (this.sameThread(match[1], match[2]))) {
+ quote.href = href.match(/(#[^#]*)?$/)[0] || '#';
+ }
+ }
+ }
+
+ return container;
+ },
+
+ summaryText(status, posts, files) {
+ let text = '';
+ if (status) { text += `${status} `; }
+ text += `${posts} post${posts > 1 ? 's' : ''}`;
+ if (+files) { text += ` and ${files} image repl${files > 1 ? 'ies' : 'y'}`; }
+ return text += ` ${status === '-' ? 'shown' : 'omitted'}.`;
+ },
+
+ summary(boardID, threadID, posts, files) {
+ return $.el('a', {
+ className: 'summary',
+ textContent: this.summaryText('', posts, files),
+ href: `/${boardID}/thread/${threadID}`
+ }
+ );
+ },
+
+ thread(thread, data, withReplies) {
+ let root;
+ if (root = thread.nodes.root) {
+ $.rmAll(root);
+ } else {
+ thread.nodes.root = (root = $.el('div', {
+ className: 'thread',
+ id: `t${data.no}`
+ }
+ ));
+ }
+ if (this.hat) { $.add(root, this.hat.cloneNode(false)); }
+ $.add(root, thread.OP.nodes.root);
+ if (data.omitted_posts || (!withReplies && data.replies)) {
+ const [posts, files] = Array.from(withReplies ?
+ // XXX data.omitted_images is not accurate.
+ [data.omitted_posts, data.images - data.last_replies.filter(data => !!data.ext).length]
+ :
+ [data.replies, data.images]);
+ const summary = this.summary(thread.board.ID, data.no, posts, files);
+ $.add(root, summary);
+ }
+ return root;
+ },
+
+ catalogThread(thread, data, pageCount) {
+ let cssText, imgClass, src;
+ const { staticPath, gifIcon } = this;
+ const { tn_w, tn_h } = data;
+
+ if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) {
+ let spoilerRange;
+ src = `${staticPath}spoiler`;
+ if (spoilerRange = this.spoilerRange[thread.board]) {
+ // Randomize the spoiler image.
+ src += (`-${thread.board}`) + Math.floor(1 + (spoilerRange * Math.random()));
+ }
+ src += '.png';
+ imgClass = 'spoiler-file';
+ cssText = "--tn-w: 100; --tn-h: 100;";
+ } else if (data.filedeleted) {
+ src = `${staticPath}filedeleted-res${gifIcon}`;
+ imgClass = 'deleted-file';
+ } else if (thread.OP.file) {
+ src = thread.OP.file.thumbURL;
+ const ratio = 250 / Math.max(tn_w, tn_h);
+ cssText = `--tn-w: ${tn_w * ratio}; --tn-h: ${tn_h * ratio};`;
+ } else {
+ src = `${staticPath}nofile.png`;
+ imgClass = 'no-file';
+ }
+
+ const postCount = data.replies + 1;
+ const fileCount = data.images + !!data.ext;
+
+ const container = $.el(
+ 'div',
+ generateCatalogThreadHtml(thread, src, imgClass, data, postCount, fileCount, pageCount, staticPath, gifIcon)
+ );
+ $.before(thread.OP.nodes.info, [...Array.from(container.childNodes)]);
+
+ for (var br of $$('br', thread.OP.nodes.comment)) {
+ if (br.previousSibling && (br.previousSibling.nodeName === 'BR')) {
+ $.addClass(br, 'extra-linebreak');
+ }
+ }
+
+ const root = $.el('div', {
+ className: 'thread catalog-thread',
+ id: `t${thread}`
+ }
+ );
+ if (thread.OP.highlights) { $.addClass(root, ...Array.from(thread.OP.highlights)); }
+ if (!thread.OP.file) { $.addClass(root, 'noFile'); }
+ root.style.cssText = cssText || '';
+
+ return root;
+ },
+
+ catalogReply(thread, data) {
+ let excerpt = '';
+ if (data.com) {
+ excerpt = this.parseCommentDisplay(data.com).replace(/>>\d+/g, '').trim().replace(/\n+/g, ' // ');
+ }
+ if (data.ext) {
+ if (!excerpt) { excerpt = `${$.unescape(data.filename)}${data.ext}`; }
+ }
+ if (data.com) {
+ if (!excerpt) { excerpt = $.unescape(data.com.replace(/{commentHTML}+