diff --git a/Extensions/blacklist.css b/Extensions/blacklist.css
index 8c153b0b4..9be8ed139 100644
--- a/Extensions/blacklist.css
+++ b/Extensions/blacklist.css
@@ -260,3 +260,45 @@
background: rgba(var(--black), 0.25);
border-color: rgba(var(--black), 0.8);
}
+
+#xkit-bne-custom-panel {
+ padding: 1em;
+ font-size: 14px;
+ line-height: 1.5;
+ color: rgb(80,80,80);
+}
+
+#xkit-bne-container {
+ max-height: calc(100vh - 200px);
+ overflow-y: auto;
+ padding: 0.5em;
+}
+#xkit-bne-container > * {
+ margin-bottom: 0.75em;
+}
+
+#xkit-bne-export-table {
+ width: 100%;
+ outline: 1px solid gray;
+}
+#xkit-bne-export-table th, #xkit-bne-export-table td {
+ text-align: center;
+ vertical-align: middle;
+ padding: 0.4em;
+ line-height: normal;
+}
+#xkit-bne-export-table input[type="text"] {
+ margin: 0;
+}
+#xkit-bne-export-table thead {
+ background-color: lightgray;
+}
+#xkit-bne-export-table tbody tr:not(:last-child) {
+ border-bottom: 1px solid lightgray;
+}
+#xkit-bne-word-header {
+ max-width: 30%;
+}
+#xkit-bne-tag-header, #xkit-bne-content-header {
+ width: 15%;
+}
diff --git a/Extensions/blacklist.js b/Extensions/blacklist.js
index 0c2956ba7..201196982 100644
--- a/Extensions/blacklist.js
+++ b/Extensions/blacklist.js
@@ -1,5 +1,5 @@
//* TITLE Blacklist **//
-//* VERSION 3.1.9 **//
+//* VERSION 3.2.0 **//
//* DESCRIPTION Clean your dash **//
//* DETAILS This extension allows you to block posts based on the words you specify. If a post has the text you've written in the post itself or it's tags, it will be replaced by a warning, or won't be shown on your dashboard, depending on your settings. **//
//* DEVELOPER new-xkit **//
@@ -983,21 +983,20 @@ XKit.extensions.blacklist = new Object({
destroy: function() {
this.running = false;
- clearTimeout(XKit.extensions.blacklist.check_interval);
XKit.post_listener.remove("blacklist");
- setTimeout(function() {
- $(".xblacklist-done").each(function() {
- $(this).removeClass("xblacklist_blacklisted_post");
- $(this).find(".xblacklist_excuse_container").remove();
- const postContentSel = XKit.css_map.keyToCss('post') || '.post_content';
- $(this).find(postContentSel).html($(this).find(".xblacklist_old_content").html());
- $(this).find(".xkit-shorten-posts-embiggen").css("display", "block");
- XKit.extensions.blacklist.unhide_post($(this));
- });
- $(".xblacklist-done").removeClass("xblacklist-done");
- $(".xblacklist_hidden_post").removeClass("xblacklist_hidden_post");
- $(".xblacklist_blacklisted_post").removeClass("xblacklist_blacklisted_post");
- }, 500);
+
+ $(".xblacklist-done").each(function() {
+ $(this).removeClass("xblacklist_blacklisted_post");
+ $(this).find(".xblacklist_excuse_container").remove();
+ const postContentSel = XKit.css_map.keyToCss('post') || '.post_content';
+ $(this).find(postContentSel).html($(this).find(".xblacklist_old_content").html());
+ $(this).find(".xkit-shorten-posts-embiggen").css("display", "block");
+ XKit.extensions.blacklist.unhide_post($(this));
+ });
+ $(".xblacklist-done").removeClass("xblacklist-done");
+ $(".xblacklist_hidden_post").removeClass("xblacklist_hidden_post");
+ $(".xblacklist_blacklisted_post").removeClass("xblacklist_blacklisted_post");
+
XKit.tools.remove_css("blacklist");
},
@@ -1174,6 +1173,230 @@ XKit.extensions.blacklist = new Object({
$("#xkit-extensions-panel-right").nanoScroller();
$("#xkit-extensions-panel-right").nanoScroller({ scroll: 'top' });
+ XKit.extensions.blacklist.nativeExportCpanel(m_div);
+ },
+
+ nativeExportCpanel: function(m_div) {
+
+ $('#xkit-bne-custom-panel').remove();
+ $(m_div).prepend(`
+
+
+ Tumblr now has built-in tag and content filtering that works both in web browsers and on
+ mobile. You can apply a slimmer layout to natively filtered posts or hide them completely
+ using the options in Tweaks in
+
+ XKit Rewritten!
+
+
+ Export your blacklisted words using this interactive form:
+
+ Tumblr's native filtering has two categories of words: filtered tags and
+ filtered post content.
+
+
+ As of 2022:
+
+
+
+ Filtering a word or phrase as a tag will hide any posts with that exact
+ tag (no wildcards) and any reblog chains where the original root post contains
+ that tag.
+
+
+ Filtering a word or phrase as post content will hide any post with the
+ specified word or phrase anywhere in the post text or in any usernames,
+ including in the middle of a word (filtering "ash" will hide posts with
+ "dashboard" or "fashion", or with a reblog comment by a user named
+ "ash-ketchum"). It will not search the post tags.
+
+
+
+ Select which of your blacklisted words you wish to add to the native filtering
+ lists as filtered tags, filtered post content, or both. You can write multiple
+ variations of a term in a text box, separated by commas, and every variation
+ will be added.
+
+
+ Nothing will be removed from blacklist or from the native filtering lists.
+