From f5447484512d726f4403f0d7725777d0a95601fb Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Tue, 19 Sep 2023 00:16:36 +0200
Subject: Add more stuff, add unit tests

---
 ExampleBots/LibMatrix.ExampleBot/Bot/Commands/CmdCommand.cs  | 10 +++++-----
 ExampleBots/LibMatrix.ExampleBot/Bot/Commands/HelpCommand.cs |  4 ++--
 ExampleBots/LibMatrix.ExampleBot/Bot/Commands/PingCommand.cs |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ExampleBots/LibMatrix.ExampleBot/Bot/Commands')

diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/CmdCommand.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/CmdCommand.cs
index 5b2828e..f3b4dde 100644
--- a/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/CmdCommand.cs
+++ b/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/CmdCommand.cs
@@ -1,6 +1,6 @@
 using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec;
 using LibMatrix.ExampleBot.Bot.Interfaces;
-using LibMatrix.StateEventTypes.Spec;
 
 namespace LibMatrix.ExampleBot.Bot.Commands;
 
@@ -18,7 +18,7 @@ public class CmdCommand : ICommand {
         cmd = cmd.Trim();
         cmd += "\"";
 
-        await ctx.Room.SendMessageEventAsync("m.room.message", new RoomMessageEventContent(body: $"Command being executed: `{cmd}`"));
+        await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent(body: $"Command being executed: `{cmd}`"));
 
         var output = ArcaneLibs.Util.GetCommandOutputAsync(
             Environment.OSVersion.Platform == PlatformID.Unix ? "/bin/sh" : "cmd.exe",
@@ -27,7 +27,7 @@ public class CmdCommand : ICommand {
         // .Split("\n").ToList();
 
         var msg = "";
-        EventIdResponse? msgId = await ctx.Room.SendMessageEventAsync("m.room.message", new RoomMessageEventContent {
+        EventIdResponse? msgId = await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent {
             FormattedBody = $"Waiting for command output...",
             Body = msg.RemoveAnsi(),
             Format = "m.notice"
@@ -38,14 +38,14 @@ public class CmdCommand : ICommand {
             Console.WriteLine($"{@out.Length:0000} {@out}");
             msg += @out + "\n";
             if (lastSendTask.IsCompleted)
-                lastSendTask = ctx.Room.SendMessageEventAsync("m.room.message", new RoomMessageEventContent {
+                lastSendTask = ctx.Room.SendMessageEventAsync(new RoomMessageEventContent {
                     FormattedBody = $"<pre class=\"language-csharp\">\n{msg}\n</pre>",
                     Body = msg.RemoveAnsi(),
                     Format = "org.matrix.custom.html"
                 });
             if (msg.Length > 31000) {
                 await lastSendTask;
-                msgId = await ctx.Room.SendMessageEventAsync("m.room.message", new RoomMessageEventContent {
+                msgId = await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent {
                     FormattedBody = $"Waiting for command output...",
                     Body = msg.RemoveAnsi(),
                     Format = "m.notice"
diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/HelpCommand.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/HelpCommand.cs
index c750130..23c4fe2 100644
--- a/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/HelpCommand.cs
+++ b/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/HelpCommand.cs
@@ -1,6 +1,6 @@
 using System.Text;
+using LibMatrix.EventTypes.Spec;
 using LibMatrix.ExampleBot.Bot.Interfaces;
-using LibMatrix.StateEventTypes.Spec;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace LibMatrix.ExampleBot.Bot.Commands;
@@ -17,6 +17,6 @@ public class HelpCommand(IServiceProvider services) : ICommand {
             sb.AppendLine($"- {command.Name}: {command.Description}");
         }
 
-        await ctx.Room.SendMessageEventAsync("m.room.message", new RoomMessageEventContent(body: sb.ToString()));
+        await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent(body: sb.ToString()));
     }
 }
diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/PingCommand.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/PingCommand.cs
index a261a59..ba242fe 100644
--- a/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/PingCommand.cs
+++ b/ExampleBots/LibMatrix.ExampleBot/Bot/Commands/PingCommand.cs
@@ -1,5 +1,5 @@
+using LibMatrix.EventTypes.Spec;
 using LibMatrix.ExampleBot.Bot.Interfaces;
-using LibMatrix.StateEventTypes.Spec;
 
 namespace LibMatrix.ExampleBot.Bot.Commands;
 
@@ -8,6 +8,6 @@ public class PingCommand : ICommand {
     public string Description { get; } = "Pong!";
 
     public async Task Invoke(CommandContext ctx) {
-        await ctx.Room.SendMessageEventAsync("m.room.message", new RoomMessageEventContent(body: "pong!"));
+        await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent(body: "pong!"));
     }
 }
-- 
cgit 1.4.1