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

Finish preliminary rework, ready to test

Browse source
This commit is contained in:
Dark 2021-06-02 04:07:50 +02:00
parent 57893e7f76
commit d0a1beb809
No known key found for this signature in database
GPG key ID: 2CD6ACB6B0A87B8A
177 changed files with 854 additions and 707 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,13 +53,13 @@ export const AddRolesAction = automodAction({
await Promise.all(
members.map(async member => {
const memberRoles = new Set(member.roles);
const memberRoles = new Set(member.roles.cache.keyArray());
for (const roleId of rolesToAssign) {
memberRoles.add(roleId);
ignoreRoleChange(pluginData, member.id, roleId);
}
if (memberRoles.size === member.roles.length) {
if (memberRoles.size === member.roles.cache.size) {
// No role changes
return;
}
@ -70,7 +70,6 @@ export const AddRolesAction = automodAction({
await member.edit({
roles: rolesArr,
});
member.roles = rolesArr; // Make sure we know of the new roles internally as well
memberRoleLock.unlock();
}),

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

@ -57,13 +57,13 @@ export const RemoveRolesAction = automodAction({
await Promise.all(
members.map(async member => {
const memberRoles = new Set(member.roles);
const memberRoles = new Set(member.roles.cache.keyArray());
for (const roleId of rolesToRemove) {
memberRoles.delete(roleId);
ignoreRoleChange(pluginData, member.id, roleId);
}
if (memberRoles.size === member.roles.length) {
if (memberRoles.size === member.roles.cache.size) {
// No role changes
return;
}
@ -74,7 +74,6 @@ export const RemoveRolesAction = automodAction({
await member.edit({
roles: rolesArr,
});
member.roles = rolesArr; // Make sure we know of the new roles internally as well
memberRoleLock.unlock();
}),

6
backend/src/plugins/Automod/functions/getTextMatchPartialSummary.ts
View file

@ -23,11 +23,11 @@ export function getTextMatchPartialSummary(
} else if (type === "username") {
return `username: ${context.user!.username}`;
} else if (type === "nickname") {
return `nickname: ${context.member!.nick}`;
return `nickname: ${context.member!.nickname}`;
} else if (type === "visiblename") {
const visibleName = context.member?.nick || context.user!.username;
const visibleName = context.member?.nickname || context.user!.username;
return `visible name: ${visibleName}`;
} else if (type === "customstatus") {
return `custom status: ${context.member!.game!.state}`;
return `custom status: ${context.member!.presence.activities.find(a => a.type === "CUSTOM_STATUS")?.name}`;
}
}

2
backend/src/plugins/Automod/triggers/memberJoin.ts
View file

@ -20,7 +20,7 @@ export const MemberJoinTrigger = automodTrigger<unknown>()({
if (triggerConfig.only_new) {
const threshold = Date.now() - convertDelayStringToMS(triggerConfig.new_threshold)!;
return context.member.createdAt >= threshold ? {} : null;
return context.member.user.createdTimestamp >= threshold ? {} : null;
}
return {};