clean up errChannel handling for custom commands

Author: ashishjh-bst

customcommands/bot.go

@@ -577,6 +577,21 @@ type TriggeredCC struct {
 	Args     []string
 }
 
+func getErrorChannel(cmd *models.CustomCommand, tmplCtx *templates.Context) int64 {
+	cmdGroup := cmd.GetGroup()
+	errChannel := tmplCtx.CurrentFrame.CS.ID
+	if cmd.RedirectErrorsChannel != 0 {
+		errChannel = cmd.RedirectErrorsChannel
+	} else if cmdGroup != nil && cmdGroup.RedirectErrorsChannel != 0 {
+		errChannel = cmdGroup.RedirectErrorsChannel
+	}
+	channel := tmplCtx.GS.GetChannel(errChannel)
+	if channel == nil {
+		return 0
+	}
+	return channel.ID
+}
+
 func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context) error {
 	defer func() {
 		if err := recover(); err != nil {
@@ -602,6 +617,7 @@ func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context)
 		"trigger_type": CommandTriggerType(cmd.TriggerType).String(),
 		"guild":        csCop.GuildID,
 		"channel_name": csCop.Name,
+		"cc_id":        cmd.LocalID,
 	})
 
 	// do not allow concurrent executions of the same custom command, to prevent most common kinds of abuse
@@ -610,16 +626,11 @@ func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context)
 		CCID:    cmd.LocalID,
 	}
 	lockHandle := CCExecLock.Lock(lockKey, time.Minute, time.Minute*10)
+
 	if lockHandle == -1 {
 		f.Warn("Exceeded max lock attempts for cc")
-		errChannel := tmplCtx.CurrentFrame.CS.ID
-		if cmd.RedirectErrorsChannel != 0 {
-			errChannel = cmd.RedirectErrorsChannel
-		} else if cmd.R.Group != nil && cmd.R.Group.RedirectErrorsChannel != 0 {
-			errChannel = cmd.R.Group.RedirectErrorsChannel
-		}
-
-		if cmd.ShowErrors {
+		errChannel := getErrorChannel(cmd, tmplCtx)
+		if cmd.ShowErrors && errChannel != 0 {
 			common.BotSession.ChannelMessageSend(errChannel, fmt.Sprintf("Gave up trying to execute custom command #%d after 1 minute because there is already one or more instances of it being executed.", cmd.LocalID))
 		}
 		updatePostCommandRan(cmd, errors.New("Gave up trying to execute, already an existing instance executing"))
@@ -649,14 +660,8 @@ func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context)
 	if err != nil {
 		logger.WithField("guild", tmplCtx.GS.ID).WithError(err).Error("Error executing custom command")
 
-		errChannel := tmplCtx.CurrentFrame.CS.ID
-		if cmd.RedirectErrorsChannel != 0 {
-			errChannel = cmd.RedirectErrorsChannel
-		} else if cmd.R.Group != nil && cmd.R.Group.RedirectErrorsChannel != 0 {
-			errChannel = cmd.R.Group.RedirectErrorsChannel
-		}
-
-		if cmd.ShowErrors {
+		errChannel := getErrorChannel(cmd, tmplCtx)
+		if cmd.ShowErrors && errChannel != 0 {
 			out += "\nAn error caused the execution of the custom command template to stop:\n"
 			out += formatCustomCommandRunErr(chanMsg, err)
 
@@ -814,14 +819,8 @@ func onExecPanic(cmd *models.CustomCommand, err error, tmplCtx *templates.Contex
 
 	l.Error("Error executing custom command")
 
-	errChannel := tmplCtx.CurrentFrame.CS.ID
-	if cmd.RedirectErrorsChannel != 0 {
-		errChannel = cmd.RedirectErrorsChannel
-	} else if cmd.R.Group != nil && cmd.R.Group.RedirectErrorsChannel != 0 {
-		errChannel = cmd.R.Group.RedirectErrorsChannel
-	}
-
-	if cmd.ShowErrors {
+	errChannel := getErrorChannel(cmd, tmplCtx)
+	if cmd.ShowErrors && errChannel != 0 {
 		out := "\nAn error caused the execution of the custom command template to stop:\n"
 		out += "`" + err.Error() + "`"