2 files changed, 31 insertions, 0 deletions
diff --git a/LibMatrix.EventTypes/Common/MjolnirShortcodeEventContent.cs b/LibMatrix.EventTypes/Common/MjolnirShortcodeEventContent.cs
new file mode 100644
index 0000000..7924a33
--- /dev/null
+++ b/LibMatrix.EventTypes/Common/MjolnirShortcodeEventContent.cs
@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.EventTypes.Common;
+
+[MatrixEvent(EventName = "org.matrix.mjolnir.shortcode")]
+public class MjolnirShortcodeEventContent : TimelineEventContent {
+    [JsonPropertyName("shortcode")]
+    public string? Shortcode { get; set; }
+}
diff --git a/LibMatrix.EventTypes/Common/RoomEmotesEventContent.cs b/LibMatrix.EventTypes/Common/RoomEmotesEventContent.cs
new file mode 100644
index 0000000..bfe480e
--- /dev/null
+++ b/LibMatrix.EventTypes/Common/RoomEmotesEventContent.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.EventTypes.Common;
+
+[MatrixEvent(EventName = "im.ponies.room_emotes")]
+public class RoomEmotesEventContent : TimelineEventContent {
+    [JsonPropertyName("emoticons")]
+    public Dictionary<string, EmoticonData>? Emoticons { get; set; }
+
+    [JsonPropertyName("images")]
+    public Dictionary<string, EmoticonData>? Images { get; set; }
+
+    [JsonPropertyName("pack")]
+    public PackInfo? Pack { get; set; }
+
+    public class EmoticonData {
+        [JsonPropertyName("url")]
+        public string? Url { get; set; }
+    }
+
+    public class PackInfo; // TODO: Implement this
+}