channel: set send reply via builder

Author: zephyrtronium

config.go

@@ -332,7 +332,7 @@ func (robo *Robot) SetTwitchChannels(ctx context.Context, global Global, channel
 				Effects:   effects,
 			}
 			v.Message = func(ctx context.Context, reply, text string) {
-				msg := message.Format(reply, v.Name, "%s", text)
+				msg := message.Format(v.Name, "%s", text).AsReply(reply)
 				robo.sendTMI(ctx, robo.tmi.send, msg)
 			}
 			robo.channels.Store(p, v)

message/message.go

@@ -48,15 +48,19 @@ type Sent struct {
 	Text string
 }
 
+func (m Sent) AsReply(reply string) Sent {
+	m.Reply = reply
+	return m
+}
+
 // formatString is a type to prevent misuse of format strings passed to [Format].
 type formatString string
 
 // Format constructs a message to send from a format string literal and
 // formatting arguments.
-func Format(reply, to string, f formatString, args ...any) Sent {
+func Format(to string, f formatString, args ...any) Sent {
 	return Sent{
-		Reply: reply,
-		To:    to,
-		Text:  strings.TrimSpace(fmt.Sprintf(string(f), args...)),
+		To:   to,
+		Text: strings.TrimSpace(fmt.Sprintf(string(f), args...)),
 	}
 }

privmsg.go

@@ -85,7 +85,7 @@ func (robo *Robot) tmiMessage(ctx context.Context, send chan<- *tmi.Message, msg
 			slog.String("text", s),
 			slog.String("effect", f),
 		)
-		msg := message.Format("", ch.Name, "%s", s)
+		msg := message.Format(ch.Name, "%s", s)
 		robo.sendTMI(ctx, send, msg)
 		return
 	default:
@@ -136,7 +136,7 @@ func (robo *Robot) tmiMessage(ctx context.Context, send chan<- *tmi.Message, msg
 		r.CancelAt(t)
 		return
 	}
-	out := message.Format("", ch.Name, "%s", sef)
+	out := message.Format(ch.Name, "%s", sef)
 	robo.sendTMI(ctx, send, out)
 }