cleanup

Rand0max · Dec 26, 2022 · a40bd76 · a40bd76
1 parent 2642a6a
commit a40bd76
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/deboucled.meta.js b/deboucled.meta.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name        Déboucled
 // @namespace   deboucledjvcom
-// @version     2.38.1
+// @version     2.38.2
 // @downloadURL https://github.com/Rand0max/deboucled/raw/master/deboucled.user.js
 // @updateURL   https://github.com/Rand0max/deboucled/raw/master/deboucled.meta.js
 // @author      Rand0max

diff --git a/deboucled.user.js b/deboucled.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name        Déboucled
 // @namespace   deboucledjvcom
-// @version     2.38.1
+// @version     2.38.2
 // @downloadURL https://github.com/Rand0max/deboucled/raw/master/deboucled.user.js
 // @updateURL   https://github.com/Rand0max/deboucled/raw/master/deboucled.meta.js
 // @author      Rand0max

diff --git a/extras.js b/extras.js
@@ -3,10 +3,11 @@
 // EXTRAS
 ///////////////////////////////////////////////////////////////////////////////////////
 
-function buildCardForum(mainTitle, rightTitle, contentId, contentHtml) {
+function buildCardForum(mainTitle, rightTitle, contentId, contentHtml, cardId) {
     const cardForum = document.createElement('div');
     cardForum.className = 'card card-jv-forum card-forum-margin';
-    cardForum.innerHTML = `<div class="card-header">${mainTitle}<span class="deboucled-card-header-right">${rightTitle}</span></div>
+    const id = cardId ? `id="${cardId}"` : '';
+    cardForum.innerHTML = `<div ${id} class="card-header">${mainTitle}<span class="deboucled-card-header-right">${rightTitle}</span></div>
 <div class="card-body">
 <div class="scrollable">
 <div class="scrollable-wrapper">
@@ -25,10 +26,10 @@ function buildSponsor() {
     }
 
     const forumRightCol = document.querySelector('div#forum-right-col');
-    if (forumRightCol) {
+    if (forumRightCol && !decensuredActive) {
         const decensuredLink = `<a href="${decensuredUrl}" target="_blank"><b>Décensured</b> <span class="deboucled-sponsoring-decensured-logo"></span></a>`;
         const decensuredCardHtml = `<div class="deboucled-sponsoring"><div style="font-weight: 800;">Marre des bans et des 410 intempestifs ?</div><div>Découvrez ${decensuredLink} le script anti-censure !</div></div>`;
-        const decensuredCard = buildCardForum('Déboucled présente', '', 'deboucled-sponsoring-decensured', decensuredCardHtml);
+        const decensuredCard = buildCardForum('Déboucled présente', '', 'deboucled-sponsoring-decensured', decensuredCardHtml, 'card-header-decensured');
         forumRightCol.appendChild(decensuredCard);
     }
 }
@@ -118,6 +119,6 @@ function displayAnnouncement() {
 function buildExtras() {
     buildDonation();
     buildSponsor();
-    buildAds();
+    //buildAds();
 }
 
diff --git a/main.js b/main.js
@@ -934,8 +934,8 @@ async function entryPoint() {
         await updateUser();
         await suggestUpdate();
 
-        displaySecret();
-        displayAnnouncement();
+        //displaySecret();
+        //displayAnnouncement();
     } catch (error) {
         const elapsed = performance.now() - start;
         console.error(error);

diff --git a/messages.js b/messages.js
@@ -220,6 +220,8 @@ function enableDecensuredEvents() {
     addEventListener('decensured:active', () => {
         decensuredActive = true;
         document.querySelectorAll('p.deboucled-decensured-message').forEach(e => e.remove());
+        const decensuredSponsoring = document.querySelector('#card-header-decensured');
+        if (decensuredSponsoring) decensuredSponsoring.remove();
     });
 }
 

diff --git a/storage.js b/storage.js
@@ -11,7 +11,7 @@ const localstorage_authorAvatars = 'deboucled_topicAuthorAvatars';
 
 const storage_init = 'deboucled_init', storage_init_default = false;
 const storage_secret_displayed = 'deboucled_secret_displayed', storage_secret_displayed_default = false;
-const storage_announcement_displayed = 'deboucled_announcement3_displayed', storage_announcement_displayed_default = false;
+const storage_announcement_displayed = 'deboucled_announcement4_displayed', storage_announcement_displayed_default = false;
 const storage_userId = 'deboucled_userId', storage_userId_default = '';
 const storage_lastUsedPseudo = 'deboucled_lastUsedPseudo', storage_lastUsedPseudo_default = '';
 const storage_preBoucles = 'deboucled_preBoucles', storage_preBoucles_default = '[]';

diff --git a/variables.js b/variables.js
@@ -102,6 +102,6 @@ let smileyGifRegex = new RegExp();
 const decensuredUrl = 'https://github.com/Rand0max/decensured#readme';
 let decensuredActive = false;
 
-const deboucledPseudos = ['rand0max', 'rand0max2', 'rand0max3', 'rand0max4', 'rand0maxreborn', 'deboucled', 'decensured'];
+const deboucledPseudos = ['rand0max', 'rand0max2', 'rand0max3', 'rand0max4', 'rand0max5', 'rand0maxreborn', 'deboucled', 'decensured'];
 const deboucledTopics = ['67697509', '68410257', '68982055', '70029449'];
 
diff --git a/version b/version
@@ -1 +1 @@
-2.38.1
+2.38.2