@@ -347,6 +347,19 @@
Use the help link for more information.
+
+
@@ -371,6 +384,7 @@
+
Notice: Undiscord may be working slower than usual andrequire multiple attempts due to a recent Discord update. We're working on a fix, and we thank you for your patience.
@@ -538,6 +552,7 @@
log.verb('Fetching messages...');
// Search messages
await this.search();
+
// Process results and find which messages should be deleted
await this.filterResponse();
@@ -574,11 +589,15 @@
}
else {
log.verb('Ended because API returned an empty page.');
- if (this.state.grandTotal - this.state.offset > 0) log.warn('[End condition A].', this.state); // I don't remember why this was here. (looks like messagesToDelete==0 && skippedMessages==0 is enough
- else log.warn('[End condition B] if you see this please report.', this.state);
+ log.verb('[End state]', this.state);
if (isJob) break; // break without stopping if this is part of a job
this.state.running = false;
}
+
+ // wait before next page (fix search page not updating fast enough)
+ log.verb(`Waiting ${(this.options.searchDelay/1000).toFixed(2)}s before next page...`);
+ await wait(this.options.searchDelay);
+
} while (this.state.running);
this.stats.endTime = new Date();
@@ -591,6 +610,7 @@
stop() {
this.state.running = false;
+ if (this.onStop) this.onStop(this.state, this.stats);
}
/** Calculate the estimated time remaining based on the current stats */
@@ -651,12 +671,14 @@
this.afterRequest();
} catch (err) {
this.state.running = false;
- return log.error('Search request threw an error:', err);
+ log.error('Search request threw an error:', err);
+ throw err;
}
// not indexed yet
if (resp.status === 202) {
- const w = (await resp.json()).retry_after * 1000;
+ let w = (await resp.json()).retry_after * 1000;
+ w = w || this.stats.searchDelay; // Fix retry_after 0
this.stats.throttledCount++;
this.stats.throttledTotalTime += w;
log.warn(`This channel isn't indexed yet. Waiting ${w}ms for discord to index it...`);
@@ -667,19 +689,24 @@
if (!resp.ok) {
// searching messages too fast
if (resp.status === 429) {
- const w = (await resp.json()).retry_after * 1000;
+ let w = (await resp.json()).retry_after * 1000;
+ w = w || this.stats.searchDelay; // Fix retry_after 0
+
this.stats.throttledCount++;
this.stats.throttledTotalTime += w;
this.stats.searchDelay += w; // increase delay
+ w = this.stats.searchDelay;
log.warn(`Being rate limited by the API for ${w}ms! Increasing search delay...`);
this.printStats();
log.verb(`Cooling down for ${w * 2}ms before retrying...`);
await wait(w * 2);
return await this.search();
- } else {
+ }
+ else {
this.state.running = false;
- return log.error(`Error searching messages, API responded with status ${resp.status}!\n`, await resp.json());
+ log.error(`Error searching messages, API responded with status ${resp.status}!\n`, await resp.json());
+ throw resp;
}
}
const data = await resp.json();
@@ -1141,13 +1168,25 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
function getGuildId() {
const m = location.href.match(/channels\/([\w@]+)\/(\d+)/);
if (m) return m[1];
- else alert('Could not the Guild ID!\nPlease make sure you are on a Server or DM.');
+ else alert('Could not find the Guild ID!\nPlease make sure you are on a Server or DM.');
}
function getChannelId() {
const m = location.href.match(/channels\/([\w@]+)\/(\d+)/);
if (m) return m[2];
- else alert('Could not the Channel ID!\nPlease make sure you are on a Channel or DM.');
+ else alert('Could not find the Channel ID!\nPlease make sure you are on a Channel or DM.');
+ }
+
+ function fillToken() {
+ try {
+ return getToken();
+ } catch (err) {
+ log.verb(err);
+ log.error('Could not automatically detect Authorization Token!');
+ log.info('Please make sure Undiscord is up to date');
+ log.debug('Alternatively, you can try entering a Token manually in the "Advanced Settings" section.');
+ }
+ return '';
}
const PREFIX = '[UNDISCORD]';
@@ -1249,7 +1288,6 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
const b = ui.undiscordWindow.classList.toggle('redact');
if (b) alert('This mode will attempt to hide personal information, so you can screen share / take screenshots.\nAlways double check you are not sharing sensitive information!');
};
-
$('#pickMessageAfter').onclick = async () => {
alert('Select a message on the chat.\nThe message below it will be deleted.');
toggleWindow();
@@ -1264,7 +1302,7 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
if (id) $('input#maxId').value = id;
toggleWindow();
};
-
+ $('button#getToken').onclick = () => $('input#token').value = fillToken();
// sync delays
$('input#searchDelay').onchange = (e) => {
@@ -1283,12 +1321,8 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
$('div#deleteDelayValue').textContent = event.target.value + 'ms';
});
-
// import json
const fileSelection = $('input#importJsonInput');
- // $('button#importJsonBtn').onclick = () => {
- // fileSelection.click();
- // };
fileSelection.onchange = async () => {
const files = fileSelection.files;
@@ -1325,6 +1359,7 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
function printLog(type = '', args) {
ui.logArea.insertAdjacentHTML('beforeend', `
${Array.from(args).map(o => typeof o === 'object' ? JSON.stringify(o, o instanceof Error && Object.getOwnPropertyNames(o)) : o).join('\t')}
`);
if (ui.autoScroll.checked) ui.logArea.querySelector('div:last-child').scrollIntoView(false);
+ if (type==='error') console.error(PREFIX, ...Array.from(args));
}
function setupUndiscordCore() {
@@ -1340,7 +1375,7 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
};
undiscordCore.onProgress = (state, stats) => {
- console.log(PREFIX, 'onProgress', state, stats);
+ // console.log(PREFIX, 'onProgress', state, stats);
let max = state.grandTotal;
const value = state.delCount + state.failCount;
max = Math.max(max, value, 0); // clamp max
@@ -1386,15 +1421,7 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
async function startAction() {
console.log(PREFIX, 'startAction');
-
// general
- let authToken;
- try {
- authToken = getToken();
- } catch (err) {
- console.error(err);
- log.error(err);
- }
const authorId = $('input#authorId').value.trim();
const guildId = $('input#guildId').value.trim();
const channelIds = $('input#channelId').value.trim().split(/\s*,\s*/);
@@ -1414,14 +1441,17 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
//advanced
const searchDelay = parseInt($('input#searchDelay').value.trim());
const deleteDelay = parseInt($('input#deleteDelay').value.trim());
-
+
+ // token
+ const authToken = $('input#token').value.trim() || fillToken();
+ if (!authToken) return; // get token already logs an error.
+
+ // validate input
+ if (!guildId) return log.error('You must fill the "Server ID" field!');
+
// clear logArea
ui.logArea.innerHTML = '';
- // validate input
- if (!authToken) return log.error('Could not detect the authorization token!') || log.info('Please make sure Undiscord is up to date');
- else if (!guildId) return log.error('You must provide a Server ID!');
-
undiscordCore.resetState();
undiscordCore.options = {
...undiscordCore.options,
@@ -1448,19 +1478,18 @@ body.undiscord-pick-message.after [id^="message-content-"]:hover::after {
}));
try {
- undiscordCore.runBatch(jobs);
+ await undiscordCore.runBatch(jobs);
} catch (err) {
- console.error(err);
- log.error(err);
+ log.error('CoreException', err);
}
}
// single channel
else {
try {
- undiscordCore.run();
+ await undiscordCore.run();
} catch (err) {
- console.error(err);
- log.error(err);
+ log.error('CoreException', err);
+ undiscordCore.stop();
}
}
}
diff --git a/package-lock.json b/package-lock.json
index 94d1bc24..3af7149a 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "undiscord",
- "version": "5.2.0",
+ "version": "5.2.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "undiscord",
- "version": "5.2.0",
+ "version": "5.2.1",
"license": "MIT",
"devDependencies": {
"@rollup/plugin-json": "^6.0.0",
diff --git a/package.json b/package.json
index ac2bd0fa..d0c93482 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "undiscord",
"nameFull": "Undiscord",
- "version": "5.2.0",
+ "version": "5.2.1",
"description": "Delete all messages in a Discord channel or DM (Bulk deletion)",
"userScript": {
"namespace": "https://github.com/victornpb/deleteDiscordMessages",
@@ -70,7 +70,7 @@
"pre-commit": "lint-staged"
}
},
- "lint-staged":{
+ "lint-staged": {
"src/**.js": "npm run lint"
}
}