StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make !clean ignore pins by default, explicit -delete-pins/-p option to delete them (#121)

Browse source
This commit is contained in:
Nils 2020-12-12 21:23:53 +01:00 • committed by GitHub
parent c38bb99e93
commit 160bd4356e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/src/plugins/Utility/commands/CleanCmd.ts
View file

@ -61,6 +61,7 @@ export const CleanCmd = utilityCmd({
user: ct.userId({ option: true, shortcut: "u" }), user: ct.userId({ option: true, shortcut: "u" }),
channel: ct.channelId({ option: true, shortcut: "c" }), channel: ct.channelId({ option: true, shortcut: "c" }),
bots: ct.switchOption({ shortcut: "b" }), bots: ct.switchOption({ shortcut: "b" }),
"delete-pins": ct.switchOption({ shortcut: "p" }),
"has-invites": ct.switchOption({ shortcut: "i" }), "has-invites": ct.switchOption({ shortcut: "i" }),
match: ct.regex({ option: true, shortcut: "m" }), match: ct.regex({ option: true, shortcut: "m" }),
}, },
@ -96,6 +97,12 @@ export const CleanCmd = utilityCmd({
let beforeId = msg.id; let beforeId = msg.id;
const timeCutoff = msg.timestamp - MAX_CLEAN_TIME; const timeCutoff = msg.timestamp - MAX_CLEAN_TIME;
const deletePins = args["delete-pins"] != null ? args["delete-pins"] : false;
let pins = [];
if (!deletePins) {
pins = await msg.channel.getPins();
}
while (messagesToClean.length < args.count) { while (messagesToClean.length < args.count) {
const potentialMessagesToClean = await pluginData.state.savedMessages.getLatestByChannelBeforeId( const potentialMessagesToClean = await pluginData.state.savedMessages.getLatestByChannelBeforeId(
targetChannel.id, targetChannel.id,
@ -109,6 +116,7 @@ export const CleanCmd = utilityCmd({
const contentString = message.data.content || ""; const contentString = message.data.content || "";
if (args.user && message.user_id !== args.user) continue; if (args.user && message.user_id !== args.user) continue;
if (args.bots && !message.is_bot) continue; if (args.bots && !message.is_bot) continue;
if (!deletePins && pins.find(x => x.id === message.id) != null) continue;
if (args["has-invites"] && getInviteCodesInString(contentString).length === 0) continue; if (args["has-invites"] && getInviteCodesInString(contentString).length === 0) continue;
if (moment.utc(message.posted_at).valueOf() < timeCutoff) continue; if (moment.utc(message.posted_at).valueOf() < timeCutoff) continue;
if (args.match && !(await pluginData.state.regexRunner.exec(args.match, contentString).catch(allowTimeout))) { if (args.match && !(await pluginData.state.regexRunner.exec(args.match, contentString).catch(allowTimeout))) {