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

Merge branch 'master' of github.com:Dragory/ZeppelinBot

Browse source
This commit is contained in:
Dragory 2021-04-02 18:00:27 +03:00
commit ab51231fef
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
38 changed files with 135 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/plugins/Automod/actions/addRoles.ts
View file

@ -9,6 +9,7 @@ import { getMissingPermissions } from "../../../utils/getMissingPermissions";
import { canAssignRole } from "../../../utils/canAssignRole";
import { missingPermissionError } from "../../../utils/missingPermissionError";
import { ignoreRoleChange } from "../functions/ignoredRoleChanges";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
const p = Constants.Permissions;
@ -64,7 +65,7 @@ export const AddRolesAction = automodAction({
return;
}
const memberRolesLock = await pluginData.locks.acquire(`member-roles-${member.id}`);
const memberRoleLock = await pluginData.locks.acquire(memberRolesLock(member));
const rolesArr = Array.from(memberRoles.values());
await member.edit({
@ -72,7 +73,7 @@ export const AddRolesAction = automodAction({
});
member.roles = rolesArr; // Make sure we know of the new roles internally as well
memberRolesLock.unlock();
memberRoleLock.unlock();
}),
);
},

5
backend/src/plugins/Automod/actions/removeRoles.ts
View file

@ -10,6 +10,7 @@ import { missingPermissionError } from "../../../utils/missingPermissionError";
import { canAssignRole } from "../../../utils/canAssignRole";
import { Constants } from "eris";
import { ignoreRoleChange } from "../functions/ignoredRoleChanges";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
const p = Constants.Permissions;
@ -66,7 +67,7 @@ export const RemoveRolesAction = automodAction({
return;
}
const memberRolesLock = await pluginData.locks.acquire(`member-roles-${member.id}`);
const memberRoleLock = await pluginData.locks.acquire(memberRolesLock(member));
const rolesArr = Array.from(memberRoles.values());
await member.edit({
@ -74,7 +75,7 @@ export const RemoveRolesAction = automodAction({
});
member.roles = rolesArr; // Make sure we know of the new roles internally as well
memberRolesLock.unlock();
memberRoleLock.unlock();
}),
);
},