Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unarchive thread to delete messages #520

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Unarchive thread to delete messages #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2849880
V0 of unarchiving
ckcr4lyf Jul 6, 2023
e667a87
Fix content type
ckcr4lyf Jul 6, 2023
f38be45
Correctly pass body to fetch
ckcr4lyf Jul 6, 2023
df41cd2
Skip message type 21
ckcr4lyf Jul 6, 2023
06fc391
Lint fix & rebuild
ckcr4lyf Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions deleteDiscordMessages.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@

// we can only delete some types of messages, system messages are not deletable.
let messagesToDelete = discoveredMessages;
messagesToDelete = messagesToDelete.filter(msg => msg.type === 0 || (msg.type >= 6 && msg.type <= 21));
messagesToDelete = messagesToDelete.filter(msg => msg.type === 0 || (msg.type >= 6 && msg.type <= 20));
messagesToDelete = messagesToDelete.filter(msg => msg.pinned ? this.options.includePinned : true);

// custom filter of messages
Expand Down Expand Up @@ -822,9 +822,17 @@

if (resp.status === 400 && r.code === 50083) {
// 400 can happen if the thread is archived (code=50083)
// we can try and unarchive the thread, if we unarchive successfully,
// we can retry the delete.
const unarchiveResult = await this.unarchiveThread(message.channel_id);
if (unarchiveResult === 'UNARCHIVE_SUCCESS'){
return 'RETRY';
}

// Failed to unarchive, so we cannot delete this message.
// in this case we need to "skip" this message from the next search
// otherwise it will come up again in the next page (and fail to delete again)
log.warn('Error deleting message (Thread is archived). Will increment offset so we don\'t search this in the next page...');
log.warn('Error deleting message (Thread is archived - failed to unarchive). Will increment offset so we don\'t search this in the next page...');
this.state.offset++;
this.state.failCount++;
return 'FAIL_SKIP'; // Failed but we will skip it next time
Expand All @@ -844,6 +852,53 @@
return 'OK';
}

async unarchiveThread(threadId){
const THREAD_UNARCHIVE_URL = `https://discord.com/api/v9/channels/${threadId}`;
let resp;
try {
this.beforeRequest();
resp = await fetch(THREAD_UNARCHIVE_URL, {
body: JSON.stringify({
archived: false
}),
method: 'PATCH',
headers: {
'Content-Type': 'application/json',
'Authorization': this.options.authToken,
},
});
this.afterRequest();
} catch (err) {
// no response error (e.g. network error)
log.error('Unarchive request throwed an error:', err);
return 'UNARCHIVE_FAILED';
}

if(!resp.ok){
const body = await resp.text();

try {
const r = JSON.parse(body);

if (resp.status === 403 && r.code === 160005){
// 403 happens if the thread is locked, i.e. we don't have permission
// to unarchive it
log.warn('Error unarchiving thread: Thread is locked');
return 'THREAD_LOCKED';
}

log.error(`Error unarchiving thread. API responded with status ${resp.status}!`, r);
} catch (e){
log.error(`Failed to parse JSON. API responses with status ${resp.status}!`, body);
}

return 'UNARCHIVE_FAILED';
}

log.info('Unarchived thread successfully!');
return 'UNARCHIVE_SUCCESS';
}

#beforeTs = 0; // used to calculate latency
beforeRequest() {
this.#beforeTs = Date.now();
Expand Down
59 changes: 57 additions & 2 deletions src/undiscord-core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ class UndiscordCore {

// we can only delete some types of messages, system messages are not deletable.
let messagesToDelete = discoveredMessages;
messagesToDelete = messagesToDelete.filter(msg => msg.type === 0 || (msg.type >= 6 && msg.type <= 21));
messagesToDelete = messagesToDelete.filter(msg => msg.type === 0 || (msg.type >= 6 && msg.type <= 20));
messagesToDelete = messagesToDelete.filter(msg => msg.pinned ? this.options.includePinned : true);

// custom filter of messages
Expand Down Expand Up @@ -404,9 +404,17 @@ class UndiscordCore {

if (resp.status === 400 && r.code === 50083) {
// 400 can happen if the thread is archived (code=50083)
// we can try and unarchive the thread, if we unarchive successfully,
// we can retry the delete.
const unarchiveResult = await this.unarchiveThread(message.channel_id);
if (unarchiveResult === 'UNARCHIVE_SUCCESS'){
return 'RETRY';
}

// Failed to unarchive, so we cannot delete this message.
// in this case we need to "skip" this message from the next search
// otherwise it will come up again in the next page (and fail to delete again)
log.warn('Error deleting message (Thread is archived). Will increment offset so we don\'t search this in the next page...');
log.warn('Error deleting message (Thread is archived - failed to unarchive). Will increment offset so we don\'t search this in the next page...');
this.state.offset++;
this.state.failCount++;
return 'FAIL_SKIP'; // Failed but we will skip it next time
Expand All @@ -426,6 +434,53 @@ class UndiscordCore {
return 'OK';
}

async unarchiveThread(threadId){
const THREAD_UNARCHIVE_URL = `https://discord.com/api/v9/channels/${threadId}`;
let resp;
try {
this.beforeRequest();
resp = await fetch(THREAD_UNARCHIVE_URL, {
body: JSON.stringify({
archived: false
}),
method: 'PATCH',
headers: {
'Content-Type': 'application/json',
'Authorization': this.options.authToken,
},
});
this.afterRequest();
} catch (err) {
// no response error (e.g. network error)
log.error('Unarchive request throwed an error:', err);
return 'UNARCHIVE_FAILED';
}

if(!resp.ok){
const body = await resp.text();

try {
const r = JSON.parse(body);

if (resp.status === 403 && r.code === 160005){
// 403 happens if the thread is locked, i.e. we don't have permission
// to unarchive it
log.warn('Error unarchiving thread: Thread is locked');
return 'THREAD_LOCKED';
}

log.error(`Error unarchiving thread. API responded with status ${resp.status}!`, r);
} catch (e){
log.error(`Failed to parse JSON. API responses with status ${resp.status}!`, body);
}

return 'UNARCHIVE_FAILED';
}

log.info('Unarchived thread successfully!');
return 'UNARCHIVE_SUCCESS';
}

#beforeTs = 0; // used to calculate latency
beforeRequest() {
this.#beforeTs = Date.now();
Expand Down