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

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

View file

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

View file

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

View file

@ -2,10 +2,11 @@ import { GuildPluginData } from "knub";
import { CensorPluginType } from "../types"; import { CensorPluginType } from "../types";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { applyFiltersToMsg } from "./applyFiltersToMsg"; import { applyFiltersToMsg } from "./applyFiltersToMsg";
import { messageLock } from "../../../utils/lockNameHelpers";
export async function onMessageCreate(pluginData: GuildPluginData<CensorPluginType>, savedMessage: SavedMessage) { export async function onMessageCreate(pluginData: GuildPluginData<CensorPluginType>, savedMessage: SavedMessage) {
if (savedMessage.is_bot) return; if (savedMessage.is_bot) return;
const lock = await pluginData.locks.acquire(`message-${savedMessage.id}`); const lock = await pluginData.locks.acquire(messageLock(savedMessage));
const wasDeleted = await applyFiltersToMsg(pluginData, savedMessage); const wasDeleted = await applyFiltersToMsg(pluginData, savedMessage);

View file

@ -2,10 +2,11 @@ import { GuildPluginData } from "knub";
import { CensorPluginType } from "../types"; import { CensorPluginType } from "../types";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { applyFiltersToMsg } from "./applyFiltersToMsg"; import { applyFiltersToMsg } from "./applyFiltersToMsg";
import { messageLock } from "../../../utils/lockNameHelpers";
export async function onMessageUpdate(pluginData: GuildPluginData<CensorPluginType>, savedMessage: SavedMessage) { export async function onMessageUpdate(pluginData: GuildPluginData<CensorPluginType>, savedMessage: SavedMessage) {
if (savedMessage.is_bot) return; if (savedMessage.is_bot) return;
const lock = await pluginData.locks.acquire(`message-${savedMessage.id}`); const lock = await pluginData.locks.acquire(messageLock(savedMessage));
const wasDeleted = await applyFiltersToMsg(pluginData, savedMessage); const wasDeleted = await applyFiltersToMsg(pluginData, savedMessage);

View file

@ -1,4 +1,5 @@
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { counterIdLock } from "../../../utils/lockNameHelpers";
import { CountersPluginType } from "../types"; import { CountersPluginType } from "../types";
import { checkCounterTrigger } from "./checkCounterTrigger"; import { checkCounterTrigger } from "./checkCounterTrigger";
import { checkReverseCounterTrigger } from "./checkReverseCounterTrigger"; import { checkReverseCounterTrigger } from "./checkReverseCounterTrigger";
@ -28,7 +29,7 @@ export async function changeCounterValue(
userId = counter.per_user ? userId : null; userId = counter.per_user ? userId : null;
const counterId = pluginData.state.counterIds[counterName]; const counterId = pluginData.state.counterIds[counterName];
const lock = await pluginData.locks.acquire(counterId.toString()); const lock = await pluginData.locks.acquire(counterIdLock(counterId));
await pluginData.state.counters.changeCounterValue(counterId, channelId, userId, change); await pluginData.state.counters.changeCounterValue(counterId, channelId, userId, change);

View file

@ -2,6 +2,7 @@ import { GuildPluginData } from "knub";
import { CountersPluginType } from "../types"; import { CountersPluginType } from "../types";
import { checkAllValuesForTrigger } from "./checkAllValuesForTrigger"; import { checkAllValuesForTrigger } from "./checkAllValuesForTrigger";
import { checkAllValuesForReverseTrigger } from "./checkAllValuesForReverseTrigger"; import { checkAllValuesForReverseTrigger } from "./checkAllValuesForReverseTrigger";
import { counterIdLock } from "../../../utils/lockNameHelpers";
export async function decayCounter( export async function decayCounter(
pluginData: GuildPluginData<CountersPluginType>, pluginData: GuildPluginData<CountersPluginType>,
@ -16,7 +17,7 @@ export async function decayCounter(
} }
const counterId = pluginData.state.counterIds[counterName]; const counterId = pluginData.state.counterIds[counterName];
const lock = await pluginData.locks.acquire(counterId.toString()); const lock = await pluginData.locks.acquire(counterIdLock(counterId));
await pluginData.state.counters.decay(counterId, decayPeriodMS, decayAmount); await pluginData.state.counters.decay(counterId, decayPeriodMS, decayAmount);

View file

@ -1,4 +1,5 @@
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { counterIdLock } from "../../../utils/lockNameHelpers";
import { CountersPluginType } from "../types"; import { CountersPluginType } from "../types";
import { checkCounterTrigger } from "./checkCounterTrigger"; import { checkCounterTrigger } from "./checkCounterTrigger";
import { checkReverseCounterTrigger } from "./checkReverseCounterTrigger"; import { checkReverseCounterTrigger } from "./checkReverseCounterTrigger";
@ -25,7 +26,7 @@ export async function setCounterValue(
} }
const counterId = pluginData.state.counterIds[counterName]; const counterId = pluginData.state.counterIds[counterName];
const lock = await pluginData.locks.acquire(counterId.toString()); const lock = await pluginData.locks.acquire(counterIdLock(counterId));
await pluginData.state.counters.setCounterValue(counterId, channelId, userId, value); await pluginData.state.counters.setCounterValue(counterId, channelId, userId, value);

View file

@ -45,7 +45,7 @@ export const AddCaseCmd = modActionsCmd({
let mod = msg.member; let mod = msg.member;
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }

View file

@ -8,9 +8,10 @@ import { formatReasonWithAttachments } from "../functions/formatReasonWithAttach
import { banUserId } from "../functions/banUserId"; import { banUserId } from "../functions/banUserId";
import { getMemberLevel, waitForReaction } from "knub/dist/helpers"; import { getMemberLevel, waitForReaction } from "knub/dist/helpers";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { CasesPlugin } from "src/plugins/Cases/CasesPlugin"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
import { CaseTypes } from "src/data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "src/data/LogType"; import { LogType } from "../../../data/LogType";
import { banLock } from "../../../utils/lockNameHelpers";
const opts = { const opts = {
mod: ct.member({ option: true }), mod: ct.member({ option: true }),
@ -54,7 +55,7 @@ export const BanCmd = modActionsCmd({
let mod = msg.member; let mod = msg.member;
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id })) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }
@ -62,7 +63,7 @@ export const BanCmd = modActionsCmd({
} }
// acquire a lock because of the needed user-inputs below (if banned/not on server) // acquire a lock because of the needed user-inputs below (if banned/not on server)
const lock = await pluginData.locks.acquire(`ban-${user.id}`); const lock = await pluginData.locks.acquire(banLock(user));
let forceban = false; let forceban = false;
const existingTempban = await pluginData.state.tempbans.findExistingTempbanForUserId(user.id); const existingTempban = await pluginData.state.tempbans.findExistingTempbanForUserId(user.id);
const banned = await isBanned(pluginData, user.id); const banned = await isBanned(pluginData, user.id);

View file

@ -54,7 +54,7 @@ export const ForcebanCmd = modActionsCmd({
let mod = msg.member; let mod = msg.member;
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }

View file

@ -6,7 +6,7 @@ import { formatReasonWithAttachments } from "../functions/formatReasonWithAttach
import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CasesPlugin } from "../../Cases/CasesPlugin";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { errorMessage, resolveMember, resolveUser, stripObjectToScalars } from "../../../utils"; import { errorMessage, noop, resolveMember, resolveUser, stripObjectToScalars } from "../../../utils";
import { isBanned } from "../functions/isBanned"; import { isBanned } from "../functions/isBanned";
import { waitForReaction } from "knub/dist/helpers"; import { waitForReaction } from "knub/dist/helpers";
import { readContactMethodsFromArgs } from "../functions/readContactMethodsFromArgs"; import { readContactMethodsFromArgs } from "../functions/readContactMethodsFromArgs";
@ -59,15 +59,18 @@ export const MuteCmd = modActionsCmd({
msg.channel, msg.channel,
`User is banned. Use \`${prefix}forcemute\` if you want to mute them anyway.`, `User is banned. Use \`${prefix}forcemute\` if you want to mute them anyway.`,
); );
return;
} else { } else {
sendErrorMessage( // Ask the mod if we should upgrade to a forcemute as the user is not on the server
pluginData, const notOnServerMsg = await msg.channel.createMessage("User not found on the server, forcemute instead?");
msg.channel, const reply = await waitForReaction(pluginData.client, notOnServerMsg, ["✅", "❌"], msg.author.id);
`User is not on the server. Use \`${prefix}forcemute\` if you want to mute them anyway.`,
);
}
return; notOnServerMsg.delete().catch(noop);
if (!reply || reply.name === "❌") {
sendErrorMessage(pluginData, msg.channel, "User not on server, mute cancelled by moderator");
return;
}
}
} }
// Make sure we're allowed to mute this member // Make sure we're allowed to mute this member

View file

@ -37,7 +37,7 @@ export const UnbanCmd = modActionsCmd({
let mod = msg.member; let mod = msg.member;
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id })) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }

View file

@ -1,10 +1,11 @@
import { modActionsCmd } from "../types"; import { modActionsCmd } from "../types";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { canActOn, sendErrorMessage } from "../../../pluginUtils"; import { canActOn, sendErrorMessage } from "../../../pluginUtils";
import { resolveUser, resolveMember } from "../../../utils"; import { resolveUser, resolveMember, noop } from "../../../utils";
import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin"; import { MutesPlugin } from "../../../plugins/Mutes/MutesPlugin";
import { actualUnmuteCmd } from "../functions/actualUnmuteUserCmd"; import { actualUnmuteCmd } from "../functions/actualUnmuteUserCmd";
import { isBanned } from "../functions/isBanned"; import { isBanned } from "../functions/isBanned";
import { waitForReaction } from "knub/dist/helpers";
const opts = { const opts = {
mod: ct.member({ option: true }), mod: ct.member({ option: true }),
@ -57,15 +58,18 @@ export const UnmuteCmd = modActionsCmd({
msg.channel, msg.channel,
`User is banned. Use \`${prefix}forceunmute\` to unmute them anyway.`, `User is banned. Use \`${prefix}forceunmute\` to unmute them anyway.`,
); );
return;
} else { } else {
sendErrorMessage( // Ask the mod if we should upgrade to a forceunmute as the user is not on the server
pluginData, const notOnServerMsg = await msg.channel.createMessage("User not found on the server, forceunmute instead?");
msg.channel, const reply = await waitForReaction(pluginData.client, notOnServerMsg, ["✅", "❌"], msg.author.id);
`User is not on the server. Use \`${prefix}forceunmute\` to unmute them anyway.`,
);
}
return; notOnServerMsg.delete().catch(noop);
if (!reply || reply.name === "❌") {
sendErrorMessage(pluginData, msg.channel, "User not on server, unmute cancelled by moderator");
return;
}
}
} }
// Make sure we're allowed to unmute this member // Make sure we're allowed to unmute this member

View file

@ -8,7 +8,7 @@ import { LogType } from "../../../data/LogType";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
export const UpdateCmd = modActionsCmd({ export const UpdateCmd = modActionsCmd({
trigger: "update", trigger: ["update", "reason"],
permission: "can_note", permission: "can_note",
description: description:
"Update the specified case (or, if case number is omitted, your latest case) by adding more notes/details to it", "Update the specified case (or, if case number is omitted, your latest case) by adding more notes/details to it",

View file

@ -57,7 +57,7 @@ export const WarnCmd = modActionsCmd({
let mod = msg.member; let mod = msg.member;
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) {
msg.channel.createMessage(errorMessage("No permission for -mod")); msg.channel.createMessage(errorMessage("You don't have permission to use -mod"));
return; return;
} }

View file

@ -52,7 +52,7 @@ export async function actualKickMemberCmd(
let mod = msg.member; let mod = msg.member;
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData.config.getForMessage(msg), "can_act_as_other")) { if (!hasPermission(pluginData.config.getForMessage(msg), "can_act_as_other")) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }

View file

@ -28,7 +28,7 @@ export async function actualMuteUserCmd(
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg })) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }

View file

@ -19,7 +19,7 @@ export async function actualUnmuteCmd(
if (args.mod) { if (args.mod) {
if (!hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id })) { if (!hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id })) {
sendErrorMessage(pluginData, msg.channel, "No permission for -mod"); sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
return; return;
} }

View file

@ -25,6 +25,7 @@ const defaultOptions = {
config: { config: {
mute_role: null, mute_role: null,
move_to_voice_channel: null, move_to_voice_channel: null,
kick_from_voice_channel: false,
dm_on_mute: false, dm_on_mute: false,
dm_on_update: false, dm_on_update: false,

View file

@ -1,6 +1,7 @@
import { mutesEvt } from "../types"; import { mutesEvt } from "../types";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { stripObjectToScalars } from "../../../utils"; import { stripObjectToScalars } from "../../../utils";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
/** /**
* Reapply active mutes on join * Reapply active mutes on join
@ -11,9 +12,9 @@ export const ReapplyActiveMuteOnJoinEvt = mutesEvt("guildMemberAdd", async ({ pl
const muteRole = pluginData.config.get().mute_role; const muteRole = pluginData.config.get().mute_role;
if (muteRole) { if (muteRole) {
const memberRolesLock = await pluginData.locks.acquire(`member-roles-${member.id}`); const memberRoleLock = await pluginData.locks.acquire(memberRolesLock(member));
await member.addRole(muteRole); await member.addRole(muteRole);
memberRolesLock.unlock(); memberRoleLock.unlock();
} }
pluginData.state.serverLogs.log(LogType.MEMBER_MUTE_REJOIN, { pluginData.state.serverLogs.log(LogType.MEMBER_MUTE_REJOIN, {

View file

@ -17,8 +17,8 @@ import { CasesPlugin } from "../../Cases/CasesPlugin";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { sendErrorMessage } from "src/pluginUtils"; import { LogsPlugin } from "../../../plugins/Logs/LogsPlugin";
import { LogsPlugin } from "src/plugins/Logs/LogsPlugin"; import { muteLock } from "../../../utils/lockNameHelpers";
export async function muteUser( export async function muteUser(
pluginData: GuildPluginData<MutesPluginType>, pluginData: GuildPluginData<MutesPluginType>,
@ -29,7 +29,7 @@ export async function muteUser(
removeRolesOnMuteOverride: boolean | string[] | null = null, removeRolesOnMuteOverride: boolean | string[] | null = null,
restoreRolesOnMuteOverride: boolean | string[] | null = null, restoreRolesOnMuteOverride: boolean | string[] | null = null,
) { ) {
const lock = await pluginData.locks.acquire(`mute-${userId}`); const lock = await pluginData.locks.acquire(muteLock({ id: userId }));
const muteRole = pluginData.config.get().mute_role; const muteRole = pluginData.config.get().mute_role;
if (!muteRole) { if (!muteRole) {
@ -120,11 +120,12 @@ export async function muteUser(
} }
// If enabled, move the user to the mute voice channel (e.g. afk - just to apply the voice perms from the mute role) // If enabled, move the user to the mute voice channel (e.g. afk - just to apply the voice perms from the mute role)
const moveToVoiceChannelId = pluginData.config.get().move_to_voice_channel; const cfg = pluginData.config.get();
if (moveToVoiceChannelId) { const moveToVoiceChannel = cfg.kick_from_voice_channel ? null : cfg.move_to_voice_channel;
if (moveToVoiceChannel || cfg.kick_from_voice_channel) {
// TODO: Add back the voiceState check once we figure out how to get voice state for guild members that are loaded on-demand // TODO: Add back the voiceState check once we figure out how to get voice state for guild members that are loaded on-demand
try { try {
await member.edit({ channelID: moveToVoiceChannelId }); await member.edit({ channelID: moveToVoiceChannel });
} catch (e) {} // tslint:disable-line } catch (e) {} // tslint:disable-line
} }
} }

View file

@ -15,6 +15,7 @@ import { EventEmitter } from "events";
export const ConfigSchema = t.type({ export const ConfigSchema = t.type({
mute_role: tNullable(t.string), mute_role: tNullable(t.string),
move_to_voice_channel: tNullable(t.string), move_to_voice_channel: tNullable(t.string),
kick_from_voice_channel: t.boolean,
dm_on_mute: t.boolean, dm_on_mute: t.boolean,
dm_on_update: t.boolean, dm_on_update: t.boolean,

View file

@ -7,6 +7,7 @@ import { getMissingPermissions } from "../../../utils/getMissingPermissions";
import { LogsPlugin } from "../../Logs/LogsPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin";
import { missingPermissionError } from "../../../utils/missingPermissionError"; import { missingPermissionError } from "../../../utils/missingPermissionError";
import { canAssignRole } from "../../../utils/canAssignRole"; import { canAssignRole } from "../../../utils/canAssignRole";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
const p = Constants.Permissions; const p = Constants.Permissions;
@ -17,11 +18,11 @@ export const LoadDataEvt = persistEvt({
const member = meta.args.member; const member = meta.args.member;
const pluginData = meta.pluginData; const pluginData = meta.pluginData;
const memberRolesLock = await pluginData.locks.acquire(`member-roles-${member.id}`); const memberRoleLock = await pluginData.locks.acquire(memberRolesLock(member));
const persistedData = await pluginData.state.persistedData.find(member.id); const persistedData = await pluginData.state.persistedData.find(member.id);
if (!persistedData) { if (!persistedData) {
memberRolesLock.unlock(); memberRoleLock.unlock();
return; return;
} }
@ -79,6 +80,6 @@ export const LoadDataEvt = persistEvt({
}); });
} }
memberRolesLock.unlock(); memberRoleLock.unlock();
}, },
}); });

View file

@ -2,6 +2,7 @@ import { GuildPluginData } from "knub";
import { ReactionRolesPluginType, RoleChangeMode, PendingMemberRoleChanges } from "../types"; import { ReactionRolesPluginType, RoleChangeMode, PendingMemberRoleChanges } from "../types";
import { resolveMember } from "../../../utils"; import { resolveMember } from "../../../utils";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
const ROLE_CHANGE_BATCH_DEBOUNCE_TIME = 1500; const ROLE_CHANGE_BATCH_DEBOUNCE_TIME = 1500;
@ -18,7 +19,7 @@ export async function addMemberPendingRoleChange(
applyFn: async () => { applyFn: async () => {
pluginData.state.pendingRoleChanges.delete(memberId); pluginData.state.pendingRoleChanges.delete(memberId);
const lock = await pluginData.locks.acquire(`member-roles-${memberId}`); const lock = await pluginData.locks.acquire(memberRolesLock({ id: memberId }));
const member = await resolveMember(pluginData.client, pluginData.guild, memberId); const member = await resolveMember(pluginData.client, pluginData.guild, memberId);
if (member) { if (member) {

View file

@ -6,6 +6,7 @@ import { splitRoleNames } from "../util/splitRoleNames";
import { normalizeRoleNames } from "../util/normalizeRoleNames"; import { normalizeRoleNames } from "../util/normalizeRoleNames";
import { findMatchingRoles } from "../util/findMatchingRoles"; import { findMatchingRoles } from "../util/findMatchingRoles";
import { Role } from "eris"; import { Role } from "eris";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
export const RoleAddCmd = selfGrantableRolesCmd({ export const RoleAddCmd = selfGrantableRolesCmd({
trigger: ["role", "role add"], trigger: ["role", "role add"],
@ -16,7 +17,7 @@ export const RoleAddCmd = selfGrantableRolesCmd({
}, },
async run({ message: msg, args, pluginData }) { async run({ message: msg, args, pluginData }) {
const lock = await pluginData.locks.acquire(`grantableRoles:${msg.author.id}`); const lock = await pluginData.locks.acquire(memberRolesLock(msg.author));
const applyingEntries = getApplyingEntries(pluginData, msg); const applyingEntries = getApplyingEntries(pluginData, msg);
if (applyingEntries.length === 0) { if (applyingEntries.length === 0) {

View file

@ -5,6 +5,7 @@ import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { splitRoleNames } from "../util/splitRoleNames"; import { splitRoleNames } from "../util/splitRoleNames";
import { normalizeRoleNames } from "../util/normalizeRoleNames"; import { normalizeRoleNames } from "../util/normalizeRoleNames";
import { findMatchingRoles } from "../util/findMatchingRoles"; import { findMatchingRoles } from "../util/findMatchingRoles";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
export const RoleRemoveCmd = selfGrantableRolesCmd({ export const RoleRemoveCmd = selfGrantableRolesCmd({
trigger: "role remove", trigger: "role remove",
@ -15,7 +16,7 @@ export const RoleRemoveCmd = selfGrantableRolesCmd({
}, },
async run({ message: msg, args, pluginData }) { async run({ message: msg, args, pluginData }) {
const lock = await pluginData.locks.acquire(`grantableRoles:${msg.author.id}`); const lock = await pluginData.locks.acquire(memberRolesLock(msg.author));
const applyingEntries = getApplyingEntries(pluginData, msg); const applyingEntries = getApplyingEntries(pluginData, msg);
if (applyingEntries.length === 0) { if (applyingEntries.length === 0) {

View file

@ -10,6 +10,7 @@ import { BOT_SLOWMODE_PERMISSIONS } from "../requiredPermissions";
import { LogsPlugin } from "../../Logs/LogsPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { missingPermissionError } from "../../../utils/missingPermissionError"; import { missingPermissionError } from "../../../utils/missingPermissionError";
import { messageLock } from "../../../utils/lockNameHelpers";
export async function onMessageCreate(pluginData: GuildPluginData<SlowmodePluginType>, msg: SavedMessage) { export async function onMessageCreate(pluginData: GuildPluginData<SlowmodePluginType>, msg: SavedMessage) {
if (msg.is_bot) return; if (msg.is_bot) return;
@ -18,7 +19,7 @@ export async function onMessageCreate(pluginData: GuildPluginData<SlowmodePlugin
if (!channel) return; if (!channel) return;
// Don't apply slowmode if the lock was interrupted earlier (e.g. the message was caught by word filters) // Don't apply slowmode if the lock was interrupted earlier (e.g. the message was caught by word filters)
const thisMsgLock = await pluginData.locks.acquire(`message-${msg.id}`); const thisMsgLock = await pluginData.locks.acquire(messageLock(msg));
if (thisMsgLock.interrupted) return; if (thisMsgLock.interrupted) return;
// Check if this channel even *has* a bot-maintained slowmode // Check if this channel even *has* a bot-maintained slowmode

View file

@ -57,6 +57,19 @@ export const StarboardPlugin = zeppelinGuildPlugin<StarboardPluginType>()("starb
stars_required: 5 stars_required: 5
~~~ ~~~
### Basic starboard with custom color
Any message on the server that gets 5 star reactions will be posted into the starboard channel (604342689038729226), with the given color (0x87CEEB).
~~~yml
starboard:
config:
boards:
basic:
channel_id: "604342689038729226"
stars_required: 5
color: 0x87CEEB
~~~
### Custom star emoji ### Custom star emoji
This is identical to the basic starboard above, but accepts two emoji: the regular star and a custom :mrvnSmile: emoji This is identical to the basic starboard above, but accepts two emoji: the regular star and a custom :mrvnSmile: emoji

View file

@ -3,6 +3,7 @@ import { Message, TextChannel } from "eris";
import { UnknownUser, resolveMember, noop, resolveUser } from "../../../utils"; import { UnknownUser, resolveMember, noop, resolveUser } from "../../../utils";
import { saveMessageToStarboard } from "../util/saveMessageToStarboard"; import { saveMessageToStarboard } from "../util/saveMessageToStarboard";
import { updateStarboardMessageStarCount } from "../util/updateStarboardMessageStarCount"; import { updateStarboardMessageStarCount } from "../util/updateStarboardMessageStarCount";
import { allStarboardsLock } from "../../../utils/lockNameHelpers";
export const StarboardReactionAddEvt = starboardEvt({ export const StarboardReactionAddEvt = starboardEvt({
event: "messageReactionAdd", event: "messageReactionAdd",
@ -36,7 +37,7 @@ export const StarboardReactionAddEvt = starboardEvt({
categoryId: (msg.channel as TextChannel).parentID, categoryId: (msg.channel as TextChannel).parentID,
}); });
const boardLock = await pluginData.locks.acquire(`starboards`); const boardLock = await pluginData.locks.acquire(allStarboardsLock());
const applicableStarboards = Object.values(config.boards) const applicableStarboards = Object.values(config.boards)
.filter(board => board.enabled) .filter(board => board.enabled)

View file

@ -1,10 +1,11 @@
import { allStarboardsLock } from "../../../utils/lockNameHelpers";
import { starboardEvt } from "../types"; import { starboardEvt } from "../types";
export const StarboardReactionRemoveEvt = starboardEvt({ export const StarboardReactionRemoveEvt = starboardEvt({
event: "messageReactionRemove", event: "messageReactionRemove",
async listener(meta) { async listener(meta) {
const boardLock = await meta.pluginData.locks.acquire(`starboards`); const boardLock = await meta.pluginData.locks.acquire(allStarboardsLock());
await meta.pluginData.state.starboardReactions.deleteStarboardReaction(meta.args.message.id, meta.args.member.id); await meta.pluginData.state.starboardReactions.deleteStarboardReaction(meta.args.message.id, meta.args.member.id);
boardLock.unlock(); boardLock.unlock();
}, },
@ -14,7 +15,7 @@ export const StarboardReactionRemoveAllEvt = starboardEvt({
event: "messageReactionRemoveAll", event: "messageReactionRemoveAll",
async listener(meta) { async listener(meta) {
const boardLock = await meta.pluginData.locks.acquire(`starboards`); const boardLock = await meta.pluginData.locks.acquire(allStarboardsLock());
await meta.pluginData.state.starboardReactions.deleteAllStarboardReactionsForMessageId(meta.args.message.id); await meta.pluginData.state.starboardReactions.deleteAllStarboardReactionsForMessageId(meta.args.message.id);
boardLock.unlock(); boardLock.unlock();
}, },

View file

@ -12,6 +12,7 @@ const StarboardOpts = t.type({
copy_full_embed: tNullable(t.boolean), copy_full_embed: tNullable(t.boolean),
enabled: tNullable(t.boolean), enabled: tNullable(t.boolean),
show_star_count: t.boolean, show_star_count: t.boolean,
color: t.number,
}); });
export type TStarboardOpts = t.TypeOf<typeof StarboardOpts>; export type TStarboardOpts = t.TypeOf<typeof StarboardOpts>;
@ -27,6 +28,7 @@ export const defaultStarboardOpts: Partial<TStarboardOpts> = {
star_emoji: ["⭐"], star_emoji: ["⭐"],
enabled: true, enabled: true,
show_star_count: true, show_star_count: true,
color: 0,
}; };
export interface StarboardPluginType extends BasePluginType { export interface StarboardPluginType extends BasePluginType {

View file

@ -8,7 +8,7 @@ const videoAttachmentExtensions = ["mp4", "mkv", "mov"];
type StarboardEmbed = EmbedWith<"footer" | "author" | "fields" | "timestamp">; type StarboardEmbed = EmbedWith<"footer" | "author" | "fields" | "timestamp">;
export function createStarboardEmbedFromMessage(msg: Message, copyFullEmbed: boolean): StarboardEmbed { export function createStarboardEmbedFromMessage(msg: Message, copyFullEmbed: boolean, color: number): StarboardEmbed {
const embed: StarboardEmbed = { const embed: StarboardEmbed = {
footer: { footer: {
text: `#${(msg.channel as GuildChannel).name}`, text: `#${(msg.channel as GuildChannel).name}`,
@ -18,6 +18,7 @@ export function createStarboardEmbedFromMessage(msg: Message, copyFullEmbed: boo
}, },
fields: [], fields: [],
timestamp: new Date(msg.timestamp).toISOString(), timestamp: new Date(msg.timestamp).toISOString(),
color,
}; };
if (msg.author.avatarURL) { if (msg.author.avatarURL) {

View file

@ -16,7 +16,7 @@ export async function saveMessageToStarboard(
if (!channel) return; if (!channel) return;
const starCount = (await pluginData.state.starboardReactions.getAllReactionsForMessageId(msg.id)).length; const starCount = (await pluginData.state.starboardReactions.getAllReactionsForMessageId(msg.id)).length;
const embed = createStarboardEmbedFromMessage(msg, Boolean(starboard.copy_full_embed)); const embed = createStarboardEmbedFromMessage(msg, Boolean(starboard.copy_full_embed), starboard.color);
embed.fields!.push(createStarboardPseudoFooterForMessage(starboard, msg, starboard.star_emoji![0], starCount)); embed.fields!.push(createStarboardPseudoFooterForMessage(starboard, msg, starboard.star_emoji![0], starCount));
const starboardMessage = await (channel as TextChannel).createMessage({ embed }); const starboardMessage = await (channel as TextChannel).createMessage({ embed });

View file

@ -29,6 +29,7 @@ const defaultOptions: PluginOptions<TagsPluginType> = {
user_tag_cooldown: null, user_tag_cooldown: null,
global_tag_cooldown: null, global_tag_cooldown: null,
user_cooldown: null, user_cooldown: null,
allow_mentions: false,
global_cooldown: null, global_cooldown: null,
auto_delete_command: false, auto_delete_command: false,

View file

@ -15,6 +15,7 @@ export const TagCategory = t.type({
user_tag_cooldown: tNullable(t.union([t.string, t.number])), // Per user, per tag user_tag_cooldown: tNullable(t.union([t.string, t.number])), // Per user, per tag
user_category_cooldown: tNullable(t.union([t.string, t.number])), // Per user, per tag category user_category_cooldown: tNullable(t.union([t.string, t.number])), // Per user, per tag category
global_tag_cooldown: tNullable(t.union([t.string, t.number])), // Any user, per tag global_tag_cooldown: tNullable(t.union([t.string, t.number])), // Any user, per tag
allow_mentions: tNullable(t.boolean), // Per user, per category
global_category_cooldown: tNullable(t.union([t.string, t.number])), // Any user, per category global_category_cooldown: tNullable(t.union([t.string, t.number])), // Any user, per category
auto_delete_command: tNullable(t.boolean), // Any tag, per tag category auto_delete_command: tNullable(t.boolean), // Any tag, per tag category
@ -31,6 +32,7 @@ export const ConfigSchema = t.type({
user_tag_cooldown: tNullable(t.union([t.string, t.number])), // Per user, per tag user_tag_cooldown: tNullable(t.union([t.string, t.number])), // Per user, per tag
global_tag_cooldown: tNullable(t.union([t.string, t.number])), // Any user, per tag global_tag_cooldown: tNullable(t.union([t.string, t.number])), // Any user, per tag
user_cooldown: tNullable(t.union([t.string, t.number])), // Per user user_cooldown: tNullable(t.union([t.string, t.number])), // Per user
allow_mentions: t.boolean, // Per user
global_cooldown: tNullable(t.union([t.string, t.number])), // Any tag use global_cooldown: tNullable(t.union([t.string, t.number])), // Any tag use
auto_delete_command: t.boolean, // Any tag auto_delete_command: t.boolean, // Any tag

View file

@ -99,7 +99,11 @@ export async function onMessageCreate(pluginData: GuildPluginData<TagsPluginType
return; return;
} }
const responseMsg = await channel.createMessage(tagResult.renderedContent); const allowMentions = tagResult.category?.allow_mentions ?? config.allow_mentions;
const responseMsg = await channel.createMessage({
...tagResult.renderedContent,
allowedMentions: { roles: allowMentions, users: allowMentions },
});
// Save the command-response message pair once the message is in our database // Save the command-response message pair once the message is in our database
const deleteWithCommand = tagResult.category?.delete_with_command ?? config.delete_with_command; const deleteWithCommand = tagResult.category?.delete_with_command ?? config.delete_with_command;

View file

@ -5,7 +5,7 @@ import { sendErrorMessage } from "../../../pluginUtils";
import { EmbedOptions } from "eris"; import { EmbedOptions } from "eris";
export const AvatarCmd = utilityCmd({ export const AvatarCmd = utilityCmd({
trigger: "avatar", trigger: ["avatar", "av"],
description: "Retrieves a user's profile picture", description: "Retrieves a user's profile picture",
permission: "can_avatar", permission: "can_avatar",

View file

@ -0,0 +1,26 @@
import { Member, Message, User } from "eris";
import { SavedMessage } from "../data/entities/SavedMessage";
export function allStarboardsLock() {
return `starboards`;
}
export function banLock(user: Member | User | { id: string }) {
return `ban-${user.id}`;
}
export function counterIdLock(counterId: number | string) {
return `counter-${counterId}`;
}
export function memberRolesLock(member: Member | User | { id: string }) {
return `member-roles-${member.id}`;
}
export function messageLock(message: Message | SavedMessage | { id: string }) {
return `message-${message.id}`;
}
export function muteLock(user: Member | User | { id: string }) {
return `mute-${user.id}`;
}