StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-15 05:41:51 +00:00
Code Releases Activity

automod: ensure actions only apply once per user/member

Browse source
This commit is contained in:
Dragory 2020-07-29 22:58:14 +03:00
parent e55a1e3bd6
commit c39d69dd5d
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
9 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
import * as t from "io-ts"; import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { asyncMap, resolveMember, tNullable } from "../../../utils"; import { asyncMap, resolveMember, tNullable, unique } from "../../../utils";
import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
@ -9,11 +9,10 @@ export const AddRolesAction = automodAction({
configType: t.array(t.string), configType: t.array(t.string),
async apply({ pluginData, contexts, actionConfig }) { async apply({ pluginData, contexts, actionConfig }) {
const members = contexts.map(c => c.member).filter(Boolean); const members = unique(contexts.map(c => c.member).filter(Boolean));
const uniqueMembers = new Set(members);
await Promise.all( await Promise.all(
Array.from(uniqueMembers.values()).map(async member => { members.map(async member => {
const memberRoles = new Set(member.roles); const memberRoles = new Set(member.roles);
for (const roleId of actionConfig) { for (const roleId of actionConfig) {
memberRoles.add(roleId); memberRoles.add(roleId);

4
backend/src/plugins/Automod/actions/ban.ts
View file

@ -1,7 +1,7 @@
import * as t from "io-ts"; import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { asyncMap, resolveMember, tNullable } from "../../../utils"; import { asyncMap, resolveMember, tNullable, unique } from "../../../utils";
import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
@ -25,7 +25,7 @@ export const BanAction = automodAction({
], ],
}; };
const userIdsToBan = contexts.map(c => c.user?.id).filter(Boolean); const userIdsToBan = unique(contexts.map(c => c.user?.id).filter(Boolean));
const modActions = pluginData.getPlugin(ModActionsPlugin); const modActions = pluginData.getPlugin(ModActionsPlugin);
for (const userId of userIdsToBan) { for (const userId of userIdsToBan) {

6
backend/src/plugins/Automod/actions/changeNickname.ts
View file

@ -2,6 +2,7 @@ import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { LogsPlugin } from "../../Logs/LogsPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin";
import { unique } from "../../../utils";
export const ChangeNicknameAction = automodAction({ export const ChangeNicknameAction = automodAction({
configType: t.type({ configType: t.type({
@ -9,10 +10,9 @@ export const ChangeNicknameAction = automodAction({
}), }),
async apply({ pluginData, contexts, actionConfig }) { async apply({ pluginData, contexts, actionConfig }) {
const members = contexts.map(c => c.member).filter(Boolean); const members = unique(contexts.map(c => c.member).filter(Boolean));
const uniqueMembers = new Set(members);
for (const member of uniqueMembers) { for (const member of members) {
if (pluginData.state.recentNicknameChanges.has(member.id)) continue; if (pluginData.state.recentNicknameChanges.has(member.id)) continue;
member.edit({ nick: actionConfig.name }).catch(err => { member.edit({ nick: actionConfig.name }).catch(err => {

4
backend/src/plugins/Automod/actions/kick.ts
View file

@ -1,7 +1,7 @@
import * as t from "io-ts"; import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { asyncMap, resolveMember, tNullable } from "../../../utils"; import { asyncMap, resolveMember, tNullable, unique } from "../../../utils";
import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
@ -23,7 +23,7 @@ export const KickAction = automodAction({
], ],
}; };
const userIdsToKick = contexts.map(c => c.user?.id).filter(Boolean); const userIdsToKick = unique(contexts.map(c => c.user?.id).filter(Boolean));
const membersToKick = await asyncMap(userIdsToKick, id => resolveMember(pluginData.client, pluginData.guild, id)); const membersToKick = await asyncMap(userIdsToKick, id => resolveMember(pluginData.client, pluginData.guild, id));
const modActions = pluginData.getPlugin(ModActionsPlugin); const modActions = pluginData.getPlugin(ModActionsPlugin);

4
backend/src/plugins/Automod/actions/mute.ts
View file

@ -1,7 +1,7 @@
import * as t from "io-ts"; import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { asyncMap, convertDelayStringToMS, resolveMember, tDelayString, tNullable } from "../../../utils"; import { asyncMap, convertDelayStringToMS, resolveMember, tDelayString, tNullable, unique } from "../../../utils";
import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
import { MutesPlugin } from "../../Mutes/MutesPlugin"; import { MutesPlugin } from "../../Mutes/MutesPlugin";
@ -26,7 +26,7 @@ export const MuteAction = automodAction({
], ],
}; };
const userIdsToMute = contexts.map(c => c.user?.id).filter(Boolean); const userIdsToMute = unique(contexts.map(c => c.user?.id).filter(Boolean));
const mutes = pluginData.getPlugin(MutesPlugin); const mutes = pluginData.getPlugin(MutesPlugin);
for (const userId of userIdsToMute) { for (const userId of userIdsToMute) {

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

@ -1,7 +1,7 @@
import * as t from "io-ts"; import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { asyncMap, resolveMember, tNullable } from "../../../utils"; import { asyncMap, resolveMember, tNullable, unique } from "../../../utils";
import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
@ -9,11 +9,10 @@ export const RemoveRolesAction = automodAction({
configType: t.array(t.string), configType: t.array(t.string),
async apply({ pluginData, contexts, actionConfig }) { async apply({ pluginData, contexts, actionConfig }) {
const members = contexts.map(c => c.member).filter(Boolean); const members = unique(contexts.map(c => c.member).filter(Boolean));
const uniqueMembers = new Set(members);
await Promise.all( await Promise.all(
Array.from(uniqueMembers.values()).map(async member => { members.map(async member => {
const memberRoles = new Set(member.roles); const memberRoles = new Set(member.roles);
for (const roleId of actionConfig) { for (const roleId of actionConfig) {
memberRoles.delete(roleId); memberRoles.delete(roleId);

3
backend/src/plugins/Automod/actions/reply.ts
View file

@ -8,6 +8,7 @@ import {
tDelayString, tDelayString,
tMessageContent, tMessageContent,
tNullable, tNullable,
unique,
} from "../../../utils"; } from "../../../utils";
import { TextChannel } from "eris"; import { TextChannel } from "eris";
import { AutomodContext } from "../types"; import { AutomodContext } from "../types";
@ -37,7 +38,7 @@ export const ReplyAction = automodAction({
}, new Map()); }, new Map());
for (const [channelId, _contexts] of contextsByChannelId.entries()) { for (const [channelId, _contexts] of contextsByChannelId.entries()) {
const users = Array.from(new Set(_contexts.map(c => c.user).filter(Boolean))); const users = unique(Array.from(new Set(_contexts.map(c => c.user).filter(Boolean))));
const user = users[0]; const user = users[0];
const renderReplyText = async str => const renderReplyText = async str =>

4
backend/src/plugins/Automod/actions/warn.ts
View file

@ -1,7 +1,7 @@
import * as t from "io-ts"; import * as t from "io-ts";
import { automodAction } from "../helpers"; import { automodAction } from "../helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { asyncMap, resolveMember, tNullable } from "../../../utils"; import { asyncMap, resolveMember, tNullable, unique } from "../../../utils";
import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods";
import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin";
@ -23,7 +23,7 @@ export const WarnAction = automodAction({
], ],
}; };
const userIdsToWarn = contexts.map(c => c.user?.id).filter(Boolean); const userIdsToWarn = unique(contexts.map(c => c.user?.id).filter(Boolean));
const membersToWarn = await asyncMap(userIdsToWarn, id => resolveMember(pluginData.client, pluginData.guild, id)); const membersToWarn = await asyncMap(userIdsToWarn, id => resolveMember(pluginData.client, pluginData.guild, id));
const modActions = pluginData.getPlugin(ModActionsPlugin); const modActions = pluginData.getPlugin(ModActionsPlugin);

10
backend/src/utils.ts
View file

@ -423,9 +423,11 @@ interface MatchedURL extends url.URL {
input: string; input: string;
} }
export function getUrlsInString(str: string, unique = false): MatchedURL[] { export function getUrlsInString(str: string, onlyUnique = false): MatchedURL[] {
let matches = str.match(urlRegex) || []; let matches = str.match(urlRegex) || [];
if (unique) matches = Array.from(new Set(matches)); if (onlyUnique) {
matches = unique(matches);
}
return matches.reduce((urls, match) => { return matches.reduce((urls, match) => {
const withProtocol = protocolRegex.test(match) ? match : `https://${match}`; const withProtocol = protocolRegex.test(match) ? match : `https://${match}`;
@ -1230,3 +1232,7 @@ export function isGuildInvite(invite: AnyInvite): invite is GuildInvite {
export function asyncMap<T, R>(arr: T[], fn: (item: T) => Promise<R>): Promise<R[]> { export function asyncMap<T, R>(arr: T[], fn: (item: T) => Promise<R>): Promise<R[]> {
return Promise.all(arr.map((item, index) => fn(item))); return Promise.all(arr.map((item, index) => fn(item)));
} }
export function unique<T>(arr: T[]): T[] {
return Array.from(new Set(arr));
}