1 files changed, 30 insertions, 2 deletions
diff --git a/LibMatrix/Helpers/MessageBuilder.cs b/LibMatrix/Helpers/MessageBuilder.cs
index 5e2b1b7..f753bf7 100644
--- a/LibMatrix/Helpers/MessageBuilder.cs
+++ b/LibMatrix/Helpers/MessageBuilder.cs
@@ -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,9 +95,33 @@ 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}";
+    public MessageBuilder WithMention(string id, string? displayName = null, string[]? vias = null, bool useIdInPlainText = false, bool useLinkInPlainText = false) {
+        if (!useLinkInPlainText) Content.Body += $"@{(useIdInPlainText ? id : displayName ?? id)}";
+        else {
+            Content.Body += $"https://matrix.to/#/{id}";
+            if (vias is { Length: > 0 }) Content.Body += $"?via={string.Join("&via=", vias)}";
+        }
+
         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 WithRoomMention() {
+        // Legacy push rules support
+        Content.Body += "@room";
+        Content.FormattedBody += "@room";
+        Content.Mentions ??= new();
+        Content.Mentions.Room = true;
         return this;
     }