Make private messages structure given by writeln method instead of caller

Author: PPTide

commands.go

@@ -175,15 +175,15 @@ func dmCMD(rest string, u *User) {
 		return
 	}
 	msg := strings.TrimSpace(strings.TrimPrefix(rest, restSplit[0]))
-	u.writeln(NewPrivateMessage(peer.Name+" <- ", msg, true))
+	u.writeln(NewPrivateMessage(peer.Name, msg, true))
 	if u == peer {
 		devbotRespond(u.room, []string{"You must be really lonely, DMing yourself.",
 			"Don't worry, I won't judge :wink:",
 			"srsly?",
 			"what an idiot"}, 30)
 		return
 	}
-	peer.writeln(NewPrivateMessage(u.Name+" -> ", msg, false))
+	peer.writeln(NewPrivateMessage(u.Name, msg, false))
 }
 
 func hangCMD(rest string, u *User) {
@@ -248,15 +248,15 @@ func usersCMD(_ string, u *User) {
 }
 
 func dmRoomCMD(line string, u *User) {
-	u.writeln(NewPrivateMessage(u.messaging.Name+" <- ", line, true))
+	u.writeln(NewPrivateMessage(u.messaging.Name, line, true))
 	if u == u.messaging {
 		devbotRespond(u.room, []string{"You must be really lonely, DMing yourself.",
 			"Don't worry, I won't judge :wink:",
 			"srsly?",
 			"what an idiot"}, 30)
 		return
 	}
-	u.messaging.writeln(NewPrivateMessage(u.Name+" -> ", line, false))
+	u.messaging.writeln(NewPrivateMessage(u.Name, line, false))
 }
 
 // named devmonk at the request of a certain ced

main.go

@@ -699,9 +699,15 @@ func (u *User) writelnWithImageCache(msg Message, cache map[string]image.Image)
 	msg.text = strings.ReplaceAll(msg.text, `\`+"\n", `\n`) // let people escape newlines
 	thisUserIsDMSender := msg.messageType == PrivateMessageSend
 	switch msg.messageType {
-	case PrivateMessageSend, PrivateMessageReceive:
+	case PrivateMessageSend:
 		msg.text = strings.TrimSpace(mdRender(msg.text, lenString(msg.senderName), u.winWidth, cache))
-		msg.text = msg.senderName + msg.text
+		msg.text = msg.senderName + " <- " + msg.text
+		if !thisUserIsDMSender {
+			msg.text += "\a"
+		}
+	case PrivateMessageReceive:
+		msg.text = strings.TrimSpace(mdRender(msg.text, lenString(msg.senderName), u.winWidth, cache))
+		msg.text = msg.senderName + " -> " + msg.text
 		if !thisUserIsDMSender {
 			msg.text += "\a"
 		}

rpc.go

@@ -191,7 +191,7 @@ func (s *pluginServer) SendMessage(ctx context.Context, msg *pb.Message) (*pb.Me
 		if !success {
 			return nil, status.Error(codes.NotFound, "Could not find user "+*msg.EphemeralTo)
 		}
-		u.writeln(NewPrivateMessage(msg.GetFrom()+" -> ", msg.Msg, false))
+		u.writeln(NewPrivateMessage(msg.GetFrom(), msg.Msg, false))
 	} else {
 		r := Rooms[msg.Room]
 		if r == nil {