StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-21 00:35:02 +00:00
Code Releases Activity

Merge branch 'master' into fix_automodBanDuration

Browse source
This commit is contained in:
Dark 2021-04-28 21:26:33 +02:00
commit b3f5011f5d
No known key found for this signature in database
GPG key ID: 384C4B4F5B1E25A8
31 changed files with 346 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/plugins/ModActions/commands/BanCmd.ts
View file

@ -66,8 +66,8 @@ export const BanCmd = modActionsCmd({
const lock = await pluginData.locks.acquire(banLock(user));
let forceban = false;
const existingTempban = await pluginData.state.tempbans.findExistingTempbanForUserId(user.id);
const banned = await isBanned(pluginData, user.id);
if (!memberToBan) {
const banned = await isBanned(pluginData, user.id);
if (banned) {
// Abort if trying to ban user indefinitely if they are already banned indefinitely
if (!existingTempban && !time) {