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

Hnnhwng master #38

Merged
merged 3 commits into from
Jan 9, 2020
Merged

Hnnhwng master #38

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4ee6f0
allow channels marked nsfw to be searched
hnnhwng Jan 2, 2020
fbd041a
Merge branch 'master' of https://github.com/hnnhwng/deleteDiscordMess…
victornpb Jan 9, 2020
079b660
added option to search for messages in nsfw channels
victornpb Jan 9, 2020
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
16 changes: 10 additions & 6 deletions deleteDiscordMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@
<button id="getToken">Get</button>
<br><input type="password" id="authToken" placeholder="Auth Token" autofocus>*</span>
<span>Author <a href="https://github.com/victornpb/deleteDiscordMessages/blob/master/help/authorId.md" title="Help">?</a>
<button id="getAuthor">Me</button><br><input id="authorId" type="text" placeholder="Author ID" priv>*</span>
<button id="getAuthor">Me</button><br><input id="authorId" type="text" placeholder="Author ID" priv></span>
<span>Guild/Channel <a href="https://github.com/victornpb/deleteDiscordMessages/blob/master/help/channelId.md" title="Help">?</a>
<button id="getGuildAndChannel">Get</button><br>
<input id="guildId" type="text" placeholder="Guild ID" priv>*<br>
<input id="channelId" type="text" placeholder="Channel ID" priv>*</span><br>
<input id="guildId" type="text" placeholder="Guild ID" priv><br>
<input id="channelId" type="text" placeholder="Channel ID" priv></span><br>
<span>Range <a href="https://github.com/victornpb/deleteDiscordMessages/blob/master/help/messageId.md" title="Help">?</a><br>
<input id="afterMessageId" type="text" placeholder="After messageId" priv><br>
<input id="beforeMessageId" type="text" placeholder="Before messageId" priv>
</span>
<span>Filter <a href="https://github.com/victornpb/deleteDiscordMessages/blob/master/help/filters.md" title="Help">?</a><br>
<label><input id="hasLink" type="checkbox">has: link</label><br>
<label><input id="hasFile" type="checkbox">has: file</label>
<label><input id="hasFile" type="checkbox">has: file</label><br>
<label><input id="includeNsfw" type="checkbox">Include NSFW</label>
</span>
</div>
<button id="start" style="background:#43b581;width:80px;">Start</button>
Expand All @@ -57,8 +58,9 @@
const beforeMessageId = popup.document.querySelector('input#beforeMessageId').value.trim();
const hasLink = popup.document.querySelector('input#hasLink').checked;
const hasFile = popup.document.querySelector('input#hasFile').checked;
const includeNsfw = popup.document.querySelector('input#includeNsfw').checked;
stop = stopBtn.disabled = !(startBtn.disabled = true);
deleteMessages(authToken, authorId, guildId, channelId, afterMessageId, beforeMessageId, hasLink, hasFile, logger, () => !(stop === true || popup.closed)).then(() => {
deleteMessages(authToken, authorId, guildId, channelId, afterMessageId, beforeMessageId, hasLink, hasFile, includeNsfw, logger, () => !(stop === true || popup.closed)).then(() => {
stop = stopBtn.disabled = !(startBtn.disabled = false);
});
};
Expand Down Expand Up @@ -98,12 +100,13 @@
* @param {string} beforeMessageId Only delete messages before this, leave blank do delete all
* @param {boolean} hasLink Filter messages that contains link
* @param {boolean} hasFile Filter messages that contains file
* @param {boolean} includeNsfw Search in NSFW channels
* @param {function(string, Array)} extLogger Function for logging
* @param {function} stopHndl stopHndl used for stopping
* @author Victornpb <https://www.github.com/victornpb>
* @see https://github.com/victornpb/deleteDiscordMessages
*/
async function deleteMessages(authToken, authorId, guildId, channelId, afterMessageId, beforeMessageId, hasLink, hasFile, extLogger, stopHndl) {
async function deleteMessages(authToken, authorId, guildId, channelId, afterMessageId, beforeMessageId, hasLink, hasFile, includeNsfw, extLogger, stopHndl) {
const start = new Date();
let deleteDelay = 100;
let searchDelay = 100;
Expand Down Expand Up @@ -160,6 +163,7 @@
[ 'sort_by', 'timestamp' ],
[ 'sort_order', 'desc' ],
[ 'offset', offset ],
[ 'include_nsfw', includeNsfw ? true : undefined ],
[ 'has', hasLink ? 'link' : undefined ],
[ 'has', hasFile ? 'file' : undefined ],
]), { headers });
Expand Down