Skip to content

Commit

Permalink
Revert "templates: block nested template executors (#1677)"
Browse files Browse the repository at this point in the history 
This reverts commit d3da699.
  • Loading branch information
@ashishjh-bst
ashishjh-bst committed Jun 28, 2024
1 parent 3f743b0 commit 8b8ebbc
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 97 deletions.
10 changes: 5 additions & 5 deletions automod/effects.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func (kick *KickUserEffect) Apply(ctxData *TriggeredRuleData, settings interface
reason += ctxData.ConstructReason(true)
}

err := moderation.KickUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, -1, false)
err := moderation.KickUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, -1)
return err
}

Expand Down Expand Up @@ -340,7 +340,7 @@ func (ban *BanUserEffect) Apply(ctxData *TriggeredRuleData, settings interface{}
}

duration := time.Duration(settingsCast.Duration) * time.Minute
err := moderation.BanUserWithDuration(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, duration, settingsCast.MessageDeleteDays, false)
err := moderation.BanUserWithDuration(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, duration, settingsCast.MessageDeleteDays)
return err
}

Expand Down Expand Up @@ -402,7 +402,7 @@ func (mute *MuteUserEffect) Apply(ctxData *TriggeredRuleData, settings interface
reason += ctxData.ConstructReason(true)
}

err := moderation.MuteUnmuteUser(nil, true, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, ctxData.MS, settingsCast.Duration, false)
err := moderation.MuteUnmuteUser(nil, true, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, ctxData.MS, settingsCast.Duration)
return err
}

Expand Down Expand Up @@ -472,7 +472,7 @@ func (timeout *TimeoutUserEffect) Apply(ctxData *TriggeredRuleData, settings int
}

duration := time.Duration(settingsCast.Duration) * time.Minute
err := moderation.TimeoutUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, duration, false)
err := moderation.TimeoutUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, duration)
return err
}

Expand Down Expand Up @@ -526,7 +526,7 @@ func (warn *WarnUserEffect) Apply(ctxData *TriggeredRuleData, settings interface
reason += ctxData.ConstructReason(true)
}

err := moderation.WarnUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, &ctxData.MS.User, reason, false)
err := moderation.WarnUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, &ctxData.MS.User, reason)
return err
}

Expand Down
8 changes: 4 additions & 4 deletions automod_legacy/bot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ func CheckMessage(evt *eventsystem.EventData, m *discordgo.Message) bool {
go func() {
switch highestPunish {
case PunishNone:
err = moderation.WarnUser(nil, cs.GuildID, cs, m, common.BotUser, &member.User, "Automoderator: "+punishMsg, false)
err = moderation.WarnUser(nil, cs.GuildID, cs, m, common.BotUser, &member.User, "Automoderator: "+punishMsg)
case PunishMute:
err = moderation.MuteUnmuteUser(nil, true, cs.GuildID, cs, m, common.BotUser, "Automoderator: "+punishMsg, member, muteDuration, false)
err = moderation.MuteUnmuteUser(nil, true, cs.GuildID, cs, m, common.BotUser, "Automoderator: "+punishMsg, member, muteDuration)
case PunishKick:
err = moderation.KickUser(nil, cs.GuildID, cs, m, common.BotUser, "Automoderator: "+punishMsg, &member.User, -1, false)
err = moderation.KickUser(nil, cs.GuildID, cs, m, common.BotUser, "Automoderator: "+punishMsg, &member.User, -1)
case PunishBan:
err = moderation.BanUser(nil, cs.GuildID, cs, m, common.BotUser, "Automoderator: "+punishMsg, &member.User, false)
err = moderation.BanUser(nil, cs.GuildID, cs, m, common.BotUser, "Automoderator: "+punishMsg, &member.User)
}

// Execute the punishment before removing the message to make sure it's included in logs
Expand Down
2 changes: 0 additions & 2 deletions commands/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ const (
CtxKeyCmdSettings CtxKey = iota
CtxKeyChannelOverride
CtxKeyExecutedByCC
CtxKeyExecutedByCommandTemplate
CtxKeyExecutedByNestedCommandTemplate
)

type MessageFilterFunc func(evt *eventsystem.EventData, msg *discordgo.Message) bool
Expand Down
7 changes: 0 additions & 7 deletions commands/tmplexec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,6 @@ func execCmd(tmplCtx *templates.Context, dryRun bool, m *discordgo.MessageCreate
data = data.WithContext(context.WithValue(data.Context(), paginatedmessages.CtxKeyNoPagination, true))
data = data.WithContext(context.WithValue(data.Context(), CtxKeyExecutedByCC, true))

switch tmplCtx.ExecutedFrom {
case templates.ExecutedFromCommandTemplate:
data = data.WithContext(context.WithValue(data.Context(), CtxKeyExecutedByCommandTemplate, true))
case templates.ExecutedFromNestedCommandTemplate:
data = data.WithContext(context.WithValue(data.Context(), CtxKeyExecutedByNestedCommandTemplate, true))
}

cast := foundCmd.Command.(*YAGCommand)

err = dcmd.ParseCmdArgs(data)
Expand Down
10 changes: 4 additions & 6 deletions common/templates/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,10 @@ var GuildPremiumFunc func(guildID int64) (bool, error)
type ExecutedFromType int

const (
ExecutedFromStandard ExecutedFromType = 0
ExecutedFromJoin ExecutedFromType = 1
ExecutedFromLeave ExecutedFromType = 2
ExecutedFromEvalCC ExecutedFromType = 3
ExecutedFromCommandTemplate ExecutedFromType = 4
ExecutedFromNestedCommandTemplate ExecutedFromType = 5
ExecutedFromStandard ExecutedFromType = 0
ExecutedFromJoin ExecutedFromType = 1
ExecutedFromLeave ExecutedFromType = 2
ExecutedFromEvalCC ExecutedFromType = 3
)

type Context struct {
Expand Down
4 changes: 0 additions & 4 deletions customcommands/tmplextensions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,6 @@ func (pa *ParsedArgs) IsSet(index int) interface{} {
// or schedules a custom command to be run in the future sometime with the provided data placed in .ExecData
func tmplRunCC(ctx *templates.Context) interface{} {
return func(ccID int, channel interface{}, delaySeconds interface{}, data interface{}) (string, error) {
if ctx.ExecutedFrom == templates.ExecutedFromCommandTemplate || ctx.ExecutedFrom == templates.ExecutedFromNestedCommandTemplate {
return "", nil
}

if ctx.IncreaseCheckCallCounterPremium("runcc", 1, 10) {
return "", templates.ErrTooManyCalls
}
Expand Down
35 changes: 6 additions & 29 deletions moderation/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ var ModerationCommands = []*commands.YAGCommand{
DefaultEnabled: false,
IsResponseEphemeral: true,
RunFunc: func(parsed *dcmd.Data) (interface{}, error) {
if parsed.Context().Value(commands.CtxKeyExecutedByNestedCommandTemplate) == true {
return nil, errors.New("cannot nest exec/execAdmin calls")
}

config, target, err := MBaseCmd(parsed, parsed.Args[0].Int64())
if err != nil {
return nil, err
Expand Down Expand Up @@ -203,7 +199,7 @@ var ModerationCommands = []*commands.YAGCommand{
if parsed.TraditionalTriggerData != nil {
msg = parsed.TraditionalTriggerData.Message
}
err = BanUserWithDuration(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, target, banDuration, ddays, parsed.Context().Value(commands.CtxKeyExecutedByCommandTemplate) == true)
err = BanUserWithDuration(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, target, banDuration, ddays)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -279,10 +275,6 @@ var ModerationCommands = []*commands.YAGCommand{
SlashCommandEnabled: true,
IsResponseEphemeral: true,
RunFunc: func(parsed *dcmd.Data) (interface{}, error) {
if parsed.Context().Value(commands.CtxKeyExecutedByNestedCommandTemplate) == true {
return nil, errors.New("cannot nest exec/execAdmin calls")
}

config, target, err := MBaseCmd(parsed, parsed.Args[0].Int64())
if err != nil {
return nil, err
Expand Down Expand Up @@ -318,7 +310,7 @@ var ModerationCommands = []*commands.YAGCommand{
msg = parsed.TraditionalTriggerData.Message
}

err = KickUser(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, target, toDel, parsed.Context().Value(commands.CtxKeyExecutedByCommandTemplate) == true)
err = KickUser(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, target, toDel)
if err != nil {
return nil, err
}
Expand All @@ -343,10 +335,6 @@ var ModerationCommands = []*commands.YAGCommand{
DefaultEnabled: false,
IsResponseEphemeral: true,
RunFunc: func(parsed *dcmd.Data) (interface{}, error) {
if parsed.Context().Value(commands.CtxKeyExecutedByNestedCommandTemplate) == true {
return nil, errors.New("cannot nest exec/execAdmin calls")
}

config, target, err := MBaseCmd(parsed, parsed.Args[0].Int64())
if err != nil {
return nil, err
Expand Down Expand Up @@ -381,7 +369,7 @@ var ModerationCommands = []*commands.YAGCommand{
if parsed.TraditionalTriggerData != nil {
msg = parsed.TraditionalTriggerData.Message
}
err = MuteUnmuteUser(config, true, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, member, int(d.Minutes()), parsed.Context().Value(commands.CtxKeyExecutedByCommandTemplate) == true)
err = MuteUnmuteUser(config, true, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, member, int(d.Minutes()))
if err != nil {
return nil, err
}
Expand All @@ -406,10 +394,6 @@ var ModerationCommands = []*commands.YAGCommand{
DefaultEnabled: false,
IsResponseEphemeral: true,
RunFunc: func(parsed *dcmd.Data) (interface{}, error) {
if parsed.Context().Value(commands.CtxKeyExecutedByNestedCommandTemplate) == true {
return nil, errors.New("cannot nest exec/execAdmin calls")
}

config, target, err := MBaseCmd(parsed, parsed.Args[0].Int64())
if err != nil {
return nil, err
Expand All @@ -434,7 +418,7 @@ var ModerationCommands = []*commands.YAGCommand{
if parsed.TraditionalTriggerData != nil {
msg = parsed.TraditionalTriggerData.Message
}
err = MuteUnmuteUser(config, false, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, member, 0, parsed.Context().Value(commands.CtxKeyExecutedByCommandTemplate) == true)
err = MuteUnmuteUser(config, false, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, member, 0)
if err != nil {
return nil, err
}
Expand All @@ -460,9 +444,6 @@ var ModerationCommands = []*commands.YAGCommand{
DefaultEnabled: false,
IsResponseEphemeral: true,
RunFunc: func(parsed *dcmd.Data) (interface{}, error) {
if parsed.Context().Value(commands.CtxKeyExecutedByNestedCommandTemplate) == true {
return nil, errors.New("cannot nest exec/execAdmin calls")
}
config, target, err := MBaseCmd(parsed, parsed.Args[0].Int64())
if err != nil {
return nil, err
Expand Down Expand Up @@ -493,7 +474,7 @@ var ModerationCommands = []*commands.YAGCommand{
if parsed.TraditionalTriggerData != nil {
msg = parsed.TraditionalTriggerData.Message
}
err = TimeoutUser(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, &member.User, d, parsed.Context().Value(commands.CtxKeyExecutedByCommandTemplate) == true)
err = TimeoutUser(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, reason, &member.User, d)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -840,10 +821,6 @@ var ModerationCommands = []*commands.YAGCommand{
DefaultEnabled: false,
IsResponseEphemeral: true,
RunFunc: func(parsed *dcmd.Data) (interface{}, error) {
if parsed.Context().Value(commands.CtxKeyExecutedByNestedCommandTemplate) == true {
return nil, errors.New("cannot nest exec/execAdmin calls")
}

config, target, err := MBaseCmd(parsed, parsed.Args[0].Int64())
if err != nil {
return nil, err
Expand All @@ -862,7 +839,7 @@ var ModerationCommands = []*commands.YAGCommand{
if parsed.TraditionalTriggerData != nil {
msg = parsed.TraditionalTriggerData.Message
}
err = WarnUser(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, target, parsed.Args[1].Str(), parsed.Context().Value(commands.CtxKeyExecutedByCommandTemplate) == true)
err = WarnUser(config, parsed.GuildData.GS.ID, parsed.GuildData.CS, msg, parsed.Author, target, parsed.Args[1].Str())
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion moderation/plugin_bot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ func handleScheduledUnmute(evt *seventsmodels.ScheduledEvent, data interface{})
return scheduledevents2.CheckDiscordErrRetry(err), err
}

err = MuteUnmuteUser(nil, false, evt.GuildID, nil, nil, common.BotUser, "Mute Duration Expired", member, 0, false)
err = MuteUnmuteUser(nil, false, evt.GuildID, nil, nil, common.BotUser, "Mute Duration Expired", member, 0)
if errors.Cause(err) != ErrNoMuteRole {
return scheduledevents2.CheckDiscordErrRetry(err), err
}
Expand Down
Loading

0 comments on commit 8b8ebbc

Please sign in to comment.