Sources from which Javascript is allowed to be loaded by Content Security Policy.
- Lines starting with a
diff --git a/src/General/Settings/Settings.html b/src/General/Settings/Settings.html
deleted file mode 100644
index 79d337643f..0000000000
--- a/src/General/Settings/Settings.html
+++ /dev/null
@@ -1,17 +0,0 @@
-- Lines starting with a
# will be ignored.
+ Lines starting with a # will be ignored. Remove or comment out all lines to allow everything.
-
-
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..cf0d79256c 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, d } 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..ee52d9ab2e 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, E } 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')) {
@@ -305,7 +315,8 @@ var Embedding = {
regExp: /^[^?#]+\.(?:gif|png|jpg|jpeg|bmp|webp)(?::\w+)?(?:[?#]|$)/i,
style: '',
el(a) {
- return $.el('div', {innerHTML: '
+
-
-
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..fccce6bb84 100644
--- a/src/Monitoring/MarkNewIPs.js
+++ b/src/Monitoring/MarkNewIPs.js
@@ -1,3 +1,7 @@
+import Callbacks from "../classes/Callbacks";
+import { g, Conf, d } 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..b2727241e6 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() {
@@ -80,7 +102,7 @@ var ThreadWatcher = {
if (this.cb) { $.off(this.el, 'click', this.cb); }
this.cb = function() {
$.event('CloseMenu');
- return ThreadWatcher.toggle(thread);
+ return ThreadWatcher.toggle(thread, true);
};
$.on(this.el, 'click', this.cb);
return true;
@@ -143,8 +165,8 @@ var ThreadWatcher = {
catalogNode() {
if (ThreadWatcher.isWatched(this.thread)) { $.addClass(this.nodes.root, 'watched'); }
return $.on(this.nodes.root, 'mousedown click', e => {
- if ((e.button !== 0) || !e.altKey) { return; }
- if (e.type === 'click') { ThreadWatcher.toggle(this.thread); }
+ if ((e.button !== 0) || !e.altKey) return;
+ if (e.type === 'click') ThreadWatcher.toggle(this.thread, true);
return e.preventDefault();
});
}, // Also on mousedown to prevent highlighting thumbnail in Firefox.
@@ -182,6 +204,16 @@ var ThreadWatcher = {
}
return $.event('CloseMenu');
},
+ clear() {
+ if (!confirm("Delete ALL threads from watcher?")) return;
+ const ref = ThreadWatcher.getAll();
+ for (let i = 0, len = ref.length; i < len; i++) {
+ const { siteID, boardID, threadID } = ref[i];
+ ThreadWatcher.db.delete({ siteID, boardID, threadID });
+ }
+ ThreadWatcher.refresh(true);
+ $.event('CloseMenu');
+ },
pruneDeads() {
if ($.hasClass(this, 'disabled')) { return; }
for (var {siteID, boardID, threadID, data} of ThreadWatcher.getAll()) {
@@ -189,7 +221,7 @@ var ThreadWatcher = {
ThreadWatcher.db.delete({siteID, boardID, threadID});
}
}
- ThreadWatcher.refresh();
+ ThreadWatcher.refresh(true);
return $.event('CloseMenu');
},
dismiss() {
@@ -202,22 +234,24 @@ var ThreadWatcher = {
},
toggle() {
const {thread} = Get.postFromNode(this);
- return ThreadWatcher.toggle(thread);
+ ThreadWatcher.toggle(thread, true);
},
rm() {
const {siteID} = this.parentNode.dataset;
const [boardID, threadID] = Array.from(this.parentNode.dataset.fullID.split('.'));
- return ThreadWatcher.rm(siteID, boardID, +threadID);
+ return ThreadWatcher.rm(siteID, boardID, +threadID, undefined, true);
},
post(e) {
const {boardID, threadID, postID} = e.detail;
const cb = PostRedirect.delay();
if (postID === threadID) {
if (Conf['Auto Watch']) {
- return ThreadWatcher.addRaw(boardID, threadID, {}, cb);
+ ThreadWatcher.addRaw(boardID, threadID, {}, cb, true);
}
} else if (Conf['Auto Watch Reply']) {
- return ThreadWatcher.add((g.threads.get(boardID + '.' + threadID) || new Thread(threadID, g.boards[boardID] || new Board(boardID))), cb);
+ ThreadWatcher.add(
+ (g.threads.get(boardID + '.' + threadID) || new Thread(threadID, g.boards[boardID] || new Board(boardID))),
+ cb, true);
}
},
onIndexUpdate(e) {
@@ -275,7 +309,7 @@ var ThreadWatcher = {
url,
'ThreadWatcher',
onloadend,
- {timeout: $.MINUTE, ajax}
+ { timeout: MINUTE, ajax }
);
return ThreadWatcher.requests.push(req);
},
@@ -299,7 +333,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 +355,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 +389,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 +429,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 +646,7 @@ var ThreadWatcher = {
},
setPrefixes(threads) {
- const prefixes = $.dict();
+ const prefixes = dict();
for (var {siteID} of threads) {
if (siteID in prefixes) { continue; }
var len = 0;
@@ -655,7 +689,7 @@ var ThreadWatcher = {
return ThreadWatcher.refreshIcon();
},
- refresh() {
+ refresh(manual) {
ThreadWatcher.build();
g.threads.forEach(function(thread) {
@@ -672,7 +706,7 @@ var ThreadWatcher = {
});
if (Conf['Pin Watched Threads']) {
- return $.event('SortIndex', {deferred: Conf['Index Mode'] !== 'catalog'});
+ return $.event('SortIndex', {deferred: !(manual && Conf['Index Mode'] === 'catalog')});
}
},
@@ -723,18 +757,18 @@ var ThreadWatcher = {
return ThreadWatcher.db.extend({boardID, threadID, val: {isDead: true, isArchived: undefined, page: undefined, lastPage: undefined, unread: undefined, quotingYou: undefined}}, cb);
},
- toggle(thread) {
+ toggle(thread, manual) {
const siteID = g.SITE.ID;
const boardID = thread.board.ID;
const threadID = thread.ID;
if (ThreadWatcher.db.get({boardID, threadID})) {
- return ThreadWatcher.rm(siteID, boardID, threadID);
+ return ThreadWatcher.rm(siteID, boardID, threadID, undefined, manual);
} else {
- return ThreadWatcher.add(thread);
+ return ThreadWatcher.add(thread, undefined, manual);
}
},
- add(thread, cb) {
+ add(thread, cb, manual) {
const data = {};
const siteID = g.SITE.ID;
const boardID = thread.board.ID;
@@ -747,16 +781,16 @@ var ThreadWatcher = {
data.isDead = true;
}
if (thread.OP) { data.excerpt = Get.threadExcerpt(thread); }
- return ThreadWatcher.addRaw(boardID, threadID, data, cb);
+ return ThreadWatcher.addRaw(boardID, threadID, data, cb, manual);
},
- addRaw(boardID, threadID, data, cb) {
- const oldData = ThreadWatcher.db.get({boardID, threadID, defaultValue: $.dict()});
+ addRaw(boardID, threadID, data, cb, manual) {
+ const oldData = ThreadWatcher.db.get({ boardID, threadID, defaultValue: dict() });
delete oldData.last;
delete oldData.modified;
$.extend(oldData, data);
ThreadWatcher.db.set({boardID, threadID, val: oldData}, cb);
- ThreadWatcher.refresh();
+ ThreadWatcher.refresh(manual);
const thread = {siteID: g.SITE.ID, boardID, threadID, data, force: true};
if (Conf['Show Page'] && !data.isDead) {
return ThreadWatcher.fetchBoard([thread]);
@@ -765,9 +799,9 @@ var ThreadWatcher = {
}
},
- rm(siteID, boardID, threadID, cb) {
+ rm(siteID, boardID, threadID, cb, manual) {
ThreadWatcher.db.delete({siteID, boardID, threadID}, cb);
- return ThreadWatcher.refresh();
+ return ThreadWatcher.refresh(manual);
},
menu: {
@@ -798,7 +832,7 @@ var ThreadWatcher = {
return true;
}
});
- return $.on(entryEl, 'click', () => ThreadWatcher.toggle(g.threads.get(`${g.BOARD}.${g.THREADID}`)));
+ return $.on(entryEl, 'click', () => ThreadWatcher.toggle(g.threads.get(`${g.BOARD}.${g.THREADID}`), true));
},
addMenuEntries() {
@@ -890,9 +924,12 @@ var ThreadWatcher = {
entry.el.title += '\n[Remember Last Read Post is disabled.]';
}
$.on(input, 'change', $.cb.checked);
- if (['Current Board', 'Show Page', 'Show Unread Count', 'Show Site Prefix'].includes(name)) { $.on(input, 'change', ThreadWatcher.refresh); }
- if (['Show Page', 'Show Unread Count', 'Auto Update Thread Watcher'].includes(name)) { $.on(input, 'change', ThreadWatcher.fetchAuto); }
+ if (['Current Board', 'Show Page', 'Show Unread Count', 'Show Site Prefix'].includes(name))
+ $.on(input, 'change', () => ThreadWatcher.refresh());
+ if (['Show Page', 'Show Unread Count', 'Auto Update Thread Watcher'].includes(name))
+ $.on(input, 'change', ThreadWatcher.fetchAuto);
return this.menu.addEntry(entry);
}
}
};
+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..31f4f62d3c 100644
--- a/src/Posting/Captcha.js
+++ b/src/Posting/Captcha.js
@@ -1 +1,426 @@
-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 { recaptchaKey } = this;
+ const render = function () {
+ const { classList } = document.documentElement;
+ const container = document.querySelector('#qr .captcha-container');
+ return container.dataset.widgetID = window.grecaptcha.render(container, {
+ sitekey: 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);
+ }
+ }
+ }, { recaptchaKey: meta.recaptchaKey });
+ },
+
+ 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..48635ea8db 100644
--- a/src/Posting/Captcha.replace.js
+++ b/src/Posting/Captcha.replace.js
@@ -1,22 +1,21 @@
-/*
- * 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 = {
+import { g, Conf, doc, d } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+
+const CaptchaReplace = {
init() {
if ((g.SITE.software !== 'yotsuba') || (d.cookie.indexOf('pass_enabled=1') >= 0)) { return; }
if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
- $.ready(Captcha.replace.noscript);
+ $.ready(this.noscript);
return;
}
if (Conf['captchaLanguage'].trim()) {
if (['boards.4chan.org', 'boards.4channel.org'].includes(location.hostname)) {
- return $.onExists(doc, '#captchaFormPart', node => $.onExists(node, 'iframe[src^="https://www.google.com/recaptcha/"]', Captcha.replace.iframe));
+ $.onExists(doc, '#captchaFormPart', node => $.onExists(node, 'iframe[src^="https://www.google.com/recaptcha/"]', this.iframe));
} else {
- return $.onExists(doc, 'iframe[src^="https://www.google.com/recaptcha/"]', Captcha.replace.iframe);
+ $.onExists(doc, 'iframe[src^="https://www.google.com/recaptcha/"]', this.iframe);
}
}
},
@@ -30,12 +29,12 @@ Captcha.replace = {
$.rm(original);
const insert = function() {
span.innerHTML = noscript.textContent;
- return Captcha.replace.iframe($('iframe[src^="https://www.google.com/recaptcha/"]', span));
+ this.iframe($('iframe[src^="https://www.google.com/recaptcha/"]', span));
};
if (toggle = $('#togglePostFormLink a, #form-link')) {
- return $.on(toggle, 'click', insert);
+ $.on(toggle, 'click', insert);
} else {
- return insert();
+ insert();
}
},
@@ -50,3 +49,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..7cfa089205 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,12 +24,11 @@
* 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'],
+ mimeTypes: ['image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/vnd.adobe.flash.movie', 'application/x-shockwave-flash', 'video/webm', 'video/mp4'],
- validExtension: /\.(jpe?g|png|gif|pdf|swf|webm)$/i,
+ validExtension: /\.(jpe?g|png|gif|pdf|swf|webm|mp4)$/i,
typeFromExtension: {
'jpg': 'image/jpeg',
@@ -20,7 +37,8 @@ var QR = {
'gif': 'image/gif',
'pdf': 'application/pdf',
'swf': 'application/vnd.adobe.flash.movie',
- 'webm': 'video/webm'
+ 'webm': 'video/webm',
+ 'mp4': 'video/mp4'
},
extensionFromType: {
@@ -30,7 +48,8 @@ var QR = {
'application/pdf': 'pdf',
'application/vnd.adobe.flash.movie': 'swf',
'application/x-shockwave-flash': 'swf',
- 'video/webm': 'webm'
+ 'video/webm': 'webm',
+ 'video/mp4': 'mp4'
},
init() {
@@ -92,7 +111,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 +316,7 @@ var QR = {
notif.onclose = null;
return notif.close();
}
- , 7 * $.SECOND);
+ , 7 * SECOND);
}
}
},
@@ -427,11 +449,52 @@ var QR = {
characterCount() {
const counter = QR.nodes.charCount;
const count = QR.nodes.com.value.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '_').length;
- counter.textContent = count;
+ counter.textContent = count.toString();
counter.hidden = count < (QR.max_comment/2);
+
+ const splitPost = QR.nodes.splitPost;
+ splitPost.hidden = count < QR.max_comment;
+
return (count > QR.max_comment ? $.addClass : $.rmClass)(counter, 'warning');
},
+ splitPost() {
+ if (QR.selected.isLocked) return;
+ const count = QR.nodes.com.value.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '_').length;
+ if (count < QR.max_comment || QR.selected.isLocked) return;
+ const text = QR.nodes.com.value;
+ let lastPostLength = 0;
+ let splitCount = 0;
+ const idx = QR.posts.indexOf(QR.selected);
+ QR.selected.setComment("");
+
+ for (const line of text.split("\n")) {
+ const currentLength = line.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '_').length + 1 // +1 for newline at end
+ if (currentLength + lastPostLength > QR.max_comment) {
+ const post = new QR.post(true);
+ post.setComment(line);
+ lastPostLength = currentLength;
+ splitCount++;
+ } else {
+ const newComment = [QR.selected.com, line].filter(el => el !== null).join('\n');
+ QR.selected.setComment(newComment);
+ lastPostLength += currentLength;
+ }
+ }
+ const newPostIdx = QR.posts.length - splitCount;
+ const newPosts = QR.posts.splice(newPostIdx, splitCount)
+ QR.posts.splice(idx + 1, 0, ...newPosts);
+ const rearrangedDumpList = [...QR.nodes.dumpList.children];
+ const newDumps = rearrangedDumpList.splice(newPostIdx, splitCount);
+ rearrangedDumpList.splice(idx + 1, 0, ...newDumps);
+
+ for (const e of rearrangedDumpList) {
+ QR.nodes.dumpList.appendChild(e);
+ }
+
+ QR.nodes.el.classList.add('dump');
+ },
+
getFile() {
return $.event('QRFile', QR.selected?.file);
},
@@ -452,7 +515,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);
},
@@ -650,6 +716,7 @@ var QR = {
setNode('status', '[type=submit]');
setNode('flashTag', '[name=filetag]');
setNode('fileInput', '[type=file]');
+ setNode('splitPost', '#split-post')
const {config} = g.BOARD;
const {classList} = QR.nodes.el;
@@ -690,6 +757,7 @@ var QR = {
$.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown);
$.on(nodes.dumpButton, 'click', () => nodes.el.classList.toggle('dump'));
$.on(nodes.fileInput, 'change', QR.handleFiles);
+ $.on(nodes.splitPost, 'click', QR.splitPost);
window.addEventListener('focus', QR.focus, true);
window.addEventListener('blur', QR.focus, true);
@@ -947,8 +1015,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 +1146,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 +1169,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/Posting/QR/QuickReply.html b/src/Posting/QR/QuickReply.html index 51a58f961f..4da3b3916c 100644 --- a/src/Posting/QR/QuickReply.html +++ b/src/Posting/QR/QuickReply.html @@ -19,6 +19,7 @@
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..d00635c365 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, doc, 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..b17a33b073 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,14 +10,13 @@
* 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 = [];
}
constructor(key, sync, dontClean) {
+ this.changes = [];
this.onSync = this.onSync.bind(this);
this.key = key;
this.initData(Conf[this.key]);
@@ -39,13 +42,13 @@ 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 => {
+ return $.get(this.key, { boards: dict() }, items => {
if (!this.changes.length) { return; }
const needSync = ((items[this.key].version || 0) > (this.data.version || 0));
if (needSync) {
@@ -62,7 +65,7 @@ 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(); }
@@ -112,12 +115,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 +128,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 +183,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 +212,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..2a1901f906 100644
--- a/src/classes/Fetcher.js
+++ b/src/classes/Fetcher.js
@@ -1,3 +1,17 @@
+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";
+import { isEscaped } from "../globals/jsx";
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -7,9 +21,9 @@
* 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 = {
'\n': {innerHTML: "
"}, '[b]': {innerHTML: ""}, @@ -79,7 +93,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,20 +233,20 @@ 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] === '>'; text = text.replace(/(\[\/?[a-z]+):lit(\])/g, '$1$2'); text = text.split(/(>>(?:>\/[a-z\d]+\/)?\d+)/g).map((text2, j) => - {innerHTML: ((j % 2) ? "" + E(text2) + "" : E(text2));}); + ({innerHTML: ((j % 2) ? "" + E(text2) + "" : E(text2))})); text = {innerHTML: ((greentext) ? "" + E.cat(text) + "" : E.cat(text))}; result.push(text); } } return result; })(); - comment = {innerHTML: E.cat(comment)}; + comment = { innerHTML: E.cat(comment), [isEscaped]: true }; this.threadID = +data.thread_num; const o = { @@ -291,7 +306,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..23269ee6cc 100644 --- a/src/classes/Post.js +++ b/src/classes/Post.js @@ -1,27 +1,40 @@ +import Get from "../General/Get"; +// #region tests_enabled +import Test from "../General/Test"; +// #endregion +import { g, Conf } from "../globals/globals"; +import ImageExpand from "../Images/ImageExpand"; +import $ from "../platform/$"; +import $$ from "../platform/$$"; +import Callbacks from "./Callbacks"; + /* * 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={}) { - // <% if (readJSON('/.tests_enabled')) { %> - // @normalizedOriginal = Test.normalize root - // <% } %> + // #region tests_enabled + if (root) this.normalizedOriginal = Test.normalize(root); + // #endregion + // Skip initialization for PostClone + if (root === undefined && thread === undefined && board === undefined) return; + + this.root = root; this.thread = thread; this.board = board; $.extend(this, flags); @@ -82,9 +95,9 @@ class Post { this.isHidden = false; this.clones = []; - // <% if (readJSON('/.tests_enabled')) { %> - // return if @forBuildTest - // <% } %> + // #region tests_enabled + if (this.forBuildTest) return; + // #endregion if (g.posts.get(this.fullID)) { this.isRebuilt = true; this.clones = g.posts.get(this.fullID).clones; @@ -95,6 +108,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 +353,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(this, context, contractThumb); } rmClone(index) { @@ -354,5 +370,93 @@ 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(origin, context, contractThumb) { + super(); + this.isClone = true; + + 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 {
+ keys: string[]
+
constructor() {
this.keys = [];
}
- push(key, data) {
+ push(key, data: T) {
key = `${key}`;
if (!this[key]) { this.keys.push(key); }
return this[key] = data;
@@ -28,7 +32,7 @@ class SimpleDict {
for (var key of [...Array.from(this.keys)]) { fn(this[key]); }
}
- get(key) {
+ get(key): T {
if (key === 'keys') {
return undefined;
} else {
diff --git a/src/classes/Thread.js b/src/classes/Thread.js
index 423f036428..2b340d5c22 100644
--- a/src/classes/Thread.js
+++ b/src/classes/Thread.js
@@ -1,9 +1,13 @@
+import SimpleDict from "./SimpleDict";
+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 Thread {
+export default class Thread {
toString() { return this.ID; }
constructor(ID, board) {
diff --git a/src/config/Config.js b/src/config/Config.js
index 374e365f88..7e98fde899 100644
--- a/src/config/Config.js
+++ b/src/config/Config.js
@@ -1,5 +1,6 @@
import userCss from './user.css';
-import banners from './banners.js';
+import banners from './banners.json';
+import meta from '../../package.json';
const Config = {
main: {
@@ -12,9 +13,9 @@ const Config = {
true,
'Replace the original board index with one supporting searching, sorting, infinite scrolling, and a catalog mode.'
],
- 'Use <%= meta.name %> Catalog': [
+ [`Use ${meta.name} Catalog`]: [
true,
- 'Link to <%= meta.name %>\'s catalog instead of the native 4chan one.',
+ `Link to ${meta.name}'s catalog instead of the native 4chan one.`,
1
],
'Index Refresh Notifications': [
@@ -28,7 +29,7 @@ const Config = {
],
'Open Threads in New Tab': [
false,
- 'Make links to threads in the index / <%= meta.name %> catalog open in a new tab.'
+ `Make links to threads in the index / ${meta.name} catalog open in a new tab.`
],
'External Catalog': [
false,
@@ -44,7 +45,7 @@ const Config = {
],
'Desktop Notifications': [
true,
- 'Enables desktop notifications across various <%= meta.name %> features.'
+ `Enables desktop notifications across various ${meta.name} features.`
],
'404 Redirect': [
true,
@@ -110,7 +111,7 @@ const Config = {
],
'Show Updated Notifications': [
true,
- 'Show notifications when <%= meta.name %> is successfully updated.'
+ `Show notifications when ${meta.name} is successfully updated.`
],
'Color User IDs': [
true,
@@ -142,7 +143,7 @@ const Config = {
],
'Disable Native Extension': [
true,
- '<%= meta.name %> is NOT designed to work with the native extension.'
+ `${meta.name} is NOT designed to work with the native extension.`
],
'Enable Native Flash Embedding': [
true,
@@ -235,7 +236,7 @@ const Config = {
],
'Image Hover in Catalog': [
true,
- 'Show full image / video on mouseover in <%= meta.name %> catalog.'
+ `Show full image / video on mouseover in ${meta.name} catalog.`
],
'Gallery': [
true,
@@ -322,7 +323,7 @@ const Config = {
],
'Volume in New Tab': [
true,
- 'Apply <%= meta.name %> mute and volume settings to videos opened in their own tabs.'
+ `Apply ${meta.name} mute and volume settings to videos opened in their own tabs.`
]
},
@@ -860,7 +861,7 @@ http://eye.swfchan.com/search/?q=%name;types:swf
current-catalog-text:"Catalog"
current-expired-text:"Expired"
current-archive-text:"Archive"]
-[external-text:"FAQ","<%= meta.faq %>"]\
+[external-text:"FAQ","${meta.name}"]\
`,
QR: {
@@ -870,21 +871,7 @@ current-archive-text:"Archive"]
sjisPreview: false
},
- jsWhitelist: `\
-http://s.4cdn.org
-https://s.4cdn.org
-http://www.google.com
-https://www.google.com
-https://www.gstatic.com
-http://cdn.mathjax.org
-https://cdn.mathjax.org
-https://cdnjs.cloudflare.com
-https://hcaptcha.com
-https://*.hcaptcha.com
-'self'
-'unsafe-inline'
-'unsafe-eval'\
-`,
+ jsWhitelist: '',
captchaLanguage: '',
@@ -1201,3 +1188,4 @@ https://*.hcaptcha.com
'PSAseen': [[]]
};
+export default Config;
diff --git a/src/config/banners.js b/src/config/banners.js
deleted file mode 100644
index 9cf65d7426..0000000000
--- a/src/config/banners.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const banners = ["0.jpg", "1.jpg", "2.jpg", "4.jpg", "6.jpg", "7.jpg", "8.jpg", "9.jpg", "10.jpg", "11.jpg", "12.jpg", "13.jpg", "14.jpg", "16.jpg", "17.jpg", "18.jpg", "19.jpg", "20.jpg", "21.jpg", "22.jpg", "24.jpg", "25.jpg", "26.jpg", "28.jpg", "29.jpg", "33.jpg", "38.jpg", "39.jpg", "43.jpg", "44.jpg", "45.jpg", "46.jpg", "47.jpg", "52.jpg", "54.jpg", "57.jpg", "59.jpg", "60.jpg", "61.jpg", "64.jpg", "66.jpg", "67.jpg", "69.jpg", "71.jpg", "72.jpg", "76.jpg", "77.jpg", "81.jpg", "82.jpg", "83.jpg", "84.jpg", "88.jpg", "90.jpg", "91.jpg", "96.jpg", "98.jpg", "99.jpg", "100.jpg", "104.jpg", "106.jpg", "116.jpg", "119.jpg", "137.jpg", "140.jpg", "148.jpg", "149.jpg", "150.jpg", "154.jpg", "156.jpg", "157.jpg", "158.jpg", "159.jpg", "161.jpg", "162.jpg", "164.jpg", "165.jpg", "166.jpg", "167.jpg", "168.jpg", "169.jpg", "170.jpg", "171.jpg", "172.jpg", "173.jpg", "174.jpg", "175.jpg", "176.jpg", "178.jpg", "179.jpg", "180.jpg", "181.jpg", "182.jpg", "183.jpg", "186.jpg", "189.jpg", "190.jpg", "192.jpg", "193.jpg", "194.jpg", "197.jpg", "198.jpg", "200.jpg", "201.jpg", "202.jpg", "203.jpg", "205.jpg", "206.jpg", "207.jpg", "208.jpg", "210.jpg", "213.jpg", "214.jpg", "215.jpg", "216.jpg", "218.jpg", "219.jpg", "220.jpg", "221.jpg", "222.jpg", "223.jpg", "224.jpg", "227.jpg", "0.png", "1.png", "2.png", "3.png", "5.png", "6.png", "9.png", "10.png", "11.png", "12.png", "14.png", "16.png", "19.png", "20.png", "21.png", "22.png", "23.png", "24.png", "26.png", "27.png", "28.png", "29.png", "30.png", "31.png", "32.png", "33.png", "34.png", "37.png", "39.png", "40.png", "41.png", "42.png", "43.png", "44.png", "45.png", "48.png", "49.png", "50.png", "51.png", "52.png", "53.png", "57.png", "58.png", "59.png", "64.png", "66.png", "67.png", "68.png", "69.png", "70.png", "71.png", "72.png", "76.png", "78.png", "79.png", "81.png", "82.png", "85.png", "86.png", "87.png", "89.png", "95.png", "98.png", "100.png", "101.png", "102.png", "105.png", "106.png", "107.png", "109.png", "110.png", "111.png", "112.png", "113.png", "114.png", "115.png", "116.png", "118.png", "119.png", "120.png", "121.png", "122.png", "123.png", "126.png", "128.png", "130.png", "134.png", "136.png", "138.png", "139.png", "140.png", "142.png", "145.png", "146.png", "149.png", "150.png", "151.png", "152.png", "153.png", "154.png", "155.png", "156.png", "157.png", "158.png", "159.png", "160.png", "163.png", "164.png", "165.png", "166.png", "167.png", "168.png", "169.png", "170.png", "171.png", "172.png", "173.png", "174.png", "178.png", "179.png", "180.png", "181.png", "182.png", "184.png", "186.png", "188.png", "190.png", "192.png", "193.png", "194.png", "195.png", "196.png", "197.png", "198.png", "200.png", "202.png", "203.png", "205.png", "206.png", "207.png", "209.png", "212.png", "213.png", "214.png", "216.png", "217.png", "218.png", "219.png", "220.png", "221.png", "222.png", "223.png", "224.png", "225.png", "226.png", "229.png", "231.png", "232.png", "233.png", "234.png", "235.png", "237.png", "238.png", "239.png", "240.png", "241.png", "242.png", "244.png", "245.png", "246.png", "247.png", "248.png", "249.png", "250.png", "253.png", "254.png", "255.png", "256.png", "257.png", "258.png", "259.png", "260.png", "262.png", "268.png", "0.gif", "1.gif", "2.gif", "3.gif", "4.gif", "5.gif", "6.gif", "7.gif", "8.gif", "9.gif", "10.gif", "12.gif", "13.gif", "14.gif", "15.gif", "16.gif", "18.gif", "19.gif", "20.gif", "21.gif", "22.gif", "23.gif", "24.gif", "28.gif", "29.gif", "30.gif", "33.gif", "34.gif", "35.gif", "36.gif", "37.gif", "39.gif", "40.gif", "42.gif", "44.gif", "45.gif", "46.gif", "48.gif", "50.gif", "52.gif", "54.gif", "55.gif", "57.gif", "58.gif", "59.gif", "60.gif", "61.gif", "63.gif", "64.gif", "66.gif", "67.gif", "68.gif", "69.gif", "70.gif", "72.gif", "73.gif", "75.gif", "76.gif", "77.gif", "78.gif", "80.gif", "81.gif", "82.gif", "83.gif", "86.gif", "87.gif", "88.gif", "92.gif", "93.gif", "94.gif", "95.gif", "96.gif", "97.gif", "98.gif", "99.gif", "100.gif", "101.gif", "102.gif", "103.gif", "104.gif", "105.gif", "106.gif", "108.gif", "109.gif", "110.gif", "111.gif", "112.gif", "113.gif", "115.gif", "116.gif", "117.gif", "118.gif", "119.gif", "120.gif", "122.gif", "123.gif", "124.gif", "127.gif", "129.gif", "130.gif", "131.gif", "134.gif", "135.gif", "136.gif", "138.gif", "139.gif", "141.gif", "144.gif", "146.gif", "148.gif", "149.gif", "153.gif", "154.gif", "155.gif", "157.gif", "158.gif", "159.gif", "160.gif", "161.gif", "162.gif", "164.gif", "166.gif", "167.gif", "168.gif", "169.gif", "170.gif", "171.gif", "172.gif", "173.gif", "174.gif", "175.gif", "176.gif", "177.gif", "178.gif", "181.gif", "182.gif", "183.gif", "185.gif", "186.gif", "187.gif", "188.gif", "189.gif", "190.gif", "191.gif", "192.gif", "193.gif", "195.gif", "196.gif", "197.gif", "200.gif", "201.gif", "202.gif", "203.gif", "204.gif", "205.gif", "206.gif", "207.gif", "208.gif", "209.gif", "210.gif", "211.gif", "212.gif", "213.gif", "214.gif", "215.gif", "216.gif", "217.gif", "219.gif", "220.gif", "221.gif", "222.gif", "224.gif", "225.gif", "226.gif", "227.gif", "228.gif", "230.gif", "232.gif", "233.gif", "234.gif", "235.gif", "238.gif", "240.gif", "241.gif", "243.gif", "244.gif", "245.gif", "246.gif", "247.gif", "249.gif", "250.gif", "251.gif", "253.gif"];
-export default banners;
diff --git a/src/config/banners.json b/src/config/banners.json
new file mode 100644
index 0000000000..785cc83064
--- /dev/null
+++ b/src/config/banners.json
@@ -0,0 +1 @@
+["0.jpg", "1.jpg", "2.jpg", "4.jpg", "6.jpg", "7.jpg", "8.jpg", "9.jpg", "10.jpg", "11.jpg", "12.jpg", "13.jpg", "14.jpg", "16.jpg", "17.jpg", "18.jpg", "19.jpg", "20.jpg", "21.jpg", "22.jpg", "24.jpg", "25.jpg", "26.jpg", "28.jpg", "29.jpg", "33.jpg", "38.jpg", "39.jpg", "43.jpg", "44.jpg", "45.jpg", "46.jpg", "47.jpg", "52.jpg", "54.jpg", "57.jpg", "59.jpg", "60.jpg", "61.jpg", "64.jpg", "66.jpg", "67.jpg", "69.jpg", "71.jpg", "72.jpg", "76.jpg", "77.jpg", "81.jpg", "82.jpg", "83.jpg", "84.jpg", "88.jpg", "90.jpg", "91.jpg", "96.jpg", "98.jpg", "99.jpg", "100.jpg", "104.jpg", "106.jpg", "116.jpg", "119.jpg", "137.jpg", "140.jpg", "148.jpg", "149.jpg", "150.jpg", "154.jpg", "156.jpg", "157.jpg", "158.jpg", "159.jpg", "161.jpg", "162.jpg", "164.jpg", "165.jpg", "166.jpg", "167.jpg", "168.jpg", "169.jpg", "170.jpg", "171.jpg", "172.jpg", "173.jpg", "174.jpg", "175.jpg", "176.jpg", "178.jpg", "179.jpg", "180.jpg", "181.jpg", "182.jpg", "183.jpg", "186.jpg", "189.jpg", "190.jpg", "192.jpg", "193.jpg", "194.jpg", "197.jpg", "198.jpg", "200.jpg", "201.jpg", "202.jpg", "203.jpg", "205.jpg", "206.jpg", "207.jpg", "208.jpg", "210.jpg", "213.jpg", "214.jpg", "215.jpg", "216.jpg", "218.jpg", "219.jpg", "220.jpg", "221.jpg", "222.jpg", "223.jpg", "224.jpg", "227.jpg", "0.png", "1.png", "2.png", "3.png", "5.png", "6.png", "9.png", "10.png", "11.png", "12.png", "14.png", "16.png", "19.png", "20.png", "21.png", "22.png", "23.png", "24.png", "26.png", "27.png", "28.png", "29.png", "30.png", "31.png", "32.png", "33.png", "34.png", "37.png", "39.png", "40.png", "41.png", "42.png", "43.png", "44.png", "45.png", "48.png", "49.png", "50.png", "51.png", "52.png", "53.png", "57.png", "58.png", "59.png", "64.png", "66.png", "67.png", "68.png", "69.png", "70.png", "71.png", "72.png", "76.png", "78.png", "79.png", "81.png", "82.png", "85.png", "86.png", "87.png", "89.png", "95.png", "98.png", "100.png", "101.png", "102.png", "105.png", "106.png", "107.png", "109.png", "110.png", "111.png", "112.png", "113.png", "114.png", "115.png", "116.png", "118.png", "119.png", "120.png", "121.png", "122.png", "123.png", "126.png", "128.png", "130.png", "134.png", "136.png", "138.png", "139.png", "140.png", "142.png", "145.png", "146.png", "149.png", "150.png", "151.png", "152.png", "153.png", "154.png", "155.png", "156.png", "157.png", "158.png", "159.png", "160.png", "163.png", "164.png", "165.png", "166.png", "167.png", "168.png", "169.png", "170.png", "171.png", "172.png", "173.png", "174.png", "178.png", "179.png", "180.png", "181.png", "182.png", "184.png", "186.png", "188.png", "190.png", "192.png", "193.png", "194.png", "195.png", "196.png", "197.png", "198.png", "200.png", "202.png", "203.png", "205.png", "206.png", "207.png", "209.png", "212.png", "213.png", "214.png", "216.png", "217.png", "218.png", "219.png", "220.png", "221.png", "222.png", "223.png", "224.png", "225.png", "226.png", "229.png", "231.png", "232.png", "233.png", "234.png", "235.png", "237.png", "238.png", "239.png", "240.png", "241.png", "242.png", "244.png", "245.png", "246.png", "247.png", "248.png", "249.png", "250.png", "253.png", "254.png", "255.png", "256.png", "257.png", "258.png", "259.png", "260.png", "262.png", "268.png", "0.gif", "1.gif", "2.gif", "3.gif", "4.gif", "5.gif", "6.gif", "7.gif", "8.gif", "9.gif", "10.gif", "12.gif", "13.gif", "14.gif", "15.gif", "16.gif", "18.gif", "19.gif", "20.gif", "21.gif", "22.gif", "23.gif", "24.gif", "28.gif", "29.gif", "30.gif", "33.gif", "34.gif", "35.gif", "36.gif", "37.gif", "39.gif", "40.gif", "42.gif", "44.gif", "45.gif", "46.gif", "48.gif", "50.gif", "52.gif", "54.gif", "55.gif", "57.gif", "58.gif", "59.gif", "60.gif", "61.gif", "63.gif", "64.gif", "66.gif", "67.gif", "68.gif", "69.gif", "70.gif", "72.gif", "73.gif", "75.gif", "76.gif", "77.gif", "78.gif", "80.gif", "81.gif", "82.gif", "83.gif", "86.gif", "87.gif", "88.gif", "92.gif", "93.gif", "94.gif", "95.gif", "96.gif", "97.gif", "98.gif", "99.gif", "100.gif", "101.gif", "102.gif", "103.gif", "104.gif", "105.gif", "106.gif", "108.gif", "109.gif", "110.gif", "111.gif", "112.gif", "113.gif", "115.gif", "116.gif", "117.gif", "118.gif", "119.gif", "120.gif", "122.gif", "123.gif", "124.gif", "127.gif", "129.gif", "130.gif", "131.gif", "134.gif", "135.gif", "136.gif", "138.gif", "139.gif", "141.gif", "144.gif", "146.gif", "148.gif", "149.gif", "153.gif", "154.gif", "155.gif", "157.gif", "158.gif", "159.gif", "160.gif", "161.gif", "162.gif", "164.gif", "166.gif", "167.gif", "168.gif", "169.gif", "170.gif", "171.gif", "172.gif", "173.gif", "174.gif", "175.gif", "176.gif", "177.gif", "178.gif", "181.gif", "182.gif", "183.gif", "185.gif", "186.gif", "187.gif", "188.gif", "189.gif", "190.gif", "191.gif", "192.gif", "193.gif", "195.gif", "196.gif", "197.gif", "200.gif", "201.gif", "202.gif", "203.gif", "204.gif", "205.gif", "206.gif", "207.gif", "208.gif", "209.gif", "210.gif", "211.gif", "212.gif", "213.gif", "214.gif", "215.gif", "216.gif", "217.gif", "219.gif", "220.gif", "221.gif", "222.gif", "224.gif", "225.gif", "226.gif", "227.gif", "228.gif", "230.gif", "232.gif", "233.gif", "234.gif", "235.gif", "238.gif", "240.gif", "241.gif", "243.gif", "244.gif", "245.gif", "246.gif", "247.gif", "249.gif", "250.gif", "251.gif", "253.gif"]
\ No newline at end of file
diff --git a/src/css/CSS.js b/src/css/CSS.js
deleted file mode 100644
index 8d106a0892..0000000000
--- a/src/css/CSS.js
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
- var inc = require['style'];
- var faCSS = read('/node_modules/font-awesome/css/font-awesome.css');
- var faWebFont = readBase64('/node_modules/font-awesome/fonts/fontawesome-webfont.woff');
- var mainCSS = ['font-awesome', 'style', 'yotsuba', 'yotsuba-b', 'futaba', 'burichan', 'tomorrow', 'photon', 'spooky'].map(x => read(`${x}.css`)).join('');
- var iconNames = files.filter(f => /^linkify\.[^.]+\.png$/.test(f));
- var icons = iconNames.map(readBase64);
-%>CSS = {
-
-boards:
-<%= multiline(
- inc.fa(faCSS, faWebFont) + mainCSS + inc.icons(iconNames, icons) + read('supports.css')
-) %>,
-
-report:
-<%= multiline(read('report.css')) %>,
-
-www:
-<%= multiline(read('www.css')) %>,
-
-sub: function(css) {
- var variables = {
- site: g.SITE.selectors
- };
- return css.replace(/\$[\w\$]+/g, function(name) {
- var words = name.slice(1).split('$');
- var sel = variables;
- for (var i = 0; i < words.length; i++) {
- if (typeof sel !== 'object') return ':not(*)';
- sel = $.getOwn(sel, words[i]);
- }
- if (typeof sel !== 'string') return ':not(*)';
- return sel;
- });
-}
-
-};
diff --git a/src/css/CSS.ts b/src/css/CSS.ts
new file mode 100644
index 0000000000..7d9bf94c0a
--- /dev/null
+++ b/src/css/CSS.ts
@@ -0,0 +1,107 @@
+// cSpell:ignore installGentoo, fontawesome, webfont
+
+import $ from '../platform/$';
+
+// import boardCss from './board.css';
+import faCSS from '../../node_modules/font-awesome/css/font-awesome.css';
+import faWebFont from '../../node_modules/font-awesome/fonts/fontawesome-webfont.woff';
+
+import burichan from './burichan.css';
+import fontAwesome from './font-awesome.css';
+import futaba from './futaba.css';
+import linkifyAudio from './linkify.audio.png';
+import linkifyBitchute from './linkify.bitchute.png';
+import linkifyClyp from './linkify.clyp.png';
+import linkifyDailymotion from './linkify.dailymotion.png';
+import linkifyGfycat from './linkify.gfycat.png';
+import linkifyGist from './linkify.gist.png';
+import linkifyImage from './linkify.image.png';
+import linkifyInstallgentoo from './linkify.installgentoo.png';
+import linkifyLiveleak from './linkify.liveleak.png';
+import linkifyPastebin from './linkify.pastebin.png';
+import linkifyPeertube from './linkify.peertube.png';
+import linkifySoundcloud from './linkify.soundcloud.png';
+import linkifyStreamable from './linkify.streamable.png';
+import linkifyTwitchtv from './linkify.twitchtv.png';
+import linkifyTwitter from './linkify.twitter.png';
+import linkifyVideo from './linkify.video.png';
+import linkifyVidlii from './linkify.vidlii.png';
+import linkifyCimeo from './linkify.vimeo.png';
+import linkifyVine from './linkify.vine.png';
+import linkifyVocaroo from './linkify.vocaroo.png';
+import linkifyYoutube from './linkify.youtube.png';
+
+import photon from './photon.css';
+import report from './report.css';
+import spooky from './spooky.css';
+import style from './style.css';
+// style.inc
+import supports from './supports.css';
+import tomorrow from './tomorrow.css';
+import www from './www.css';
+import yotsubaB from './yotsuba-b.css';
+import yotsuba from './yotsuba.css';
+import { fa, icons } from './style';
+import { g } from '../globals/globals';
+
+// <%
+ // var inc = require['style'];
+ // var faCSS = read('/node_modules/font-awesome/css/font-awesome.css');
+ // var faWebFont = readBase64('/node_modules/font-awesome/fonts/fontawesome-webfont.woff');
+ // var mainCSS = ['font-awesome', 'style', 'yotsuba', 'yotsuba-b', 'futaba', 'burichan', 'tomorrow', 'photon', 'spooky'].map(x => read(`${x}.css`)).join('');
+// var iconNames = files.filter(f => /^linkify\.[^.]+\.png$/.test(f));
+// var icons = iconNames.map(readBase64);
+// %>
+
+const mainCSS = fontAwesome + style + yotsuba +yotsubaB+futaba+burichan+tomorrow + photon + spooky;
+const faIcons: { name: string, data: string }[] = [
+ { name: "Audio", data: linkifyAudio },
+ { name: "Bitchute", data: linkifyBitchute },
+ { name: "Clyp", data: linkifyClyp },
+ { name: "Dailymotion", data: linkifyDailymotion },
+ { name: "Gfycat", data: linkifyGfycat },
+ { name: "Gist", data: linkifyGist },
+ { name: "Image", data: linkifyImage },
+ { name: "Installgentoo", data: linkifyInstallgentoo },
+ { name: "Liveleak", data: linkifyLiveleak },
+ { name: "Pastebin", data: linkifyPastebin },
+ { name: "Peertube", data: linkifyPeertube },
+ { name: "Soundcloud", data: linkifySoundcloud },
+ { name: "Streamable", data: linkifyStreamable },
+ { name: "Twitchtv", data: linkifyTwitchtv },
+ { name: "Twitter", data: linkifyTwitter },
+ { name: "Video", data: linkifyVideo },
+ { name: "Vidlii", data: linkifyVidlii },
+ { name: "Cimeo", data: linkifyCimeo },
+ { name: "Vine", data: linkifyVine },
+ { name: "Vocaroo", data: linkifyVocaroo },
+ { name: "Youtube", data: linkifyYoutube },
+];
+
+const CSS = {
+
+ boards: fa(faCSS, faWebFont) + mainCSS + icons(faIcons) + supports,
+
+ report,
+
+ www,
+
+ sub: function(css: string) {
+ var variables = {
+ site: g.SITE.selectors
+ };
+ return css.replace(/\$[\w\$]+/g, function(name) {
+ var words = name.slice(1).split('$');
+ var sel = variables;
+ for (var i = 0; i < words.length; i++) {
+ if (typeof sel !== 'object') return ':not(*)';
+ sel = $.getOwn(sel, words[i]);
+ }
+ if (typeof sel !== 'string') return ':not(*)';
+ return sel;
+ });
+ }
+
+};
+
+export default CSS;
diff --git a/src/css/style.css b/src/css/style.css
index b00e259337..569d016ffd 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1918,7 +1918,7 @@ input[type="checkbox"]:checked ~ .checkbox-letter {
opacity: 0;
pointer-events: none;
}
-.checkbox-letter, #paste-area, #url-button, #custom-cooldown-button, #dump-button {
+.checkbox-letter, #paste-area, #url-button, #custom-cooldown-button, #dump-button, #split-post {
opacity: 0.6;
}
#paste-area {
diff --git a/src/css/style.inc b/src/css/style.inc
deleted file mode 100644
index 8eb7dae906..0000000000
--- a/src/css/style.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* jshint esnext: true */
-
-// == Reprocess Font Awesome CSS == //
-var fa = (css, font) => (
-
-// Font Awesome CSS attribution and license
-css.match(/\/\*\![^]*?\*\//)[0] + '\n' +
-
-// Font Awesome web font
-`@font-face {
- font-family: FontAwesome;
- src: url('data:application/font-woff;base64,${font}') format('woff');
- font-weight: 400;
- font-style: normal;
-}
-` +
-
-// fa-[icon name] classes
-css
- .match(/(\.fa-[^{]*{\s*content:[^}]*}\s*)+/)[0]
- .replace(/([,{;])\s+/g, '$1')
- .replace(/,/g, ', ')
-
-);
-
-// == Create CSS for Link Title Favicons == //
-var icons = (names, data) => (
-
-'/* Link Title Favicons */\n' +
-names.map((file, i) =>
-`.linkify.${file.split('.')[1]}::before {
- content: "";
- background: transparent url('data:image/png;base64,${data[i]}') center left no-repeat!important;
- padding-left: 18px;
-}
-`
-).join('')
-
-);
-
-return {fa, icons};
diff --git a/src/css/style.ts b/src/css/style.ts
new file mode 100644
index 0000000000..f13f37f8e7
--- /dev/null
+++ b/src/css/style.ts
@@ -0,0 +1,37 @@
+// == Reprocess Font Awesome CSS == //
+export const fa = (css: string, font: string) => (
+
+ // Font Awesome CSS attribution and license
+ css.match(/\/\*\![^]*?\*\//)[0] + '\n' +
+
+ // Font Awesome web font
+ `@font-face {
+ font-family: FontAwesome;
+ src: url('data:application/font-woff;base64,${font}') format('woff');
+ font-weight: 400;
+ font-style: normal;
+}
+` +
+
+ // fa-[icon name] classes
+ css
+ .match(/(\.fa-[^{]*{\s*content:[^}]*}\s*)+/)[0]
+ .replace(/([,{;])\s+/g, '$1')
+ .replace(/,/g, ', ')
+
+);
+
+// == Create CSS for Link Title Favicons == //
+export const icons = (data: { name: string, data: string }[]) => (
+
+ '/* Link Title Favicons */\n' +
+ data.map(({ name, data }) =>
+ `.linkify.${name}::before {
+ content: "";
+ background: transparent url('data:image/png;base64,${data}') center left no-repeat!important;
+ padding-left: 18px;
+}
+`
+ ).join('')
+
+);
diff --git a/src/globals/globals.js b/src/globals/globals.js
deleted file mode 100644
index 6b3f2b47f8..0000000000
--- a/src/globals/globals.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var Conf, E, c, d, doc, docSet, g;
-
-Conf = Object.create(null);
-c = console;
-d = document;
-doc = d.documentElement;
-
-// Workaround for userscript managers that run script before document.documentElement is set
-docSet = function() {
- return (doc = d.documentElement);
-};
-
-g = {
- VERSION: '<%= readJSON('/version.json').version %>',
- NAMESPACE: '<%= meta.name %>.',
- sites: Object.create(null),
- boards: Object.create(null)
-};
-
-E = (function() {
- var fn, r, regex, str;
- str = {
- '&': '&',
- "'": ''',
- '"': '"',
- '<': '<',
- '>': '>'
- };
- r = String.prototype.replace;
- regex = /[&"'<>]/g;
- fn = function(x) {
- return str[x];
- };
- return function(text) {
- return r.call(text, regex, fn);
- };
-})();
-
-E.cat = function(templates) {
- var html, i, len;
- html = '';
- for (i = 0, len = templates.length; i < len; i++) {
- html += templates[i].innerHTML;
- }
- return html;
-};
diff --git a/src/globals/globals.ts b/src/globals/globals.ts
new file mode 100644
index 0000000000..bf97f379b9
--- /dev/null
+++ b/src/globals/globals.ts
@@ -0,0 +1,94 @@
+import version from "../../version.json";
+import meta from "../../package.json";
+import type SimpleDict from "../classes/SimpleDict";
+import type Post from "../classes/Post";
+import type Thread from "../classes/Thread";
+import type SWTinyboard from "../site/SW.tinyboard";
+
+// interfaces might be incomplete
+export interface BoardConfig {
+ board: string
+ bump_limit: number
+ cooldowns: {
+ threads: number,
+ replies: number,
+ images: number,
+ }
+ custom_spoilers: 1 | 0,
+ image_limit: number,
+ is_archived: 1 | 0,
+ max_comment_chars: number
+ max_filesize: number
+ max_webm_duration: number
+ max_webm_filesize: number
+ meta_description: string,
+ pages: number,
+ per_page: number,
+ spoilers: number,
+ title: string
+ ws_board: 1 | 0
+}
+
+export interface Board {
+ ID: string,
+ boardID: string,
+ siteID: string,
+ config: BoardConfig,
+ posts: SimpleDict,
+ threads: SimpleDict,
+}
+
+export const Conf = Object.create(null);
+
+export const g: {
+ VERSION: string,
+ NAMESPACE: string,
+ sites: (typeof SWTinyboard)[],
+ boards: Board[],
+ posts?: SimpleDict,
+ threads?: SimpleDict
+ THREADID?: number,
+ SITE?: typeof SWTinyboard,
+ BOARD?: Board,
+ VIEW?: string,
+} = {
+ VERSION: version.version,
+ NAMESPACE: meta.name,
+ sites: Object.create(null),
+ boards: Object.create(null)
+};
+
+export const E = (function () {
+ const str = {
+ '&': '&',
+ "'": ''',
+ '"': '"',
+ '<': '<',
+ '>': '>'
+ };
+ const regex = /[&"'<>]/g;
+ const fn = function (x: string) {
+ return str[x];
+ };
+ const output = function (text: string) {
+ return text.toString().replace(regex, fn);
+ };
+ output.cat = function (templates) {
+ let html = '';
+ for (let i = 0; i < templates.length; i++) {
+ html += templates[i].innerHTML;
+ }
+ return html;
+ };
+ return output;
+})();
+
+export const d = document;
+export const doc = d.documentElement;
+
+export const c = console;
+
+export const docSet = function () {
+ // return (doc = d.documentElement);
+ return doc;
+};
diff --git a/src/globals/jsx.ts b/src/globals/jsx.ts
new file mode 100644
index 0000000000..9556753ca4
--- /dev/null
+++ b/src/globals/jsx.ts
@@ -0,0 +1,70 @@
+/*
+ * This file has the code for the jsx to { innerHTML: "safe string" }
+ *
+ * Usage: import h from this file.
+ * Attributes are stringified raw, so the names must be like html text: eg class and not className.
+ * Boolean values are stringified as followed: true will mean the attribute is there, false means it will be omitted.
+ * Strings bound to attributes and children will be escaped automatically.
+ * It returns interface EscapedHtml { innerHTML: "safe string", [isEscaped]: true }
+ *
+ * For strings that don't have a parent element you can use fragments: <>.
+ * Note that you need to import hFragment, which for some reason isn't auto imported on "add all missing imports"
+ */
+
+import { E } from "./globals";
+
+/**
+ * The symbol indicating that a string is safely escaped.
+ * This is a symbol so it can't be faked by a json blob from the internet.
+ */
+export const isEscaped = Symbol('isEscaped');
+
+export interface EscapedHtml {
+ innerHTML: string,
+ [isEscaped]: true,
+}
+
+const voidElements = new Set(
+ ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'source', 'track', 'wbr',]
+);
+
+export const hFragment = Symbol('hFragment');
+
+/** Function that jsx/tsx will be compiled to. */
+export default function h(
+ tag: string | typeof hFragment,
+ attributes: Record | null,
+ ...children: unknown[]
+): EscapedHtml {
+ let innerHTML = tag === hFragment ? '' : `<${tag}`;
+
+ if (attributes) {
+ for (const [attribute, value] of Object.entries(attributes)) {
+ if (!value && value !== 0) continue;
+ innerHTML += ` ${attribute}`;
+ if (value === true) continue;
+ innerHTML += `="${E(value.toString())}"`;
+ }
+ }
+ if (tag !== hFragment) innerHTML += '>';
+
+ const isVoid = tag !== hFragment && voidElements.has(tag);
+ if (isVoid) {
+ if (children.length) throw new TypeError(`${tag} is a void html element and can't have child elements`);
+ } else {
+ for (const child of children) {
+ if (child === null || child === undefined || child === '') continue;
+
+ if (child instanceof Object && "innerHTML" in child && child[isEscaped]) {
+ innerHTML += child.innerHTML;
+ continue;
+ }
+
+ innerHTML += E(child.toString());
+ }
+ }
+
+ if (!isVoid && tag !== hFragment) innerHTML += ``;
+
+ return { innerHTML, [isEscaped]: true };
+}
diff --git a/src/main/Main.js b/src/main/Main.js
index fdd8aa11f7..ce2eddb34d 100644
--- a/src/main/Main.js
+++ b/src/main/Main.js
@@ -1,3 +1,99 @@
+import Redirect from "../Archive/Redirect";
+import Board from "../classes/Board";
+import Callbacks from "../classes/Callbacks";
+import CatalogThreadNative from "../classes/CatalogThreadNative";
+import DataBoard from "../classes/DataBoard";
+import Notice from "../classes/Notice";
+import Post from "../classes/Post";
+import SimpleDict from "../classes/SimpleDict";
+import Thread from "../classes/Thread";
+import Config from "../config/Config";
+import Anonymize from "../Filtering/Anonymize";
+import Filter from "../Filtering/Filter";
+import PostHiding from "../Filtering/PostHiding";
+import Recursive from "../Filtering/Recursive";
+import ThreadHiding from "../Filtering/ThreadHiding";
+import Index from "../General/Index";
+import Settings from "../General/Settings";
+import FappeTyme from "../Images/FappeTyme";
+import Gallery from "../Images/Gallery";
+import ImageCommon from "../Images/ImageCommon";
+import ImageExpand from "../Images/ImageExpand";
+import ImageHost from "../Images/ImageHost";
+import ImageHover from "../Images/ImageHover";
+import ImageLoader from "../Images/ImageLoader";
+import Metadata from "../Images/Metadata";
+import RevealSpoilers from "../Images/RevealSpoilers";
+import Sauce from "../Images/Sauce";
+import Volume from "../Images/Volume";
+import Linkify from "../Linkification/Linkify";
+import ArchiveLink from "../Menu/ArchiveLink";
+import CopyTextLink from "../Menu/CopyTextLink";
+import DeleteLink from "../Menu/DeleteLink";
+import DownloadLink from "../Menu/DownloadLink";
+import ReportLink from "../Menu/ReportLink";
+import AntiAutoplay from "../Miscellaneous/AntiAutoplay";
+import Banner from "../Miscellaneous/Banner";
+import CatalogLinks from "../Miscellaneous/CatalogLinks";
+import CustomCSS from "../Miscellaneous/CustomCSS";
+import ExpandComment from "../Miscellaneous/ExpandComment";
+import ExpandThread from "../Miscellaneous/ExpandThread";
+import FileInfo from "../Miscellaneous/FileInfo";
+import Flash from "../Miscellaneous/Flash";
+import Fourchan from "../Miscellaneous/Fourchan";
+import IDColor from "../Miscellaneous/IDColor";
+import IDHighlight from "../Miscellaneous/IDHighlight";
+import IDPostCount from "../Miscellaneous/IDPostCount";
+import Keybinds from "../Miscellaneous/Keybinds";
+import ModContact from "../Miscellaneous/ModContact";
+import Nav from "../Miscellaneous/Nav";
+import NormalizeURL from "../Miscellaneous/NormalizeURL";
+import PostJumper from "../Miscellaneous/PostJumper";
+import PSA from "../Miscellaneous/PSA";
+import PSAHiding from "../Miscellaneous/PSAHiding";
+import RelativeDates from "../Miscellaneous/RelativeDates";
+import RemoveSpoilers from "../Miscellaneous/RemoveSpoilers";
+import ThreadLinks from "../Miscellaneous/ThreadLinks";
+import Time from "../Miscellaneous/Time";
+import Tinyboard from "../Miscellaneous/Tinyboard";
+import Favicon from "../Monitoring/Favicon";
+import MarkNewIPs from "../Monitoring/MarkNewIPs";
+import ReplyPruning from "../Monitoring/ReplyPruning";
+import ThreadStats from "../Monitoring/ThreadStats";
+import ThreadUpdater from "../Monitoring/ThreadUpdater";
+import ThreadWatcher from "../Monitoring/ThreadWatcher";
+import Unread from "../Monitoring/Unread";
+import UnreadIndex from "../Monitoring/UnreadIndex";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import PassLink from "../Posting/PassLink";
+import PostRedirect from "../Posting/PostRedirect";
+import QR from "../Posting/QR";
+import QuoteBacklink from "../Quotelinks/QuoteBacklink";
+import QuoteCT from "../Quotelinks/QuoteCT";
+import QuoteInline from "../Quotelinks/QuoteInline";
+import QuoteOP from "../Quotelinks/QuoteOP";
+import QuotePreview from "../Quotelinks/QuotePreview";
+import QuoteStrikeThrough from "../Quotelinks/QuoteStrikeThrough";
+import QuoteThreading from "../Quotelinks/QuoteThreading";
+import QuoteYou from "../Quotelinks/QuoteYou";
+import Quotify from "../Quotelinks/Quotify";
+import Site from "../site/Site";
+import SW from "../site/SW";
+import CSS from "../css/CSS";
+import meta from '../../package.json';
+import Header from "../General/Header";
+import { c, Conf, d, doc, docSet, E, g } from "../globals/globals";
+import Menu from "../Menu/Menu";
+import BoardConfig from "../General/BoardConfig";
+import CaptchaReplace from "../Posting/Captcha.replace";
+import Get from "../General/Get";
+import { dict, platform } from "../platform/helpers";
+import Polyfill from "../General/Polyfill";
+// #region tests_enabled
+import Test from "../General/Test";
+// #endregion
+
/*
* decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from
@@ -14,9 +110,9 @@ var Main = {
let key;
try {
let w = window;
- if ($.platform === 'crx') { w = (w.wrappedJSObject || w); }
- if ('<%= meta.name %> antidup' in w) { return; }
- w['<%= meta.name %> antidup'] = true;
+ if (platform === 'crx') { w = (w.wrappedJSObject || w); }
+ if (`${meta.name} antidup` in w) { return; }
+ w[`${meta.name} antidup`] = true;
} catch (error) {}
// Don't run inside ad iframes.
@@ -53,7 +149,7 @@ var Main = {
// Flatten default values from Config into Conf
var flatten = function(parent, obj) {
if (obj instanceof Array) {
- Conf[parent] = $.dict.clone(obj[0]);
+ Conf[parent] = dict.clone(obj[0]);
} else if (typeof obj === 'object') {
for (var key in obj) {
var val = obj[key];
@@ -83,16 +179,16 @@ var Main = {
flatten(null, Config);
for (var db of DataBoard.keys) {
- Conf[db] = $.dict();
+ Conf[db] = dict();
}
- Conf['customTitles'] = $.dict.clone({'4chan.org': {boards: {'qa': {'boardTitle': {orig: '/qa/ - Question & Answer', title: '/qa/ - 2D/Random'}}}}});
- Conf['boardConfig'] = {boards: $.dict()};
+ Conf['customTitles'] = dict.clone({'4chan.org': {boards: {'qa': {'boardTitle': {orig: '/qa/ - Question & Answer', title: '/qa/ - 2D/Random'}}}}});
+ Conf['boardConfig'] = {boards: dict()};
Conf['archives'] = Redirect.archives;
- Conf['selectedArchives'] = $.dict();
- Conf['cooldowns'] = $.dict();
- Conf['Index Sort'] = $.dict();
- for (let i = 0; i < 2; i++) { Conf[`Last Long Reply Thresholds ${i}`] = $.dict(); }
- Conf['siteProperties'] = $.dict();
+ Conf['selectedArchives'] = dict();
+ Conf['cooldowns'] = dict();
+ Conf['Index Sort'] = dict();
+ for (let i = 0; i < 2; i++) { Conf[`Last Long Reply Thresholds ${i}`] = dict(); }
+ Conf['siteProperties'] = dict();
// XXX old key names
Conf['Except Archives from Encryption'] = false;
@@ -106,7 +202,7 @@ var Main = {
Conf['Use Faster Image Host'] = 'true';
Conf['Captcha Fixes'] = true;
Conf['captchaServiceDomain'] = '';
- Conf['captchaServiceKey'] = $.dict();
+ Conf['captchaServiceKey'] = dict();
// Enforce JS whitelist
if (
@@ -114,11 +210,14 @@ var Main = {
!SW.yotsuba.regexp.pass.test(location.href) &&
!$$('script:not([src])', d).filter(s => /this\[/.test(s.textContent)).length
) {
- ($.getSync || $.get)({'jsWhitelist': Conf['jsWhitelist']}, ({jsWhitelist}) => $.addCSP(`script-src ${jsWhitelist.replace(/^#.*$/mg, '').replace(/[\s;]+/g, ' ').trim()}`));
+ ($.getSync || $.get)({'jsWhitelist': Conf['jsWhitelist']}, ({jsWhitelist}) => {
+ const parsedList = jsWhitelist.replace(/^#.*$/mg, '').replace(/[\s;]+/g, ' ').trim();
+ if (/\S/.test(parsedList)) $.addCSP(`script-src ${parsedList}`);
+ });
}
// Get saved values as items
- const items = $.dict();
+ const items = dict();
for (key in Conf) { items[key] = undefined; }
items['previousversion'] = undefined;
return ($.getSync || $.get)(items, function(items) {
@@ -162,9 +261,8 @@ var Main = {
items.previousversion = (changes.previousversion = g.VERSION);
return $.set(changes, function() {
if (items['Show Updated Notifications'] ?? true) {
- // TODO meta
const el = $.el('span',
- { innerHTML: 'meta.name has been updated to version ${g.VERSION}.'});
+ { innerHTML: `${meta.name} has been updated to version ${g.VERSION}.` });
return new Notice('info', el, 15);
}
});
@@ -271,8 +369,8 @@ var Main = {
if (!Main.isThisPageLegit()) { return; }
// disable the mobile layout
- // TODO check if exists
- $('link[href*=mobile]', d.head).disabled = true;
+ const mobileLink = $('link[href*=mobile]', d.head);
+ if (mobileLink) mobileLink.disabled = true;
doc.dataset.host = location.host;
$.addClass(doc, `sw-${g.SITE.software}`);
$.addClass(doc, g.VIEW === 'thread' ? 'thread-view' : g.VIEW);
@@ -670,7 +768,7 @@ var Main = {
$.addClass(doc, 'tainted');
if (Conf['Disable Native Extension'] && !Main.isFirstRun) {
const msg = $.el('div',
- {innerHTML: 'Failed to disable the native extension. You may need to block it.'});
+ { innerHTML: 'Failed to disable the native extension. You may need to block it.' });
new Notice('error', msg);
}
}
@@ -686,9 +784,11 @@ var Main = {
return;
}
- const div = $.el('div',
- {innerHTML: '${errors.length} errors occurred.&{Main.reportLink(errors)} [show]'});
- $.on(div.lastElementChild, 'click', function() {
+ const div = $.el('div', {
+ innerHTML:
+ `${errors.length} errors occurred.${Main.reportLink(errors).innerHTML} [show]`
+ });
+ $.on(div.lastElementChild, 'click', function () {
let ref;
return [this.textContent, logs.hidden] = Array.from(ref = this.textContent === 'show' ? (
['hide', false]
@@ -709,12 +809,12 @@ var Main = {
parseError(data, reportLink) {
c.error(data.message, data.error.stack);
const message = $.el('div',
- {innerHTML: '${data.message}?{reportLink}{&{reportLink}}'});
+ { innerHTML: E(data.message) + ((reportLink) ? (reportLink).innerHTML : "") });
const error = $.el('div',
{textContent: `${data.error.name || 'Error'}: ${data.error.message || 'see console for details'}`});
const lines = data.error.stack?.match(/\d+(?=:\d+\)?$)/mg)?.join().replace(/^/, ' at ') || '';
const context = $.el('div',
- {textContent: `(<%= meta.name %> <%= meta.fork %> v${g.VERSION} ${$.platform} on ${$.engine}${lines})`});
+ { textContent: `(${meta.name} ${meta.fork} v${g.VERSION} ${platform} on ${$.engine}${lines})` });
return [message, error, context];
},
@@ -725,20 +825,19 @@ var Main = {
if (errors.length > 1) { title += ` (+${errors.length - 1} other errors)`; }
let details = '';
const addDetails = function(text) {
- // TODO meta
- if (encodeURIComponent(title + details + text + '\n').length <= "meta.newIssueMaxLength - meta.newIssue.replace(/%(title|details)/, '')".length) {
+ if (encodeURIComponent(title + details + text + '\n').length <= meta.newIssueMaxLength - meta.newIssue.replace(/%(title|details)/, '').length) {
return details += text + '\n';
}
};
addDetails(`\
[Please describe the steps needed to reproduce this error.]
-Script: <%= meta.name %> <%= meta.fork %> v${g.VERSION} ${$.platform}
+Script: ${meta.name} ${meta.fork} v${g.VERSION} ${platform}
URL: ${location.href}
User agent: ${navigator.userAgent}\
`
);
- if (($.platform === 'userscript') && (info = (() => {
+ if ((platform === 'userscript') && (info = (() => {
if (typeof GM !== 'undefined' && GM !== null) { return GM.info; } else { if (typeof GM_info !== 'undefined' && GM_info !== null) { return GM_info; }
}
})())) {
@@ -748,8 +847,8 @@ User agent: ${navigator.userAgent}\
if (data.error.stack) { addDetails(data.error.stack.replace(data.error.toString(), '').trim()); }
if (data.html) { addDetails('\n`' + data.html + '`'); }
details = details.replace(/file:\/{3}.+\//g, ''); // Remove local file paths
- const url = '<%= meta.newIssue %>'.replace('%title', encodeURIComponent(title)).replace('%details', encodeURIComponent(details));
- return {innerHTML: ' [report]'};
+ const url = meta.newIssue.replace('%title', encodeURIComponent(title)).replace('%details', encodeURIComponent(details));
+ return { innerHTML: ` [report]` };
},
isThisPageLegit() {
@@ -784,7 +883,7 @@ User agent: ${navigator.userAgent}\
['Board Configuration', BoardConfig],
['Normalize URL', NormalizeURL],
['Delay Redirect on Post', PostRedirect],
- ['Captcha Configuration', Captcha.replace],
+ ['Captcha Configuration', CaptchaReplace],
['Image Host Rewriting', ImageHost],
['Redirect', Redirect],
['Header', Header],
@@ -865,7 +964,9 @@ User agent: ${navigator.userAgent}\
['Mod Contact Links', ModContact]
]
};
+export default Main;
+$.ready(() => Main.init());
-// <% if (readJSON('/.tests_enabled')) { %>
-// Main.features.push ['Build Test', Test]
-// <% } %>
+// #region tests_enabled
+Main.features.push(['Build Test', Test]);
+// #endregion
diff --git a/src/meta/manifest.json b/src/meta/manifest.json
deleted file mode 100644
index 1c82e9c8e0..0000000000
--- a/src/meta/manifest.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "name": "<%= meta.name %>",
- "version": "<%= readJSON('/version.json').version %>",
- "manifest_version": 2,
- "description": "<%= description %>",
- "icons": {
- "16": "icon16.png",
- "48": "icon48.png",
- "128": "icon128.png"
- },
- "content_scripts": [{
- "js": ["script.js"],
- "matches": <%= JSON.stringify(meta.matches_only.concat(meta.matches, meta.matches_extra)) %>,
- "exclude_matches": <%= JSON.stringify(meta.exclude_matches) %>,
- "all_frames": true,
- "run_at": "document_start"
- }],
- "background": {
- "scripts": ["eventPage.js"],
- "persistent": false
- },
- "homepage_url": "<%= meta.page %>",
-<% if (channel !== '-noupdate') { %> "update_url": "<%= meta.downloads %>updates<%= channel %>.xml",
- "key": "<%= meta.appid %>",
-<% } %> "minimum_chrome_version": "<%= meta.min.chrome %>",
- "permissions": <%= JSON.stringify(meta.matches_only.concat(meta.matches, ["storage"])) %>,
- "optional_permissions": [
- "*://*/"
- ],
- "applications": {
- "gecko": {
- "id": "<%= meta.appidGecko %>"<% if (channel !== '-noupdate') { %>,
- "update_url": "<%= meta.downloads %>updates<%= channel %>.json"
-<% } %> }
- }
-}
diff --git a/src/meta/manifestJson.js b/src/meta/manifestJson.js
new file mode 100644
index 0000000000..92cea7a96e
--- /dev/null
+++ b/src/meta/manifestJson.js
@@ -0,0 +1,42 @@
+export default function generateManifestJson(p, version, channel) {
+ const manifest = {
+ "name": p.meta.name,
+ "version": version.version,
+ "manifest_version": 2,
+ "description": p.description,
+ "icons": {
+ "16": "icon16.png",
+ "48": "icon48.png",
+ "128": "icon128.png"
+ },
+ "content_scripts": [{
+ "js": ["script.js"],
+ "matches": p.meta.matches_only.concat(p.meta.matches, p.meta.matches_extra),
+ "exclude_matches": p.meta.exclude_matches,
+ "all_frames": true,
+ "run_at": "document_start"
+ }],
+ "background": {
+ "scripts": ["eventPage.js"],
+ "persistent": false
+ },
+ "homepage_url": p.meta.page,
+ "minimum_chrome_version": p.meta.min.chrome,
+ "permissions": p.meta.matches_only.concat(p.meta.matches, ["storage"]),
+ "optional_permissions": [
+ "*://*/"
+ ],
+ "applications": {
+ "gecko": {
+ "id": p.meta.appidGecko,
+ }
+ }
+ };
+
+ if (channel !== '-noupdate') {
+ manifest.update_url = `${p.meta.downloads}updates${channel}.xml`;
+ manifest.applications.gecko.update_url = `${p.meta.downloads}updates${channel}.json`;
+ }
+
+ return JSON.stringify(manifest, undefined, 2);
+}
diff --git a/src/meta/metadata.js b/src/meta/metadata.js
index f154139e15..061f7ec1d9 100644
--- a/src/meta/metadata.js
+++ b/src/meta/metadata.js
@@ -1,18 +1,38 @@
-// ==UserScript==
-// @name <%= meta.name %><%= (channel === '-beta') ? ' beta' : '' %>
-// @version <%= readJSON('/version.json').version %>
-// @minGMVer <%= meta.min.greasemonkey %>
-// @minFFVer <%= meta.min.firefox %>
-// @namespace <%= name %>
-// @description <%= description %>
-// @license MIT; <%= meta.license %>
-<%=
- (function() {
+// this file is needed in the build script, keep it .js
+
+import { readFile } from "fs/promises";
+import { dirname, resolve } from "path";
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default async function generateMetadata(packageJson, channel) {
+ const meta = packageJson.meta;
+
+ const versionFile = await readFile(resolve(__dirname, '../../version.json'));
+ const version = JSON.parse(versionFile.toString());
+
+ const iconFile = await readFile(resolve(__dirname, './icon48.png'));
+ const icon = Buffer.from(iconFile).toString('base64');
+
+ const archives = JSON.parse(await readFile(resolve(__dirname, '../Archive/archives.json'), { encoding: 'utf-8' }));
+
+ let output = `// ==UserScript==
+// @name ${meta.name}${channel === '-beta' ? ' beta' : ''}
+// @version ${version.version}
+// @minGMVer ${meta.min.greasemonkey}
+// @minFFVer ${meta.min.firefox}
+// @namespace ${packageJson.name}
+// @description ${packageJson.description}
+// @license MIT; ${meta.license}
+`;
+
+ output += (function () {
function expand(items, regex, substitutions) {
var results = [];
- items.forEach(function(item) {
+ items.forEach(function (item) {
if (regex.test(item)) {
- substitutions.forEach(function(s) {
+ substitutions.forEach(function (s) {
results.push(item.replace(regex, s));
});
} else {
@@ -25,24 +45,26 @@
return expand(matches, /^\*/, ['http', 'https']);
}
return [].concat(
- expandMatches(meta.includes_only.concat(meta.matches, meta.matches_extra)).map(function(match) {
+ expandMatches(meta.includes_only.concat(meta.matches, meta.matches_extra)).map(function (match) {
return '// @include ' + match;
}),
- expandMatches(meta.exclude_matches).map(function(match) {
+ expandMatches(meta.exclude_matches).map(function (match) {
return '// @exclude ' + match;
})
).join('\n');
- })()
-%>
+ })();
+
+ output += `
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
// @connect 4chenz.github.io
-<%=
- readJSON('/src/Archive/archives.json').map(function(archive) {
+`;
+ output += archives.map(function (archive) {
return '// @connect ' + archive.domain;
- }).join('\n')
-%>
+ }).join('\n');
+
+ output += `
// @connect api.clyp.it
// @connect api.dailymotion.com
// @connect api.github.com
@@ -51,13 +73,24 @@
// @connect vimeo.com
// @connect www.youtube.com
// @connect *
-<%=
- meta.grants.map(function(grant) {
+`;
+ output += meta.grants.map(function (grant) {
return '// @grant ' + grant;
- }).join('\n')
-%>
-// @run-at document-start
-// @updateURL <%= (channel !== '-noupdate') ? `${meta.downloads}${name}${channel}.meta.js` : 'https://noupdate.invalid/' %>
-// @downloadURL <%= (channel !== '-noupdate') ? `${meta.downloads}${name}${channel}.user.js` : 'https://noupdate.invalid/' %>
-// @icon data:image/png;base64,<%= readBase64('/src/meta/icon48.png') %>
+ }).join('\n');
+
+ output += '\n// @run-at document-start';
+
+ if (channel === '-noupdate') {
+ output += '\n// @updateURL https://noupdate.invalid/\n// @downloadURL https://noupdate.invalid/';
+ } else {
+ output += `
+// @updateURL ${meta.downloads}${packageJson.name}${channel}.meta.js
+// @downloadURL ${meta.downloads}${packageJson.name}${channel}.user.js`;
+ }
+ output += `
+// @icon data:image/png;base64,${icon}
// ==/UserScript==
+`;
+
+ return output;
+}
diff --git a/src/meta/tsconfig.json b/src/meta/tsconfig.json
new file mode 100644
index 0000000000..d37071c3e2
--- /dev/null
+++ b/src/meta/tsconfig.json
@@ -0,0 +1,6 @@
+{
+ "compilerOptions": {
+ "moduleResolution": "node16"
+ },
+ "extends": "../../package.json"
+}
\ No newline at end of file
diff --git a/src/platform/$$.js b/src/platform/$$.js
index 16fa613360..1945af560e 100644
--- a/src/platform/$$.js
+++ b/src/platform/$$.js
@@ -1,7 +1,10 @@
+import { 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
*/
-const $$ = (selector, root=d.body) => [...Array.from(root.querySelectorAll(selector))];
+const $$ = (selector, root = d.body) => [...Array.from(root.querySelectorAll(selector))];
+export default $$;
diff --git a/src/platform/$.js b/src/platform/$.js
index bbae05122f..40bd9f83b8 100644
--- a/src/platform/$.js
+++ b/src/platform/$.js
@@ -7,16 +7,14 @@
*/
// loosely follows the jquery api:
// http://api.jquery.com/
-// not chainable
-const $ = (selector, root=d.body) => root.querySelector(selector);
-$.DAY = 24 * (
- $.HOUR = 60 * (
- $.MINUTE = 60 * (
- $.SECOND = 1000
- )
- )
-);
+import Notice from "../classes/Notice";
+import { c, Conf, d, doc, g } from "../globals/globals";
+import CrossOrigin from "./CrossOrigin";
+import { debounce, dict, MINUTE, platform, SECOND } from "./helpers";
+
+// not chainable
+const $ = (selector, root = document.body) => root.querySelector(selector);
$.id = id => d.getElementById(id);
@@ -57,29 +55,6 @@ $.extend = function(object, properties) {
}
};
-$.dict = () => Object.create(null);
-
-$.dict.clone = function(obj) {
- if ((typeof obj !== 'object') || (obj === null)) {
- return obj;
- } else if (obj instanceof Array) {
- const arr = [];
- for (let i = 0, end = obj.length; i < end; i++) {
- arr.push($.dict.clone(obj[i]));
- }
- return arr;
- } else {
- const map = Object.create(null);
- for (var key in obj) {
- var val = obj[key];
- map[key] = $.dict.clone(val);
- }
- return map;
- }
-};
-
-$.dict.json = str => $.dict.clone(JSON.parse(str));
-
$.hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
$.getOwn = function(obj, key) {
@@ -87,23 +62,24 @@ $.getOwn = function(obj, key) {
};
$.ajax = (function() {
- let pageXHR;
+ let pageXHR = XMLHttpRequest;
if (window.wrappedJSObject && !XMLHttpRequest.wrappedJSObject) {
- pageXHR = XPCNativeWrapper(window.wrappedJSObject.XMLHttpRequest);
- } else {
- pageXHR = XMLHttpRequest;
+ try {
+ pageXHR = XPCNativeWrapper(window.wrappedJSObject.XMLHttpRequest);
+ } catch (e) {}
}
- (function(url, options={}) {
+ const r = (function (url, options={}) {
if (options.responseType == null) { options.responseType = 'json'; }
if (!options.type) { options.type = (options.form && 'post') || 'get'; }
// XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310
url = url.replace(/^((?:https?:)?\/\/(?:\w+\.)?(?:4chan|4channel|4cdn)\.org)\/adv\//, '$1//adv/');
- // <% if (type === 'crx') { %>
- // # XXX https://bugs.chromium.org/p/chromium/issues/detail?id=920638
- // if Conf['Work around CORB Bug'] and g.SITE.software is 'yotsuba' and !options.testCORB and FormData.prototype.entries
- // return $.ajaxPage url, options
- // <% } %>
+ if (platform === 'crx') {
+ // XXX https://bugs.chromium.org/p/chromium/issues/detail?id=920638
+ if (Conf['Work around CORB Bug'] && g.SITE.software === 'yotsuba' && !options.testCORB && FormData.prototype.entries) {
+ return $.ajaxPage(url, options);
+ }
+ }
const {onloadend, timeout, responseType, withCredentials, type, onprogress, form, headers} = options;
const r = new pageXHR();
try {
@@ -117,12 +93,14 @@ $.ajax = (function() {
$.extend(r.upload, {onprogress});
// connection error or content blocker
$.on(r, 'error', function() { if (!r.status) { return c.warn(`4chan X failed to load: ${url}`); } });
- // <% if (type === 'crx') { %>
- // # XXX https://bugs.chromium.org/p/chromium/issues/detail?id=920638
- // $.on r, 'load', ->
- // if !Conf['Work around CORB Bug'] and r.readyState is 4 and r.status is 200 and r.statusText is '' and r.response is null
- // $.set 'Work around CORB Bug', (Conf['Work around CORB Bug'] = Date.now())
- // <% } %>
+ if (platform === 'crx') {
+ // https://bugs.chromium.org/p/chromium/issues/detail?id=920638
+ $.on(r, 'load', () => {
+ if (!Conf['Work around CORB Bug'] && r.readyState === 4 && r.status === 200 && r.statusText === '' && r.response === null) {
+ $.set('Work around CORB Bug', (Conf['Work around CORB Bug'] = Date.now()));
+ }
+ });
+ }
r.send(form);
} catch (err) {
// XXX Some content blockers in Firefox (e.g. Adblock Plus and NoScript) throw an exception instead of simulating a connection error.
@@ -134,58 +112,59 @@ $.ajax = (function() {
return r;
});
-// <% if (type === 'crx') { %>
-// # XXX https://bugs.chromium.org/p/chromium/issues/detail?id=920638
-// do ->
- let requestID = 0;
- const requests = $.dict();
-
- $.ajaxPageInit = function() {
- $.global(function() {
- window.FCX.requests = Object.create(null);
-
- document.addEventListener('4chanXAjax', function(e) {
- let fd, r;
- const {url, timeout, responseType, withCredentials, type, onprogress, form, headers, id} = e.detail;
- window.FCX.requests[id] = (r = new XMLHttpRequest());
- r.open(type, url, true);
- const object = headers || {};
- for (var key in object) {
- var value = object[key];
- r.setRequestHeader(key, value);
- }
- r.responseType = responseType === 'document' ? 'text' : responseType;
- r.timeout = timeout;
- r.withCredentials = withCredentials;
- if (onprogress) {
- r.upload.onprogress = function(e) {
- const {loaded, total} = e;
- const detail = {loaded, total, id};
- return document.dispatchEvent(new CustomEvent('4chanXAjaxProgress', {bubbles: true, detail}));
+ if (platform === 'userscript') {
+ return r;
+ } else {
+ // # XXX https://bugs.chromium.org/p/chromium/issues/detail?id=920638
+ let requestID = 0;
+ const requests = dict();
+
+ $.ajaxPageInit = function() {
+ $.global(function() {
+ window.FCX.requests = Object.create(null);
+
+ document.addEventListener('4chanXAjax', function(e) {
+ let fd, r;
+ const {url, timeout, responseType, withCredentials, type, onprogress, form, headers, id} = e.detail;
+ window.FCX.requests[id] = (r = new XMLHttpRequest());
+ r.open(type, url, true);
+ const object = headers || {};
+ for (var key in object) {
+ var value = object[key];
+ r.setRequestHeader(key, value);
+ }
+ r.responseType = responseType === 'document' ? 'text' : responseType;
+ r.timeout = timeout;
+ r.withCredentials = withCredentials;
+ if (onprogress) {
+ r.upload.onprogress = function(e) {
+ const {loaded, total} = e;
+ const detail = {loaded, total, id};
+ return document.dispatchEvent(new CustomEvent('4chanXAjaxProgress', {bubbles: true, detail}));
+ };
+ }
+ r.onloadend = function() {
+ delete window.FCX.requests[id];
+ const {status, statusText, response} = this;
+ const responseHeaderString = this.getAllResponseHeaders();
+ const detail = {status, statusText, response, responseHeaderString, id};
+ return document.dispatchEvent(new CustomEvent('4chanXAjaxLoadend', {bubbles: true, detail}));
};
- }
- r.onloadend = function() {
- delete window.FCX.requests[id];
- const {status, statusText, response} = this;
- const responseHeaderString = this.getAllResponseHeaders();
- const detail = {status, statusText, response, responseHeaderString, id};
- return document.dispatchEvent(new CustomEvent('4chanXAjaxLoadend', {bubbles: true, detail}));
- };
- // connection error or content blocker
- r.onerror = function() {
- if (!r.status) { return console.warn(`4chan X failed to load: ${url}`); }
- };
- if (form) {
- fd = new FormData();
- for (var entry of form) {
- fd.append(entry[0], entry[1]);
+ // connection error or content blocker
+ r.onerror = function() {
+ if (!r.status) { return console.warn(`4chan X failed to load: ${url}`); }
+ };
+ if (form) {
+ fd = new FormData();
+ for (var entry of form) {
+ fd.append(entry[0], entry[1]);
+ }
+ } else {
+ fd = null;
}
- } else {
- fd = null;
- }
- return r.send(fd);
+ return r.send(fd);
}
- , false);
+ , false);
return document.addEventListener('4chanXAjaxAbort', function(e) {
let r;
@@ -218,24 +197,24 @@ $.ajax = (function() {
};
return $.ajaxPage = function(url, options={}) {
- let req;
- let {onloadend, timeout, responseType, withCredentials, type, onprogress, form, headers} = options;
- const id = requestID++;
- requests[id] = (req = new CrossOrigin.Request());
- $.extend(req, {responseType, onloadend});
- req.upload = {onprogress};
- req.abort = () => $.event('4chanXAjaxAbort', {id});
- if (form) { form = Array.from(form.entries()); }
- $.event('4chanXAjax', {url, timeout, responseType, withCredentials, type, onprogress: !!onprogress, form, headers, id});
- return req;
- };
+ let req;
+ let {onloadend, timeout, responseType, withCredentials, type, onprogress, form, headers} = options;
+ const id = requestID++;
+ requests[id] = (req = new CrossOrigin.Request());
+ $.extend(req, {responseType, onloadend});
+ req.upload = {onprogress};
+ req.abort = () => $.event('4chanXAjaxAbort', {id});
+ if (form) { form = Array.from(form.entries()); }
+ $.event('4chanXAjax', {url, timeout, responseType, withCredentials, type, onprogress: !!onprogress, form, headers, id});
+ return req;
+ };
+ }
})();
-// <% } %>
// Status Code 304: Not modified
// With the `If-Modified-Since` header we only receive the HTTP headers and no body for 304 responses.
// This saves a lot of bandwidth and CPU time for both the users and the servers.
-$.lastModified = $.dict();
+$.lastModified = dict();
$.whenModified = function(url, bucket, cb, options={}) {
let t;
const {timeout, ajax} = options;
@@ -245,13 +224,13 @@ $.whenModified = function(url, bucket, cb, options={}) {
if (url.split('/')[2] === 'a.4cdn.org') { params.push(`t=${Date.now()}`); }
const url0 = url;
if (params.length) { url += '?' + params.join('&'); }
- const headers = $.dict();
+ const headers = dict();
if ((t = $.lastModified[bucket]?.[url0]) != null) {
headers['If-Modified-Since'] = t;
}
const r = (ajax || $.ajax)(url, {
onloadend() {
- ($.lastModified[bucket] || ($.lastModified[bucket] = $.dict()))[url0] = this.getResponseHeader('Last-Modified');
+ ($.lastModified[bucket] || ($.lastModified[bucket] = dict()))[url0] = this.getResponseHeader('Last-Modified');
return cb.call(this);
},
timeout,
@@ -261,7 +240,7 @@ $.whenModified = function(url, bucket, cb, options={}) {
};
(function() {
- const reqs = $.dict();
+ const reqs = dict();
$.cache = function(url, cb, options={}) {
let req;
const {ajax} = options;
@@ -378,7 +357,7 @@ $.rmClass = function(el, ...classNames) {
$.toggleClass = (el, className) => el.classList.toggle(className);
-$.hasClass = (el, className) => el.classList.includes(className);
+$.hasClass = (el, className) => el.classList.contains(className);
$.rm = el => el?.remove();
@@ -438,55 +417,55 @@ $.one = function(el, events, handler) {
};
$.event = function(event, detail, root=d) {
- // <% if (type === 'userscript') { %>
- if ((detail != null) && (typeof cloneInto === 'function')) {
- detail = cloneInto(detail, d.defaultView);
+ if (!globalThis.chrome?.extension) {
+ if ((detail != null) && (typeof cloneInto === 'function')) {
+ detail = cloneInto(detail, d.defaultView);
+ }
}
- // <% } %>
return root.dispatchEvent(new CustomEvent(event, {bubbles: true, cancelable: true, detail}));
};
-// <% if (type === 'userscript') { %>
-// XXX Make $.event work in Pale Moon with GM 3.x (no cloneInto function).
-(function() {
- if (!/PaleMoon\//.test(navigator.userAgent) || (+GM_info?.version?.split('.')[0] < 2) || (typeof cloneInto !== 'undefined')) { return; }
+if (platform === 'userscript') {
+ // XXX Make $.event work in Pale Moon with GM 3.x (no cloneInto function).
+ (function() {
+ if (!/PaleMoon\//.test(navigator.userAgent) || (+GM_info?.version?.split('.')[0] < 2) || (typeof cloneInto !== 'undefined')) { return; }
- try {
- return new CustomEvent('x', {detail: {}});
- } catch (err) {
- const unsafeConstructors = {
- Object: unsafeWindow.Object,
- Array: unsafeWindow.Array
- };
- var clone = function(obj) {
- let constructor;
- if ((obj != null) && (typeof obj === 'object') && (constructor = unsafeConstructors[obj.constructor.name])) {
- const obj2 = new constructor();
- for (var key in obj) { var val = obj[key]; obj2[key] = clone(val); }
- return obj2;
- } else {
- return obj;
- }
- };
- return $.event = (event, detail, root=d) => root.dispatchEvent(new CustomEvent(event, {bubbles: true, cancelable: true, detail: clone(detail)}));
- }
-})();
-// <% } %>
+ try {
+ return new CustomEvent('x', {detail: {}});
+ } catch (err) {
+ const unsafeConstructors = {
+ Object: unsafeWindow.Object,
+ Array: unsafeWindow.Array
+ };
+ var clone = function(obj) {
+ let constructor;
+ if ((obj != null) && (typeof obj === 'object') && (constructor = unsafeConstructors[obj.constructor.name])) {
+ const obj2 = new constructor();
+ for (var key in obj) { var val = obj[key]; obj2[key] = clone(val); }
+ return obj2;
+ } else {
+ return obj;
+ }
+ };
+ return $.event = (event, detail, root=d) => root.dispatchEvent(new CustomEvent(event, {bubbles: true, cancelable: true, detail: clone(detail)}));
+ }
+ })();
+}
$.modifiedClick = e => e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || (e.button !== 0);
-// <% if (type === 'userscript') { %>
-$.open =
- (GM?.openInTab != null) ?
- GM.openInTab
- : (typeof GM_openInTab !== 'undefined' && GM_openInTab !== null) ?
- GM_openInTab
- :
+if (!globalThis.chrome?.extension) {
+ $.open =
+ (GM?.openInTab != null) ?
+ GM.openInTab
+ : (typeof GM_openInTab !== 'undefined' && GM_openInTab !== null) ?
+ GM_openInTab
+ :
+ url => window.open(url, '_blank');
+} else {
+ $.open =
url => window.open(url, '_blank');
-// <% } else { %>
-$.open =
- url => window.open(url, '_blank');
-// <% } %>
+}
$.debounce = function(wait, fn) {
let lastCall = 0;
@@ -596,8 +575,6 @@ $.engine = (function() {
if (/Gecko\/|Goanna/.test(navigator.userAgent)) { return 'gecko'; } // Goanna = Pale Moon 26+
})();
-$.platform = '<%= type %>';
-
$.hasStorage = (function() {
try {
if (localStorage.getItem(g.NAMESPACE + 'hasStorage') === 'true') { return true; }
@@ -609,7 +586,7 @@ $.hasStorage = (function() {
})();
$.item = function(key, val) {
- const item = $.dict();
+ const item = dict();
item[key] = val;
return item;
};
@@ -622,7 +599,7 @@ $.oneItemSugar = fn => (function(key, val, cb) {
}
});
-$.syncing = $.dict();
+$.syncing = dict();
$.securityCheck = function(data) {
if (location.protocol !== 'https:') {
@@ -630,387 +607,388 @@ $.securityCheck = function(data) {
}
};
-// <% if (type === 'crx') { %>
-// https://developer.chrome.com/extensions/storage.html
-$.oldValue = {
- local: $.dict(),
- sync: $.dict()
-};
-
-chrome.storage.onChanged.addListener(function(changes, area) {
- for (var key in changes) {
- var oldValue = $.oldValue.local[key] ?? $.oldValue.sync[key];
- $.oldValue[area][key] = $.dict.clone(changes[key].newValue);
- var newValue = $.oldValue.local[key] ?? $.oldValue.sync[key];
- var cb = $.syncing[key];
- if (cb && (JSON.stringify(newValue) !== JSON.stringify(oldValue))) {
- cb(newValue, key);
- }
- }
-});
-$.sync = (key, cb) => $.syncing[key] = cb;
-$.forceSync = function() { };
+if (platform === 'crx') {
+ // https://developer.chrome.com/extensions/storage.html
+ $.oldValue = {
+ local: dict(),
+ sync: dict()
+ };
-$.crxWorking = function() {
- try {
- if (chrome.runtime.getManifest()) {
- return true;
+ chrome.storage.onChanged.addListener(function(changes, area) {
+ for (var key in changes) {
+ var oldValue = $.oldValue.local[key] ?? $.oldValue.sync[key];
+ $.oldValue[area][key] = dict.clone(changes[key].newValue);
+ var newValue = $.oldValue.local[key] ?? $.oldValue.sync[key];
+ var cb = $.syncing[key];
+ if (cb && (JSON.stringify(newValue) !== JSON.stringify(oldValue))) {
+ cb(newValue, key);
+ }
}
- } catch (error) {}
- if (!$.crxWarningShown) {
- const msg = $.el('div',
- {innerHTML: '4chan X seems to have been updated. You will need to reload the page.'});
- $.on($('a', msg), 'click', () => location.reload());
- new Notice('warning', msg);
- $.crxWarningShown = true;
- }
- return false;
-};
+ });
+ $.sync = (key, cb) => $.syncing[key] = cb;
+ $.forceSync = function() { };
-$.get = $.oneItemSugar(function(data, cb) {
- if (!$.crxWorking()) { return; }
- const results = {};
- const get = function(area) {
- let keys = Object.keys(data);
- // XXX slow performance in Firefox
- if (($.engine === 'gecko') && (area === 'sync') && (keys.length > 3)) {
- keys = null;
- }
- return chrome.storage[area].get(keys, function(result) {
- let key;
- result = $.dict.clone(result);
- if (chrome.runtime.lastError) {
- c.error(chrome.runtime.lastError.message);
- }
- if (keys === null) {
- const result2 = $.dict();
- for (key in result) { var val = result[key]; if ($.hasOwn(data, key)) { result2[key] = val; } }
- result = result2;
- }
- for (key in data) {
- $.oldValue[area][key] = result[key];
- }
- results[area] = result;
- if (results.local && results.sync) {
- $.extend(data, results.sync);
- $.extend(data, results.local);
- return cb(data);
+ $.crxWorking = function() {
+ try {
+ if (chrome.runtime.getManifest()) {
+ return true;
}
- });
+ } catch (error) {}
+ if (!$.crxWarningShown) {
+ const msg = $.el('div',
+ {innerHTML: '4chan X seems to have been updated. You will need to reload the page.'});
+ $.on($('a', msg), 'click', () => location.reload());
+ new Notice('warning', msg);
+ $.crxWarningShown = true;
+ }
+ return false;
};
- get('local');
- return get('sync');
-});
-(function() {
- const items = {
- local: $.dict(),
- sync: $.dict()
- };
+ $.get = $.oneItemSugar(function(data, cb) {
+ if (!$.crxWorking()) { return; }
+ const results = {};
+ const get = function(area) {
+ let keys = Object.keys(data);
+ // XXX slow performance in Firefox
+ if (($.engine === 'gecko') && (area === 'sync') && (keys.length > 3)) {
+ keys = null;
+ }
+ return chrome.storage[area].get(keys, function(result) {
+ let key;
+ result = dict.clone(result);
+ if (chrome.runtime.lastError) {
+ c.error(chrome.runtime.lastError.message);
+ }
+ if (keys === null) {
+ const result2 = dict();
+ for (key in result) { var val = result[key]; if ($.hasOwn(data, key)) { result2[key] = val; } }
+ result = result2;
+ }
+ for (key in data) {
+ $.oldValue[area][key] = result[key];
+ }
+ results[area] = result;
+ if (results.local && results.sync) {
+ $.extend(data, results.sync);
+ $.extend(data, results.local);
+ return cb(data);
+ }
+ });
+ };
+ get('local');
+ return get('sync');
+ });
- const exceedsQuota = (key, value) => // bytes in UTF-8
- unescape(encodeURIComponent(JSON.stringify(key))).length + unescape(encodeURIComponent(JSON.stringify(value))).length > chrome.storage.sync.QUOTA_BYTES_PER_ITEM;
+ (function() {
+ const items = {
+ local: dict(),
+ sync: dict()
+ };
- $.delete = function(keys) {
- if (!$.crxWorking()) { return; }
- if (typeof keys === 'string') {
- keys = [keys];
- }
- for (var key of keys) {
- delete items.local[key];
- delete items.sync[key];
- }
- chrome.storage.local.remove(keys);
- return chrome.storage.sync.remove(keys);
- };
+ const exceedsQuota = (key, value) => // bytes in UTF-8
+ unescape(encodeURIComponent(JSON.stringify(key))).length + unescape(encodeURIComponent(JSON.stringify(value))).length > chrome.storage.sync.QUOTA_BYTES_PER_ITEM;
- const timeout = {};
- var setArea = function(area, cb) {
- const data = $.dict();
- $.extend(data, items[area]);
- if (!Object.keys(data).length || (timeout[area] > Date.now())) { return; }
- return chrome.storage[area].set(data, function() {
- let err;
- let key;
- if (err = chrome.runtime.lastError) {
- c.error(err.message);
- setTimeout(setArea, $.MINUTE, area);
- timeout[area] = Date.now() + $.MINUTE;
- return cb?.(err);
+ $.delete = function(keys) {
+ if (!$.crxWorking()) { return; }
+ if (typeof keys === 'string') {
+ keys = [keys];
+ }
+ for (var key of keys) {
+ delete items.local[key];
+ delete items.sync[key];
}
+ chrome.storage.local.remove(keys);
+ return chrome.storage.sync.remove(keys);
+ };
- delete timeout[area];
- for (key in data) { if (items[area][key] === data[key]) { delete items[area][key]; } }
- if (area === 'local') {
- for (key in data) { var val = data[key]; if (!exceedsQuota(key, val)) { items.sync[key] = val; } }
- setSync();
- } else {
- chrome.storage.local.remove(((() => {
- const result = [];
- for (key in data) {
- if (!(key in items.local)) {
- result.push(key);
+ const timeout = {};
+ var setArea = function(area, cb) {
+ const data = dict();
+ $.extend(data, items[area]);
+ if (!Object.keys(data).length || (timeout[area] > Date.now())) { return; }
+ return chrome.storage[area].set(data, function() {
+ let err;
+ let key;
+ if (err = chrome.runtime.lastError) {
+ c.error(err.message);
+ setTimeout(setArea, MINUTE, area);
+ timeout[area] = Date.now() + MINUTE;
+ return cb?.(err);
+ }
+
+ delete timeout[area];
+ for (key in data) { if (items[area][key] === data[key]) { delete items[area][key]; } }
+ if (area === 'local') {
+ for (key in data) { var val = data[key]; if (!exceedsQuota(key, val)) { items.sync[key] = val; } }
+ setSync();
+ } else {
+ chrome.storage.local.remove(((() => {
+ const result = [];
+ for (key in data) {
+ if (!(key in items.local)) {
+ result.push(key);
+ }
}
- }
- return result;
- })()));
- }
- return cb?.();
- });
- };
+ return result;
+ })()));
+ }
+ return cb?.();
+ });
+ };
- var setSync = $.debounce($.SECOND, () => setArea('sync'));
+ var setSync = debounce(SECOND, () => setArea('sync'));
- $.set = $.oneItemSugar(function(data, cb) {
- if (!$.crxWorking()) { return; }
- $.securityCheck(data);
- $.extend(items.local, data);
- return setArea('local', cb);
- });
+ $.set = $.oneItemSugar(function(data, cb) {
+ if (!$.crxWorking()) { return; }
+ $.securityCheck(data);
+ $.extend(items.local, data);
+ return setArea('local', cb);
+ });
- return $.clear = function(cb) {
- if (!$.crxWorking()) { return; }
- items.local = $.dict();
- items.sync = $.dict();
- let count = 2;
- let err = null;
- const done = function() {
- if (chrome.runtime.lastError) {
- c.error(chrome.runtime.lastError.message);
- }
- if (err == null) { err = chrome.runtime.lastError; }
- if (!--count) { return cb?.(err); }
+ return $.clear = function(cb) {
+ if (!$.crxWorking()) { return; }
+ items.local = dict();
+ items.sync = dict();
+ let count = 2;
+ let err = null;
+ const done = function() {
+ if (chrome.runtime.lastError) {
+ c.error(chrome.runtime.lastError.message);
+ }
+ if (err == null) { err = chrome.runtime.lastError; }
+ if (!--count) { return cb?.(err); }
+ };
+ chrome.storage.local.clear(done);
+ return chrome.storage.sync.clear(done);
};
- chrome.storage.local.clear(done);
- return chrome.storage.sync.clear(done);
- };
-})();
-// <% } else { %>
+ })();
+} else {
-// http://wiki.greasespot.net/Main_Page
-// https://tampermonkey.net/documentation.php
+ // http://wiki.greasespot.net/Main_Page
+ // https://tampermonkey.net/documentation.php
-if ((GM?.deleteValue != null) && window.BroadcastChannel && (typeof GM_addValueChangeListener === 'undefined' || GM_addValueChangeListener === null)) {
+ if ((GM?.deleteValue != null) && window.BroadcastChannel && (typeof GM_addValueChangeListener === 'undefined' || GM_addValueChangeListener === null)) {
- $.syncChannel = new BroadcastChannel(g.NAMESPACE + 'sync');
+ $.syncChannel = new BroadcastChannel(g.NAMESPACE + 'sync');
- $.on($.syncChannel, 'message', e => (() => {
- const result = [];
- for (var key in e.data) {
- var cb;
- var val = e.data[key];
- if (cb = $.syncing[key]) {
- result.push(cb($.dict.json(JSON.stringify(val)), key));
+ $.on($.syncChannel, 'message', e => (() => {
+ const result = [];
+ for (var key in e.data) {
+ var cb;
+ var val = e.data[key];
+ if (cb = $.syncing[key]) {
+ result.push(cb(dict.json(JSON.stringify(val)), key));
+ }
}
- }
- return result;
- })());
+ return result;
+ })());
- $.sync = (key, cb) => $.syncing[key] = cb;
+ $.sync = (key, cb) => $.syncing[key] = cb;
- $.forceSync = function() {};
+ $.forceSync = function() {};
- $.delete = function(keys, cb) {
- let key;
- if (!(keys instanceof Array)) {
- keys = [keys];
- }
- return Promise.all((() => {
- const result = [];
- for (key of keys) { result.push(GM.deleteValue(g.NAMESPACE + key));
+ $.delete = function(keys, cb) {
+ let key;
+ if (!(keys instanceof Array)) {
+ keys = [keys];
}
- return result;
- })()).then(function() {
- const items = $.dict();
- for (key of keys) { items[key] = undefined; }
- $.syncChannel.postMessage(items);
- return cb?.();
- });
- };
+ return Promise.all((() => {
+ const result = [];
+ for (key of keys) { result.push(GM.deleteValue(g.NAMESPACE + key));
+ }
+ return result;
+ })()).then(function() {
+ const items = dict();
+ for (key of keys) { items[key] = undefined; }
+ $.syncChannel.postMessage(items);
+ return cb?.();
+ });
+ };
- $.get = $.oneItemSugar(function(items, cb) {
- const keys = Object.keys(items);
- return Promise.all(keys.map((key) => GM.getValue(g.NAMESPACE + key))).then(function(values) {
- for (let i = 0; i < values.length; i++) {
- var val = values[i];
- if (val) {
- items[keys[i]] = $.dict.json(val);
+ $.get = $.oneItemSugar(function(items, cb) {
+ const keys = Object.keys(items);
+ return Promise.all(keys.map((key) => GM.getValue(g.NAMESPACE + key))).then(function(values) {
+ for (let i = 0; i < values.length; i++) {
+ var val = values[i];
+ if (val) {
+ items[keys[i]] = dict.json(val);
+ }
}
- }
- return cb(items);
+ return cb(items);
+ });
});
- });
- $.set = $.oneItemSugar(function(items, cb) {
- $.securityCheck(items);
- return Promise.all((() => {
- const result = [];
- for (var key in items) {
- var val = items[key];
- result.push(GM.setValue(g.NAMESPACE + key, JSON.stringify(val)));
- }
- return result;
- })()).then(function() {
- $.syncChannel.postMessage(items);
- return cb?.();
+ $.set = $.oneItemSugar(function(items, cb) {
+ $.securityCheck(items);
+ return Promise.all((() => {
+ const result = [];
+ for (var key in items) {
+ var val = items[key];
+ result.push(GM.setValue(g.NAMESPACE + key, JSON.stringify(val)));
+ }
+ return result;
+ })()).then(function() {
+ $.syncChannel.postMessage(items);
+ return cb?.();
+ });
});
- });
-
- $.clear = cb => GM.listValues().then(keys => $.delete(keys.map(key => key.replace(g.NAMESPACE, '')), cb)).catch( () => $.delete(Object.keys(Conf).concat(['previousversion', 'QR Size', 'QR.persona']), cb));
-} else {
-
- if (typeof GM_deleteValue === 'undefined' || GM_deleteValue === null) {
- $.perProtocolSettings = true;
- }
- if (typeof GM_deleteValue !== 'undefined' && GM_deleteValue !== null) {
- $.getValue = GM_getValue;
- $.listValues = () => GM_listValues(); // error when called if missing
- } else if ($.hasStorage) {
- $.getValue = key => localStorage.getItem(key);
- $.listValues = () => (() => {
- const result = [];
- for (var key in localStorage) {
- if (key.slice(0, g.NAMESPACE.length) === g.NAMESPACE) {
- result.push(key);
- }
- }
- return result;
- })();
+ $.clear = cb => GM.listValues().then(keys => $.delete(keys.map(key => key.replace(g.NAMESPACE, '')), cb)).catch( () => $.delete(Object.keys(Conf).concat(['previousversion', 'QR Size', 'QR.persona']), cb));
} else {
- $.getValue = function() {};
- $.listValues = () => [];
- }
- if (typeof GM_addValueChangeListener !== 'undefined' && GM_addValueChangeListener !== null) {
- $.setValue = GM_setValue;
- $.deleteValue = GM_deleteValue;
- } else if (typeof GM_deleteValue !== 'undefined' && GM_deleteValue !== null) {
- $.oldValue = $.dict();
- $.setValue = function(key, val) {
- GM_setValue(key, val);
- if (key in $.syncing) {
- $.oldValue[key] = val;
- if ($.hasStorage) { return localStorage.setItem(key, val); } // for `storage` events
- }
- };
- $.deleteValue = function(key) {
- GM_deleteValue(key);
- if (key in $.syncing) {
- delete $.oldValue[key];
- if ($.hasStorage) { return localStorage.removeItem(key); } // for `storage` events
- }
- };
- if (!$.hasStorage) { $.cantSync = true; }
- } else if ($.hasStorage) {
- $.oldValue = $.dict();
- $.setValue = function(key, val) {
- if (key in $.syncing) { $.oldValue[key] = val; }
- return localStorage.setItem(key, val);
- };
- $.deleteValue = function(key) {
- if (key in $.syncing) { delete $.oldValue[key]; }
- return localStorage.removeItem(key);
- };
- } else {
- $.setValue = function() {};
- $.deleteValue = function() {};
- $.cantSync = ($.cantSet = true);
- }
+ if (typeof GM_deleteValue === 'undefined' || GM_deleteValue === null) {
+ $.perProtocolSettings = true;
+ }
- if (typeof GM_addValueChangeListener !== 'undefined' && GM_addValueChangeListener !== null) {
- $.sync = (key, cb) => $.syncing[key] = GM_addValueChangeListener(g.NAMESPACE + key, function(key2, oldValue, newValue, remote) {
- if (remote) {
- if (newValue !== undefined) { newValue = $.dict.json(newValue); }
- return cb(newValue, key);
- }
- });
- $.forceSync = function() {};
- } else if ((typeof GM_deleteValue !== 'undefined' && GM_deleteValue !== null) || $.hasStorage) {
- $.sync = function(key, cb) {
- key = g.NAMESPACE + key;
- $.syncing[key] = cb;
- return $.oldValue[key] = $.getValue(key);
- };
+ if (typeof GM_deleteValue !== 'undefined' && GM_deleteValue !== null) {
+ $.getValue = GM_getValue;
+ $.listValues = () => GM_listValues(); // error when called if missing
+ } else if ($.hasStorage) {
+ $.getValue = key => localStorage.getItem(key);
+ $.listValues = () => (() => {
+ const result = [];
+ for (var key in localStorage) {
+ if (key.slice(0, g.NAMESPACE.length) === g.NAMESPACE) {
+ result.push(key);
+ }
+ }
+ return result;
+ })();
+ } else {
+ $.getValue = function() {};
+ $.listValues = () => [];
+ }
- (function() {
- const onChange = function({key, newValue}) {
- let cb;
- if (!(cb = $.syncing[key])) { return; }
- if (newValue != null) {
- if (newValue === $.oldValue[key]) { return; }
- $.oldValue[key] = newValue;
- return cb($.dict.json(newValue), key.slice(g.NAMESPACE.length));
- } else {
- if ($.oldValue[key] == null) { return; }
+ if (typeof GM_addValueChangeListener !== 'undefined' && GM_addValueChangeListener !== null) {
+ $.setValue = GM_setValue;
+ $.deleteValue = GM_deleteValue;
+ } else if (typeof GM_deleteValue !== 'undefined' && GM_deleteValue !== null) {
+ $.oldValue = dict();
+ $.setValue = function(key, val) {
+ GM_setValue(key, val);
+ if (key in $.syncing) {
+ $.oldValue[key] = val;
+ if ($.hasStorage) { return localStorage.setItem(key, val); } // for `storage` events
+ }
+ };
+ $.deleteValue = function(key) {
+ GM_deleteValue(key);
+ if (key in $.syncing) {
delete $.oldValue[key];
- return cb(undefined, key.slice(g.NAMESPACE.length));
+ if ($.hasStorage) { return localStorage.removeItem(key); } // for `storage` events
}
};
- $.on(window, 'storage', onChange);
+ if (!$.hasStorage) { $.cantSync = true; }
+ } else if ($.hasStorage) {
+ $.oldValue = dict();
+ $.setValue = function(key, val) {
+ if (key in $.syncing) { $.oldValue[key] = val; }
+ return localStorage.setItem(key, val);
+ };
+ $.deleteValue = function(key) {
+ if (key in $.syncing) { delete $.oldValue[key]; }
+ return localStorage.removeItem(key);
+ };
+ } else {
+ $.setValue = function() {};
+ $.deleteValue = function() {};
+ $.cantSync = ($.cantSet = true);
+ }
- return $.forceSync = function(key) {
- // Storage events don't work across origins
- // e.g. http://boards.4chan.org and https://boards.4chan.org
- // so force a check for changes to avoid lost data.
+ if (typeof GM_addValueChangeListener !== 'undefined' && GM_addValueChangeListener !== null) {
+ $.sync = (key, cb) => $.syncing[key] = GM_addValueChangeListener(g.NAMESPACE + key, function(key2, oldValue, newValue, remote) {
+ if (remote) {
+ if (newValue !== undefined) { newValue = dict.json(newValue); }
+ return cb(newValue, key);
+ }
+ });
+ $.forceSync = function() {};
+ } else if ((typeof GM_deleteValue !== 'undefined' && GM_deleteValue !== null) || $.hasStorage) {
+ $.sync = function(key, cb) {
key = g.NAMESPACE + key;
- return onChange({key, newValue: $.getValue(key)});
+ $.syncing[key] = cb;
+ return $.oldValue[key] = $.getValue(key);
};
- })();
- } else {
- $.sync = function() {};
- $.forceSync = function() {};
- }
- $.delete = function(keys) {
- if (!(keys instanceof Array)) {
- keys = [keys];
- }
- for (var key of keys) {
- $.deleteValue(g.NAMESPACE + key);
+ (function() {
+ const onChange = function({key, newValue}) {
+ let cb;
+ if (!(cb = $.syncing[key])) { return; }
+ if (newValue != null) {
+ if (newValue === $.oldValue[key]) { return; }
+ $.oldValue[key] = newValue;
+ return cb(dict.json(newValue), key.slice(g.NAMESPACE.length));
+ } else {
+ if ($.oldValue[key] == null) { return; }
+ delete $.oldValue[key];
+ return cb(undefined, key.slice(g.NAMESPACE.length));
+ }
+ };
+ $.on(window, 'storage', onChange);
+
+ return $.forceSync = function(key) {
+ // Storage events don't work across origins
+ // e.g. http://boards.4chan.org and https://boards.4chan.org
+ // so force a check for changes to avoid lost data.
+ key = g.NAMESPACE + key;
+ return onChange({key, newValue: $.getValue(key)});
+ };
+ })();
+ } else {
+ $.sync = function() {};
+ $.forceSync = function() {};
}
- };
- $.get = $.oneItemSugar((items, cb) => $.queueTask($.getSync, items, cb));
-
- $.getSync = function(items, cb) {
- for (var key in items) {
- var val2;
- if (val2 = $.getValue(g.NAMESPACE + key)) {
- try {
- items[key] = $.dict.json(val2);
- } catch (err) {
- // XXX https://github.com/ccd0/4chan-x/issues/2218
- if (!/^(?:undefined)*$/.test(val2)) {
- throw err;
- }
- }
+ $.delete = function(keys) {
+ if (!(keys instanceof Array)) {
+ keys = [keys];
}
- }
- return cb(items);
- };
+ for (var key of keys) {
+ $.deleteValue(g.NAMESPACE + key);
+ }
+ };
- $.set = $.oneItemSugar(function(items, cb) {
- $.securityCheck(items);
- return $.queueTask(function() {
+ $.get = $.oneItemSugar((items, cb) => $.queueTask($.getSync, items, cb));
+
+ $.getSync = function(items, cb) {
for (var key in items) {
- var value = items[key];
- $.setValue(g.NAMESPACE + key, JSON.stringify(value));
+ var val2;
+ if (val2 = $.getValue(g.NAMESPACE + key)) {
+ try {
+ items[key] = dict.json(val2);
+ } catch (err) {
+ // XXX https://github.com/ccd0/4chan-x/issues/2218
+ if (!/^(?:undefined)*$/.test(val2)) {
+ throw err;
+ }
+ }
+ }
}
- return cb?.();
+ return cb(items);
+ };
+
+ $.set = $.oneItemSugar(function(items, cb) {
+ $.securityCheck(items);
+ return $.queueTask(function() {
+ for (var key in items) {
+ var value = items[key];
+ $.setValue(g.NAMESPACE + key, JSON.stringify(value));
+ }
+ return cb?.();
+ });
});
- });
- $.clear = function(cb) {
- // XXX https://github.com/greasemonkey/greasemonkey/issues/2033
- // Also support case where GM_listValues is not defined.
- $.delete(Object.keys(Conf));
- $.delete(['previousversion', 'QR Size', 'QR.persona']);
- try {
- $.delete($.listValues().map(key => key.replace(g.NAMESPACE, '')));
- } catch (error) {}
- return cb?.();
- };
+ $.clear = function(cb) {
+ // XXX https://github.com/greasemonkey/greasemonkey/issues/2033
+ // Also support case where GM_listValues is not defined.
+ $.delete(Object.keys(Conf));
+ $.delete(['previousversion', 'QR Size', 'QR.persona']);
+ try {
+ $.delete($.listValues().map(key => key.replace(g.NAMESPACE, '')));
+ } catch (error) {}
+ return cb?.();
+ };
+ }
}
-// <% } %>
+export default $;
diff --git a/src/platform/CrossOrigin.js b/src/platform/CrossOrigin.js
index d025550698..18af394793 100644
--- a/src/platform/CrossOrigin.js
+++ b/src/platform/CrossOrigin.js
@@ -1,3 +1,7 @@
+import QR from "../Posting/QR";
+import $ from "./$";
+import { dict, platform } from "./helpers";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -6,80 +10,78 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
*/
-// <% if (type === 'crx') { %>
-let Request;
-const eventPageRequest = (function() {
- const callbacks = [];
- chrome.runtime.onMessage.addListener(function(response) {
- callbacks[response.id](response.data);
- return delete callbacks[response.id];});
- return (params, cb) => chrome.runtime.sendMessage(params, id => callbacks[id] = cb);
-})();
-
-// <% } %>
+let eventPageRequest;
+if (platform === 'crx') {
+ eventPageRequest = (function () {
+ const callbacks = [];
+ chrome.runtime.onMessage.addListener(function(response) {
+ callbacks[response.id](response.data);
+ return delete callbacks[response.id];});
+ return (params, cb) => chrome.runtime.sendMessage(params, id => callbacks[id] = cb);
+ })();
+}
var CrossOrigin = {
- binary(url, cb, headers=$.dict()) {
+ binary(url, cb, headers = dict()) {
// XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310
url = url.replace(/^((?:https?:)?\/\/(?:\w+\.)?(?:4chan|4channel|4cdn)\.org)\/adv\//, '$1//adv/');
- // <% if (type === 'crx') { %>
+ if (platform === 'crx') {
eventPageRequest({type: 'ajax', url, headers, responseType: 'arraybuffer'}, function({response, responseHeaderString}) {
if (response) { response = new Uint8Array(response); }
return cb(response, responseHeaderString);
});
- // <% } %>
- // <% if (type === 'userscript') { %>
- const fallback = function() {
- return $.ajax(url, {
+ } else {
+ const fallback = function() {
+ return $.ajax(url, {
+ headers,
+ responseType: 'arraybuffer',
+ onloadend() {
+ if (this.status && this.response) {
+ return cb(new Uint8Array(this.response), this.getAllResponseHeaders());
+ } else {
+ return cb(null);
+ }
+ }
+ });
+ };
+ if ((typeof window.GM_xmlhttpRequest === 'undefined' || window.GM_xmlhttpRequest === null)) {
+ fallback();
+ return;
+ }
+ const gmOptions = {
+ method: "GET",
+ url,
headers,
responseType: 'arraybuffer',
- onloadend() {
- if (this.status && this.response) {
- return cb(new Uint8Array(this.response), this.getAllResponseHeaders());
+ overrideMimeType: 'text/plain; charset=x-user-defined',
+ onload(xhr) {
+ let data;
+ if (xhr.response instanceof ArrayBuffer) {
+ data = new Uint8Array(xhr.response);
} else {
- return cb(null);
- }
- }
- });
- };
- if ((GM?.xmlHttpRequest == null) && (typeof GM_xmlhttpRequest === 'undefined' || GM_xmlhttpRequest === null)) {
- fallback();
- return;
- }
- const gmOptions = {
- method: "GET",
- url,
- headers,
- responseType: 'arraybuffer',
- overrideMimeType: 'text/plain; charset=x-user-defined',
- onload(xhr) {
- let data;
- if (xhr.response instanceof ArrayBuffer) {
- data = new Uint8Array(xhr.response);
- } else {
- const r = xhr.responseText;
- data = new Uint8Array(r.length);
- let i = 0;
- while (i < r.length) {
- data[i] = r.charCodeAt(i);
- i++;
+ const r = xhr.responseText;
+ data = new Uint8Array(r.length);
+ let i = 0;
+ while (i < r.length) {
+ data[i] = r.charCodeAt(i);
+ i++;
+ }
}
+ return cb(data, xhr.responseHeaders);
+ },
+ onerror() {
+ return cb(null);
+ },
+ onabort() {
+ return cb(null);
}
- return cb(data, xhr.responseHeaders);
- },
- onerror() {
- return cb(null);
- },
- onabort() {
- return cb(null);
+ };
+ try {
+ return (GM?.xmlHttpRequest || GM_xmlhttpRequest)(gmOptions);
+ } catch (error) {
+ return fallback();
}
- };
- try {
- return (GM?.xmlHttpRequest || GM_xmlhttpRequest)(gmOptions);
- } catch (error) {
- return fallback();
}
},
- // <% } %>
file(url, cb) {
return CrossOrigin.binary(url, function(data, headers) {
@@ -104,8 +106,8 @@ var CrossOrigin = {
});
},
- Request: (Request = (function() {
- Request = class Request {
+ Request: (function() {
+ const Request = class Request {
static initClass() {
this.prototype.status = 0;
this.prototype.statusText = '';
@@ -114,7 +116,7 @@ var CrossOrigin = {
}
getResponseHeader(headerName) {
if ((this.responseHeaders == null) && (this.responseHeaderString != null)) {
- this.responseHeaders = $.dict();
+ this.responseHeaders = dict();
for (var header of this.responseHeaderString.split('\r\n')) {
var i;
if ((i = header.indexOf(':')) >= 0) {
@@ -131,7 +133,7 @@ var CrossOrigin = {
};
Request.initClass();
return Request;
- })()),
+ })(),
// Attempts to fetch `url` using cross-origin privileges, if available.
// Interface is a subset of that of $.ajax.
@@ -151,65 +153,61 @@ var CrossOrigin = {
let {onloadend, timeout, responseType, headers} = options;
if (responseType == null) { responseType = 'json'; }
- // <% if (type === 'userscript') { %>
- if ((GM?.xmlHttpRequest == null) && (typeof GM_xmlhttpRequest === 'undefined' || GM_xmlhttpRequest === null)) {
+ if ((window.GM?.xmlHttpRequest == null) && (typeof window.GM_xmlhttpRequest === 'undefined' || window.GM_xmlhttpRequest === null)) {
return $.ajax(url, options);
}
- // <% } %>
const req = new CrossOrigin.Request();
req.onloadend = onloadend;
- // <% if (type === 'userscript') { %>
- const gmOptions = {
- method: 'GET',
- url,
- headers,
- timeout,
- onload(xhr) {
- try {
- const response = (() => { switch (responseType) {
- case 'json':
- if (xhr.responseText) { return JSON.parse(xhr.responseText); } else { return null; }
- default:
- return xhr.responseText;
- } })();
- $.extend(req, {
- response,
- status: xhr.status,
- statusText: xhr.statusText,
- responseHeaderString: xhr.responseHeaders
- });
- } catch (error) {}
- return req.onloadend();
- },
- onerror() { return req.onloadend(); },
- onabort() { return req.onloadend(); },
- ontimeout() { return req.onloadend(); }
- };
- try {
- gmReq = (GM?.xmlHttpRequest || GM_xmlhttpRequest)(gmOptions);
- } catch (error) {
- return $.ajax(url, options);
- }
-
- if (gmReq && (typeof gmReq.abort === 'function')) {
- req.abort = function() {
- try {
- return gmReq.abort();
- } catch (error1) {}
+ if (platform === 'userscript') {
+ const gmOptions = {
+ method: 'GET',
+ url,
+ headers,
+ timeout,
+ onload(xhr) {
+ try {
+ const response = (() => { switch (responseType) {
+ case 'json':
+ if (xhr.responseText) { return JSON.parse(xhr.responseText); } else { return null; }
+ default:
+ return xhr.responseText;
+ } })();
+ $.extend(req, {
+ response,
+ status: xhr.status,
+ statusText: xhr.statusText,
+ responseHeaderString: xhr.responseHeaders
+ });
+ } catch (error) {}
+ return req.onloadend();
+ },
+ onerror() { return req.onloadend(); },
+ onabort() { return req.onloadend(); },
+ ontimeout() { return req.onloadend(); }
};
- }
- // <% } %>
+ try {
+ gmReq = (GM?.xmlHttpRequest || GM_xmlhttpRequest)(gmOptions);
+ } catch (error) {
+ return $.ajax(url, options);
+ }
- // <% if (type === 'crx') { %>
- eventPageRequest({type: 'ajax', url, responseType, headers, timeout}, function(result) {
- if (result.status) {
- $.extend(req, result);
+ if (gmReq && (typeof gmReq.abort === 'function')) {
+ req.abort = function() {
+ try {
+ return gmReq.abort();
+ } catch (error1) {}
+ };
}
- return req.onloadend();
- });
- // <% } %>
+ } else {
+ eventPageRequest({type: 'ajax', url, responseType, headers, timeout}, function(result) {
+ if (result.status) {
+ $.extend(req, result);
+ }
+ return req.onloadend();
+ });
+ }
return req;
},
@@ -219,20 +217,17 @@ var CrossOrigin = {
{ajax: CrossOrigin.ajax});
},
- // <% if (type === 'crx') { %>
permission(cb, cbFail, origins) {
- return eventPageRequest({type: 'permission', origins}, function(result) {
- if (result) {
- return cb();
- } else {
- return cbFail();
- }
- });
- },
- // <% } %>
- // <% if (type === 'userscript') { %>
- permission(cb) {
+ if (platform === 'crx') {
+ return eventPageRequest({type: 'permission', origins}, function(result) {
+ if (result) {
+ return cb();
+ } else {
+ return cbFail();
+ }
+ });
+ }
return cb();
- }
+ },
};
- // <% } %>
+export default CrossOrigin;
diff --git a/src/platform/helpers.ts b/src/platform/helpers.ts
new file mode 100644
index 0000000000..63db5aa6b2
--- /dev/null
+++ b/src/platform/helpers.ts
@@ -0,0 +1,54 @@
+// This file was created because these functions on $ were sometimes not initialized yet because of circular
+// dependencies, so try to keep this file without dependencies, so these functions don't have to wait for something else
+
+export const debounce = (wait: number, fn: Function) => {
+ let lastCall = 0;
+ let timeout = null;
+ let that = null;
+ let args = null;
+ const exec = function () {
+ lastCall = Date.now();
+ return fn.apply(that, args);
+ };
+ return function () {
+ args = arguments;
+ that = this;
+ if (lastCall < (Date.now() - wait)) {
+ return exec();
+ }
+ // stop current reset
+ clearTimeout(timeout);
+ // after wait, let next invocation execute immediately
+ return timeout = setTimeout(exec, wait);
+ };
+};
+
+export const dict = () => Object.create(null);
+
+dict.clone = function (obj) {
+ if ((typeof obj !== 'object') || (obj === null)) {
+ return obj;
+ } else if (obj instanceof Array) {
+ const arr = [];
+ for (let i = 0, end = obj.length; i < end; i++) {
+ arr.push(dict.clone(obj[i]));
+ }
+ return arr;
+ } else {
+ const map = Object.create(null);
+ for (var key in obj) {
+ var val = obj[key];
+ map[key] = dict.clone(val);
+ }
+ return map;
+ }
+};
+
+dict.json = (str: string) => dict.clone(JSON.parse(str));
+
+export const SECOND = 1000;
+export const MINUTE = SECOND * 60;
+export const HOUR = MINUTE * 60;
+export const DAY = HOUR * 24;
+
+export const platform = window.GM_xmlhttpRequest ? 'userscript' : 'crx';
diff --git a/src/site/SW.js b/src/site/SW.js
index 120a971ba3..f5f8adbd33 100644
--- a/src/site/SW.js
+++ b/src/site/SW.js
@@ -1 +1,5 @@
-SW = {};
+import SWTinyboard from "./SW.tinyboard";
+import SWYotsuba from "./SW.yotsuba";
+
+const SW = { tinyboard: SWTinyboard, yotsuba: SWYotsuba };
+export default SW;
diff --git a/src/site/SW.tinyboard.js b/src/site/SW.tinyboard.js
index d7e2b978b0..89e3985408 100644
--- a/src/site/SW.tinyboard.js
+++ b/src/site/SW.tinyboard.js
@@ -1,9 +1,15 @@
+import { Conf, d } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+import $$ from "../platform/$$";
+import { dict } 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
*/
-SW.tinyboard = {
+const SWTinyboard = {
isOPContainerThread: true,
mayLackJSON: true,
threadModTimeIgnoresSage: true,
@@ -36,7 +42,7 @@ SW.tinyboard = {
for (var script of $$('script:not([src])', d.head)) {
var m;
if (m = script.textContent.match(/\bvar configRoot=(".*?")/)) {
- var properties = $.dict();
+ var properties = dict();
try {
var root = JSON.parse(m[1]);
if (root[0] === '/') {
@@ -75,7 +81,7 @@ SW.tinyboard = {
if (root) { return `${root}${boardID}/${isArchived ? 'archive/' : ''}res/${threadID}.json`; } else { return ''; }
},
archivedThreadJSON(thread) {
- return SW.tinyboard.urls.threadJSON(thread, true);
+ return SWTinyboard.urls.threadJSON(thread, true);
},
threadsListJSON({siteID, boardID}) {
const root = Conf['siteProperties'][siteID]?.root;
@@ -93,7 +99,7 @@ SW.tinyboard = {
return `${Conf['siteProperties'][siteID]?.root || `http://${siteID}/`}${boardID}/${filename}`;
},
thumb(board, filename) {
- return SW.tinyboard.urls.file(board, filename);
+ return SWTinyboard.urls.file(board, filename);
}
},
@@ -180,7 +186,7 @@ $\
Build: {
parseJSON(data, board) {
- const o = SW.yotsuba.Build.parseJSON(data, board);
+ const o = this.parseJSON(data, board);
if (data.ext === 'deleted') {
delete o.file;
$.extend(o, {
@@ -196,7 +202,7 @@ $\
if (extra_file.ext === 'deleted') {
o.filesDeleted.push(i);
} else {
- file = SW.yotsuba.Build.parseJSONFile(data, board);
+ file = this.parseJSONFile(data, board);
o.files.push(file);
}
}
@@ -296,3 +302,4 @@ $\
return threadRoot.dataset.sticky = 'true';
}
};
+export default SWTinyboard;
diff --git a/src/site/SW.yotsuba.Build.js b/src/site/SW.yotsuba.Build.js
deleted file mode 100644
index 655ca0a62b..0000000000
--- a/src/site/SW.yotsuba.Build.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * 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
- */
-import PostInfoPage from './SW.yotsuba.Build/PostInfo.html';
-import FilePage from './SW.yotsuba.Build/File.html';
-import PostPage from './SW.yotsuba.Build/Post.html';
-import CatalogThreadPage from './SW.yotsuba.Build/CatalogThread.html';
-import CatalogReplyPage from './SW.yotsuba.Build/CatalogReply.html';
-
-var Build = {
- staticPath: '//s.4cdn.org/image/',
- gifIcon: window.devicePixelRatio >= 2 ? '@2x.gif' : '.gif',
- spoilerRange: $.dict(),
-
- 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 = Build.spoilerRange[boardID])) {
- // Randomize the spoiler image.
- return `${Build.staticPath}spoiler-${boardID}${Math.floor(1 + (spoilerRange * Math.random()))}.png`;
- } else {
- return `${Build.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 `${Build.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,
- commentHTML: {innerHTML: data.com || ''}
- };
- 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 = SW.yotsuba.Build.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(//gi, '\n')
- .replace(/\n\n]*>/g, '');
- return $.unescape(html);
- },
-
- parseCommentDisplay(html) {
- // Hide spoilers.
- if (!Conf['Remove Spoilers'] && !Conf['Reveal Spoilers']) {
- let html2;
- while ((html2 = html.replace(/(?:(?!<\/?s>).)*<\/s>/g, '[spoiler]')) !== html) {
- html = html2;
- }
- }
- html = html
- .replace(/^Rolled [^<]*<\/b>/i, '') // Rolls (/tg/, /qst/)
- .replace(/ 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: Build.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 (Build.hat) { $.add(root, Build.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 = Build.summary(thread.board.ID, data.no, posts, files);
- $.add(root, summary);
- }
- return root;
- },
-
- catalogThread(thread, data, pageCount) {
- let cssText, imgClass, src;
- const {staticPath, gifIcon} = Build;
- const {tn_w, tn_h} = data;
-
- if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) {
- let spoilerRange;
- src = `${staticPath}spoiler`;
- if (spoilerRange = Build.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', { innerHTML: CatalogThreadPage });
- $.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 = Build.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(//gi, ' // ')); }
- }
- if (!excerpt) { excerpt = '\xA0'; }
- if (excerpt.length > 73) { excerpt = `${excerpt.slice(0, 70)}...`; }
-
- const link = Build.postURL(thread.board.ID, thread.ID, data.no);
- return $.el('div', {className: 'catalog-reply'},
- { innerHTML: CatalogReplyPage });
- }
-};
-
-SW.yotsuba.Build = Build;
diff --git a/src/site/SW.yotsuba.Build/CatalogReply.html b/src/site/SW.yotsuba.Build/CatalogReply.html
deleted file mode 100644
index 6bd68c0139..0000000000
--- a/src/site/SW.yotsuba.Build/CatalogReply.html
+++ /dev/null
@@ -1,3 +0,0 @@
-:
-
-
diff --git a/src/site/SW.yotsuba.Build/CatalogThread.html b/src/site/SW.yotsuba.Build/CatalogThread.html
deleted file mode 100644
index 70aacb3baa..0000000000
--- a/src/site/SW.yotsuba.Build/CatalogThread.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
- 
-
-
:
+
+ }
+
+ 
+
+ );
+ }
+ return 
+ );
+ if (uniqueID && !capcode) {
+ nameBlockContent.push(
+
+ (ID: ${uniqueID})
+
+ )
+ }
+ }
+ if (flagCode) nameBlockContent.push(' ', );
+ if (flagCodeTroll) nameBlockContent.push(' ', );
+
+ const postNumContent: (EscapedHtml | string)[] = [
+ No.,
+ {ID},
+ ];
+
+ if (o.isSticky) {
+ const src = `${staticPath}sticky${gifIcon}`;
+ postNumContent.push(' ');
+ if (boardID === "f") {
+ postNumContent.push();
+ } else {
+ postNumContent.push()
+ }
+ }
+ if (o.isClosed && !o.isArchived) {
+ postNumContent.push(' ');
+ const src = `${staticPath}closed${gifIcon}`
+ if (boardID === "f") {
+ postNumContent.push()
+ } else {
+ postNumContent.push()
+ }
+ }
+ if (o.isArchived) {
+ postNumContent.push(
+ ' ',
+ 
+ )
+ }
+ if (!o.isReply && g.VIEW === "index") {
+ // \u00A0 is nbsp
+ postNumContent.push(' \u00A0 ')
+ postNumContent.push([Reply])
+ }
+
+ return /gi, '\n')
+ .replace(/\n\n]*>/g, '');
+ return $.unescape(html);
+ },
+
+ parseCommentDisplay(html) {
+ // Hide spoilers.
+ if (!Conf['Remove Spoilers'] && !Conf['Reveal Spoilers']) {
+ let html2;
+ while ((html2 = html.replace(/(?:(?!<\/?s>).)*<\/s>/g, '[spoiler]')) !== html) {
+ html = html2;
+ }
+ }
+ html = html
+ .replace(/^Rolled [^<]*<\/b>/i, '') // Rolls (/tg/, /qst/)
+ .replace(/
+ {(o.isReply ? /gi, ' // ')); }
+ }
+ if (!excerpt) { excerpt = '\xA0'; }
+ if (excerpt.length > 73) { excerpt = `${excerpt.slice(0, 70)}...`; }
+
+ const link = this.postURL(thread.board.ID, thread.ID, data.no);
+ return $.el('div', { className: 'catalog-reply' },
+ <>
+ :
+
+
+
+ );
+ }
+ }
+};
+export default SWYotsuba;
diff --git a/src/site/Site.js b/src/site/Site.js
index db70615cfc..f7bbc3ed36 100644
--- a/src/site/Site.js
+++ b/src/site/Site.js
@@ -1,3 +1,9 @@
+import { Conf, doc, g } from "../globals/globals";
+import Main from "../main/Main";
+import $ from "../platform/$";
+import { dict } from "../platform/helpers";
+import SW from "./SW";
+
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
@@ -26,7 +32,7 @@ var Site = {
if (changes = SW[software].detect?.()) {
changes.software = software;
hostname = location.hostname.replace(/^www\./, '');
- var properties = (Conf['siteProperties'][hostname] || (Conf['siteProperties'][hostname] = $.dict()));
+ var properties = (Conf['siteProperties'][hostname] || (Conf['siteProperties'][hostname] = dict()));
var changed = 0;
for (var key in changes) {
if (properties[key] !== changes[key]) {
@@ -79,3 +85,4 @@ var Site = {
return g.SITE = g.sites[hostname];
}
};
+export default Site;
diff --git a/src/types/customImports.d.ts b/src/types/customImports.d.ts
new file mode 100644
index 0000000000..84eb6e4dcb
--- /dev/null
+++ b/src/types/customImports.d.ts
@@ -0,0 +1,70 @@
+declare module '*.css' { const css: string; export default css; }
+declare module '*.woff' { const woff: string; export default woff; }
+declare module '*.woff2' { const woff2: string; export default woff2; }
+declare module '*.html' { const html: string; export default html; }
+declare module '*.gif' { const gif: string; export default gif; }
+declare module '*.png' { const png: string; export default png; }
+declare module '*.wav' { const wav: string; export default wav; }
+declare module '*/package.json' {
+ const meta: {
+ "name": string,
+ "path": string,
+ "fork": string,
+ "page": string,
+ "downloads": string,
+ "oldVersions": string,
+ "faq": string,
+ "captchaFAQ": string,
+ "cssGuide": string,
+ "license": string,
+ "changelog": string,
+ "issues": string,
+ "newIssue": string,
+ "newIssueMaxLength": number,
+ "alternatives": string,
+ "appid": string,
+ "appidGecko": string,
+ "chromeStoreID": string,
+ "recaptchaKey": string,
+ "distBranch": string,
+ "includes_only": string[],
+ "matches_only": string[],
+ "matches": string[],
+ "matches_extra": string[],
+ "exclude_matches": string[],
+ "grants": string[],
+ "min": {
+ "chrome": string,
+ "firefox": string,
+ "greasemonkey": string
+ }
+ }
+ export default meta;
+}
+declare module '*/version.json' {
+ const versionInfo: {
+ version: string,
+ /** ISO */
+ date: string,
+ }
+ export default versionInfo;
+}
+declare module '*/archives.json' {
+ const archives: {
+ uid: number,
+ name: string,
+ domain: string,
+ http: boolean,
+ https: boolean,
+ software: string,
+ boards: string[],
+ files: string[],
+ search?: string[],
+ reports?: boolean,
+ }[];
+ export default archives;
+}
+declare module '*/banners.json' {
+ const banners: string[];
+ export default banners;
+}
diff --git a/src/types/globals.d.ts b/src/types/globals.d.ts
new file mode 100644
index 0000000000..2cc8ff6836
--- /dev/null
+++ b/src/types/globals.d.ts
@@ -0,0 +1,2 @@
+declare const cloneInto: Function;
+declare const XPCNativeWrapper: any;
diff --git a/src/types/jsx.d.ts b/src/types/jsx.d.ts
new file mode 100644
index 0000000000..f1dc25db81
--- /dev/null
+++ b/src/types/jsx.d.ts
@@ -0,0 +1,6 @@
+import { EscapedHtml } from "../globals/jsx";
+
+declare namespace JSX {
+ interface IntrinsicElements extends Record { }
+ interface Element extends EscapedHtml { }
+}
diff --git a/tools/chain.js b/tools/chain.js
index e3a02e44a6..88eb2c7fbe 100644
--- a/tools/chain.js
+++ b/tools/chain.js
@@ -1,5 +1,5 @@
var fs = require('fs');
-var template = require('./template');
+var template = require('./template.js');
var coffee = require('coffeescript');
for (var name of process.argv.slice(2)) {
diff --git a/tools/rollup-plugin-base64.js b/tools/rollup-plugin-base64.js
new file mode 100644
index 0000000000..06175bfe76
--- /dev/null
+++ b/tools/rollup-plugin-base64.js
@@ -0,0 +1,27 @@
+import { readFile } from 'fs/promises';
+import { createFilter } from "@rollup/pluginutils";
+
+/**
+ * @param {{
+ * include: import("@rollup/pluginutils").FilterPattern,
+ * exclude?: import("@rollup/pluginutils").FilterPattern,
+ * }} opts
+ * @returns {import("rollup").Plugin}
+ */
+export default function importBase64(opts) {
+ if (!opts.include) {
+ throw Error("include option should be specified");
+ }
+ const filter = createFilter(opts.include, opts.exclude);
+
+ return {
+ name: "base64",
+
+ async load(id) {
+ if (!filter(id)) return;
+
+ const file = await readFile(id);
+ return `export default '${file.toString('base64')}';`;
+ }
+ };
+};
diff --git a/tools/rollup-plugin-inline-file.js b/tools/rollup-plugin-inline-file.js
index df9b9c5f39..9320736861 100644
--- a/tools/rollup-plugin-inline-file.js
+++ b/tools/rollup-plugin-inline-file.js
@@ -1,29 +1,52 @@
-import { createFilter } from "rollup-pluginutils";
+import { createFilter } from "@rollup/pluginutils";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
-export default function inlineFile(opts = {}) {
- if (!opts.include) {
- throw Error("include option should be specified");
- }
+const __dirname = dirname(fileURLToPath(import.meta.url));
- if (opts.transformer && typeof opts.transformer !== 'function') {
- throw new Error('If transformer is given, it must be a function');
- }
+export default async function setupFileInliner(packageJson) {
+ /** @param {string} string */
+ const escape = (string) => string.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\$\{/g, '\\\${');
- const filter = createFilter(opts.include, opts.exclude);
+ /**
+ * @param {{
+ * include: import("@rollup/pluginutils").FilterPattern,
+ * exclude?: import("@rollup/pluginutils").FilterPattern,
+ * transformer?: (input: string) => string
+ * wrap?: boolean
+ * }} opts
+ * @returns {import("rollup").Plugin}
+ */
+ return function inlineFile(opts) {
+ if (!opts.include) {
+ throw Error("include option should be specified");
+ }
+
+ if (opts.transformer && typeof opts.transformer !== 'function') {
+ throw new Error('If transformer is given, it must be a function');
+ }
+
+ const wrap = 'wrap' in opts ? opts.wrap : true;
- return {
- name: "inlineFile",
+ const filter = createFilter(opts.include, opts.exclude);
- transform(code, id) {
- if (filter(id)) {
- if (opts.transformer) {
- code = opts.transformer(code);
+ return {
+ name: "inlineFile",
+
+ async transform(code, id) {
+ if (filter(id)) {
+ if (opts.transformer) {
+ code = opts.transformer(code);
+ }
+ if (!wrap) return code;
+
+ code = escape(code);
+ code = code.replace(/<%= meta\.(\w+) %>/g, (match, $1) => {
+ return escape(packageJson.meta[$1]);
+ });
+ return `export default \`${code}\`;`;
}
- return {
- code: `export default ${JSON.stringify(code)};`,
- map: { mappings: "" }
- };
}
- }
+ };
};
-}
\ No newline at end of file
+}
diff --git a/tools/rollup-plugin-remove-test-code.js b/tools/rollup-plugin-remove-test-code.js
new file mode 100644
index 0000000000..70f124bc96
--- /dev/null
+++ b/tools/rollup-plugin-remove-test-code.js
@@ -0,0 +1,40 @@
+import { createFilter } from "@rollup/pluginutils";
+import MagicString from 'magic-string';
+
+/**
+ * Remove test code comments from the output build.
+ *
+ * @param {Object} opts
+ * @param {import("@rollup/pluginutils").FilterPattern} opts.include
+ * @param {import("@rollup/pluginutils").FilterPattern} [opts.exclude]
+ * @param {boolean} opts.sourceMap
+ * @returns {import("rollup").Plugin}
+ */
+export default function removeTestCode(opts) {
+ if (!opts.include) {
+ throw Error("include option should be specified");
+ }
+
+ const filter = createFilter(opts.include, opts.exclude);
+
+ return {
+ name: "removeTestCode",
+
+ async transform(code, id) {
+ if (!filter(id)) return;
+
+ const ms = new MagicString(code);
+
+ let index = 0;
+ while (index >= 0) {
+ const startIndex = code.indexOf('// #region tests_enabled', index);
+ if (startIndex < 0) break;
+
+ index = code.indexOf('// #endregion', startIndex) + 13
+ ms.remove(startIndex, index);
+ }
+
+ return { code: ms.toString(), map: opts.sourceMap ? ms.generateMap() : { mappings: '' } };
+ }
+ };
+};
\ No newline at end of file
diff --git a/tools/rollup.js b/tools/rollup.js
index 4758a3cbc2..572a099ae7 100644
--- a/tools/rollup.js
+++ b/tools/rollup.js
@@ -1,16 +1,107 @@
-import { rollup } from "rollup";
-import inlineFile from "./rollup-plugin-inline-file";
-
-rollup({
- entry: "main.js",
- plugins: [
- inlineFile({
- include: ["**/*.html", "**/*.css"],
- }),
- inlineFile({
- include: ["**/*.png", "**/*.gif"],
- // base64 encode
- transformer: btoa
- })
- ]
-});
\ No newline at end of file
+import { rollup } from 'rollup';
+import typescript from '@rollup/plugin-typescript';
+import setupFileInliner from './rollup-plugin-inline-file.js';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import generateMetadata from '../src/meta/metadata.js';
+import { copyFile, readFile, writeFile } from 'fs/promises';
+import importBase64 from './rollup-plugin-base64.js';
+import generateManifestJson from '../src/meta/manifestJson.js';
+import removeTestCode from './rollup-plugin-remove-test-code.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+const buildDir = resolve(__dirname, '../builds/test/');
+
+let channel = '';
+
+if (process.argv.includes('-beta')) {
+ channel = '-beta';
+} else if (process.argv.includes('-noupdate')) {
+ channel = '-noupdate';
+}
+const buildForTest = process.argv.includes('-test');
+
+(async () => {
+ const packageJson = JSON.parse(await readFile(resolve(__dirname, '../package.json'), 'utf-8'));
+
+ const metadata = await generateMetadata(packageJson, channel);
+
+ const license = await readFile(resolve(__dirname, '../LICENSE'), 'utf8');
+
+ const version = JSON.parse(await readFile(resolve(__dirname, '../version.json'), 'utf-8'));
+
+
+ const inlineFile = await setupFileInliner(packageJson);
+
+ const bundle = await rollup({
+ input: resolve(__dirname, '../src/main/Main.js'),
+ plugins: [
+ buildForTest ? undefined : removeTestCode({
+ include: [
+ // Only files that actually have test code.
+ "**/src/main/Main.js",
+ "**/src/classes/Post.js",
+ "**/src/Linkification/Linkify.js",
+ ],
+ sourceMap: false,
+ }),
+ typescript(),
+ inlineFile({
+ include: ["**/*.html", "**/*.css"],
+ }),
+ importBase64({ include: ["**/*.png", "**/*.gif", "**/*.wav", "**/*.woff", "**/*.woff2"] }),
+ inlineFile({
+ include: "**/package.json",
+ wrap: false,
+ transformer(input) {
+ const data = JSON.parse(input);
+ return `export default ${JSON.stringify(data.meta, undefined, 1)};`;
+ }
+ }),
+ inlineFile({
+ include: "**/*.json",
+ exclude: "**/package.json",
+ wrap: false,
+ transformer(input) {
+ return `export default ${input};`;
+ }
+ })
+ ]
+ });
+
+ /** @type {import('rollup').OutputOptions} */
+ const sharedBundleOpts = {
+ format: "iife",
+ generatedCode: {
+ // needed for possible circular dependencies
+ constBindings: false,
+ },
+ // Can't be none as long as the root file defined exports
+ // exports: 'none',
+ };
+
+ // user script
+ await bundle.write({
+ ...sharedBundleOpts,
+ banner: metadata + license,
+ // file: '../builds/test/rollupOutput.js',
+ file: resolve(buildDir, `${packageJson.meta.path}${channel}.user.js`),
+ });
+
+ // chrome extension
+ const crxDir = resolve(buildDir, 'crx');
+ await bundle.write({
+ ...sharedBundleOpts,
+ banner: license,
+ file: resolve(crxDir, 'script.js'),
+ });
+
+ await copyFile(resolve(__dirname, '../src/meta/eventPage.js'), resolve(crxDir, 'eventPage.js'));
+
+ writeFile(resolve(crxDir, 'manifest.json'), generateManifestJson(packageJson, version, channel));
+
+ for (const file of ['icon16.png', 'icon48.png', 'icon128.png']) {
+ await copyFile(resolve(__dirname, '../src/meta/', file), resolve(crxDir, file));
+ };
+})();
diff --git a/tools/tsconfig.json b/tools/tsconfig.json
new file mode 100644
index 0000000000..b8183e413a
--- /dev/null
+++ b/tools/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "compilerOptions": {
+ "moduleResolution": "node16",
+ "types": [
+ "@violentmonkey/types",
+ "@types/chrome",
+ "node"
+ ],
+ },
+ "extends": "../tsconfig.json"
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..e8f32ff188
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,29 @@
+{
+ "compilerOptions": {
+ "module": "ES2022",
+ "noImplicitAny": false,
+ "removeComments": false,
+ "sourceMap": true,
+ "target": "ES2020",
+ "allowJs": true,
+ "checkJs": true,
+ "noEmit": true,
+ "jsx": "react",
+ "jsxFactory": "h",
+ "jsxFragmentFactory": "hFragment",
+ "types": [
+ "@violentmonkey/types",
+ "@types/chrome"
+ ],
+ "lib": [
+ "DOM",
+ "ES2020"
+ ],
+ // needs to be in the deepest dir used as target in the rollup build
+ // https://stackoverflow.com/q/40460790, https://github.com/rollup/plugins/issues/243
+ "outDir": "builds/test/crx/tsOutput",
+ },
+ "exclude": [
+ "builds/test/tsOutput"
+ ]
+}
"}, '[b]': {innerHTML: ""}, @@ -79,7 +93,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,20 +233,20 @@ 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] === '>'; text = text.replace(/(\[\/?[a-z]+):lit(\])/g, '$1$2'); text = text.split(/(>>(?:>\/[a-z\d]+\/)?\d+)/g).map((text2, j) => - {innerHTML: ((j % 2) ? "" + E(text2) + "" : E(text2));}); + ({innerHTML: ((j % 2) ? "" + E(text2) + "" : E(text2))})); text = {innerHTML: ((greentext) ? "" + E.cat(text) + "" : E.cat(text))}; result.push(text); } } return result; })(); - comment = {innerHTML: E.cat(comment)}; + comment = { innerHTML: E.cat(comment), [isEscaped]: true }; this.threadID = +data.thread_num; const o = { @@ -291,7 +306,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..23269ee6cc 100644 --- a/src/classes/Post.js +++ b/src/classes/Post.js @@ -1,27 +1,40 @@ +import Get from "../General/Get"; +// #region tests_enabled +import Test from "../General/Test"; +// #endregion +import { g, Conf } from "../globals/globals"; +import ImageExpand from "../Images/ImageExpand"; +import $ from "../platform/$"; +import $$ from "../platform/$$"; +import Callbacks from "./Callbacks"; + /* * 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={}) { - // <% if (readJSON('/.tests_enabled')) { %> - // @normalizedOriginal = Test.normalize root - // <% } %> + // #region tests_enabled + if (root) this.normalizedOriginal = Test.normalize(root); + // #endregion + // Skip initialization for PostClone + if (root === undefined && thread === undefined && board === undefined) return; + + this.root = root; this.thread = thread; this.board = board; $.extend(this, flags); @@ -82,9 +95,9 @@ class Post { this.isHidden = false; this.clones = []; - // <% if (readJSON('/.tests_enabled')) { %> - // return if @forBuildTest - // <% } %> + // #region tests_enabled + if (this.forBuildTest) return; + // #endregion if (g.posts.get(this.fullID)) { this.isRebuilt = true; this.clones = g.posts.get(this.fullID).clones; @@ -95,6 +108,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 +353,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(this, context, contractThumb); } rmClone(index) { @@ -354,5 +370,93 @@ 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(origin, context, contractThumb) { + super(); + this.isClone = true; + + 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..c9a1c554fe
--- /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}+