1 files changed, 30 insertions, 4 deletions
diff --git a/LibMatrix/Helpers/MessageBuilder.cs b/LibMatrix/Helpers/MessageBuilder.cs
index d897078..6f55739 100644
--- a/LibMatrix/Helpers/MessageBuilder.cs
+++ b/LibMatrix/Helpers/MessageBuilder.cs
@@ -10,9 +10,9 @@ public class MessageBuilder(string msgType = "m.text", string format = "org.matr
 
     public RoomMessageEventContent Build() => Content;
 
-    public MessageBuilder WithBody(string body) {
+    public MessageBuilder WithBody(string body, string? formattedBody = null) {
         Content.Body += body;
-        Content.FormattedBody += body;
+        Content.FormattedBody += formattedBody ?? body;
         return this;
     }
 
@@ -37,6 +37,10 @@ public class MessageBuilder(string msgType = "m.text", string format = "org.matr
         return this;
     }
 
+    public static string GetColoredBody(string color, string body) {
+        return $"<font color=\"{color}\">{body}</font>";
+    }
+
     public MessageBuilder WithColoredBody(string color, string body) {
         Content.Body += body;
         Content.FormattedBody += $"<font color=\"{color}\">{body}</font>";
@@ -91,16 +95,38 @@ public class MessageBuilder(string msgType = "m.text", string format = "org.matr
         return this;
     }
 
+    public MessageBuilder WithMention(string id, string? displayName = null) {
+        Content.Body += $"@{displayName ?? id}";
+        Content.FormattedBody += $"<a href=\"https://matrix.to/#/{id}\">{displayName ?? id}</a>";
+        if (id == "@room") {
+            Content.Mentions ??= new();
+            Content.Mentions.Room = true;
+        }
+        else if (id.StartsWith('@')) {
+            Content.Mentions ??= new();
+            Content.Mentions.Users ??= new();
+            Content.Mentions.Users.Add(id);
+        }
+
+        return this;
+    }
+
+    public MessageBuilder WithNewline() {
+        Content.Body += "\n";
+        Content.FormattedBody += "<br>";
+        return this;
+    }
+
     public MessageBuilder WithTable(Action<TableBuilder> tableBuilder) {
         var tb = new TableBuilder(this);
-        this.WithHtmlTag("table", msb => tableBuilder(tb));
+        WithHtmlTag("table", msb => tableBuilder(tb));
         return this;
     }
 
     public class TableBuilder(MessageBuilder msb) {
         public TableBuilder WithTitle(string title, int colspan) {
             msb.Content.Body += title + "\n";
-            msb.Content.FormattedBody += $"<thead><tr><th colspan=\"{colspan}\">{title}</th></tr></thead>";
+            msb.Content.FormattedBody += $"<thead><tr><th colspan=\"{colspan}\">{title}</th></tr></thead><br/>";
             return this;
         }