diff --git a/Utilities/LibMatrix.Utilities.Bot/AppServiceConfiguration.cs b/Utilities/LibMatrix.Utilities.Bot/AppServiceConfiguration.cs
index 4de139e..99a789a 100644
--- a/Utilities/LibMatrix.Utilities.Bot/AppServiceConfiguration.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/AppServiceConfiguration.cs
@@ -1,4 +1,4 @@
-namespace PluralContactBotPoC;
+namespace LibMatrix.Utilities.Bot;
public class AppServiceConfiguration {
public string Id { get; set; } = null!;
diff --git a/Utilities/LibMatrix.Utilities.Bot/BotCommandInstaller.cs b/Utilities/LibMatrix.Utilities.Bot/BotCommandInstaller.cs
index a13f1bd..16e1444 100644
--- a/Utilities/LibMatrix.Utilities.Bot/BotCommandInstaller.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/BotCommandInstaller.cs
@@ -3,9 +3,8 @@ using ArcaneLibs.Extensions;
using LibMatrix.Helpers;
using LibMatrix.Homeservers;
using LibMatrix.Services;
-using LibMatrix.StateEventTypes.Spec;
+using LibMatrix.Utilities.Bot.Interfaces;
using LibMatrix.Utilities.Bot.Services;
-using MediaModeratorPoC.Bot.Interfaces;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
diff --git a/Utilities/LibMatrix.Utilities.Bot/Commands/HelpCommand.cs b/Utilities/LibMatrix.Utilities.Bot/Commands/HelpCommand.cs
index de033ef..4fe1038 100644
--- a/Utilities/LibMatrix.Utilities.Bot/Commands/HelpCommand.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/Commands/HelpCommand.cs
@@ -1,9 +1,9 @@
using System.Text;
-using LibMatrix.StateEventTypes.Spec;
-using MediaModeratorPoC.Bot.Interfaces;
+using LibMatrix.EventTypes.Spec;
+using LibMatrix.Utilities.Bot.Interfaces;
using Microsoft.Extensions.DependencyInjection;
-namespace MediaModeratorPoC.Bot.Commands;
+namespace LibMatrix.Utilities.Bot.Commands;
public class HelpCommand(IServiceProvider services) : ICommand {
public string Name { get; } = "help";
@@ -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(messageType: "m.notice", body: sb.ToString()));
+ await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent(messageType: "m.notice", body: sb.ToString()));
}
}
diff --git a/Utilities/LibMatrix.Utilities.Bot/Commands/PingCommand.cs b/Utilities/LibMatrix.Utilities.Bot/Commands/PingCommand.cs
index b008be9..16712ea 100644
--- a/Utilities/LibMatrix.Utilities.Bot/Commands/PingCommand.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/Commands/PingCommand.cs
@@ -1,13 +1,13 @@
-using LibMatrix.StateEventTypes.Spec;
-using MediaModeratorPoC.Bot.Interfaces;
+using LibMatrix.EventTypes.Spec;
+using LibMatrix.Utilities.Bot.Interfaces;
-namespace MediaModeratorPoC.Bot.Commands;
+namespace LibMatrix.Utilities.Bot.Commands;
public class PingCommand : ICommand {
public string Name { get; } = "ping";
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!"));
}
}
diff --git a/Utilities/LibMatrix.Utilities.Bot/FileStorageProvider.cs b/Utilities/LibMatrix.Utilities.Bot/FileStorageProvider.cs
index d5b991a..39b66e3 100644
--- a/Utilities/LibMatrix.Utilities.Bot/FileStorageProvider.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/FileStorageProvider.cs
@@ -3,7 +3,7 @@ using ArcaneLibs.Extensions;
using LibMatrix.Interfaces.Services;
using Microsoft.Extensions.Logging;
-namespace MediaModeratorPoC.Bot;
+namespace LibMatrix.Utilities.Bot;
public class FileStorageProvider : IStorageProvider {
private readonly ILogger<FileStorageProvider> _logger;
diff --git a/Utilities/LibMatrix.Utilities.Bot/Interfaces/CommandContext.cs b/Utilities/LibMatrix.Utilities.Bot/Interfaces/CommandContext.cs
index bdb93d5..97984fd 100644
--- a/Utilities/LibMatrix.Utilities.Bot/Interfaces/CommandContext.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/Interfaces/CommandContext.cs
@@ -1,10 +1,9 @@
-using LibMatrix;
+using LibMatrix.EventTypes.Spec;
using LibMatrix.Homeservers;
using LibMatrix.Responses;
using LibMatrix.RoomTypes;
-using LibMatrix.StateEventTypes.Spec;
-namespace MediaModeratorPoC.Bot.Interfaces;
+namespace LibMatrix.Utilities.Bot.Interfaces;
public class CommandContext {
public GenericRoom Room { get; set; }
@@ -20,5 +19,5 @@ public class CommandContext {
public string[] Args => MessageContentWithoutReply.Split(' ')[1..];
public AuthenticatedHomeserverGeneric Homeserver { get; set; }
- public async Task<EventIdResponse> Reply(string eventType, RoomMessageEventContent content) => await Room.SendMessageEventAsync(eventType, content);
+ public async Task<EventIdResponse> Reply(RoomMessageEventContent content) => await Room.SendMessageEventAsync(content);
}
diff --git a/Utilities/LibMatrix.Utilities.Bot/Interfaces/ICommand.cs b/Utilities/LibMatrix.Utilities.Bot/Interfaces/ICommand.cs
index a8fce94..7065683 100644
--- a/Utilities/LibMatrix.Utilities.Bot/Interfaces/ICommand.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/Interfaces/ICommand.cs
@@ -1,4 +1,4 @@
-namespace MediaModeratorPoC.Bot.Interfaces;
+namespace LibMatrix.Utilities.Bot.Interfaces;
public interface ICommand {
public string Name { get; }
diff --git a/Utilities/LibMatrix.Utilities.Bot/Services/CommandListenerHostedService.cs b/Utilities/LibMatrix.Utilities.Bot/Services/CommandListenerHostedService.cs
index df702f4..910db0a 100644
--- a/Utilities/LibMatrix.Utilities.Bot/Services/CommandListenerHostedService.cs
+++ b/Utilities/LibMatrix.Utilities.Bot/Services/CommandListenerHostedService.cs
@@ -1,7 +1,7 @@
+using LibMatrix.EventTypes.Spec;
using LibMatrix.Helpers;
using LibMatrix.Homeservers;
-using LibMatrix.StateEventTypes.Spec;
-using MediaModeratorPoC.Bot.Interfaces;
+using LibMatrix.Utilities.Bot.Interfaces;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
@@ -39,7 +39,7 @@ public class CommandListenerHostedService : IHostedService {
_logger.LogInformation("Starting command listener!");
_hs.SyncHelper.TimelineEventHandlers.Add(async @event => {
try {
- var room = await _hs.GetRoom(@event.RoomId);
+ var room = _hs.GetRoom(@event.RoomId);
// _logger.LogInformation(eventResponse.ToJson(indent: false));
if (@event is { Type: "m.room.message", TypedContent: RoomMessageEventContent message }) {
if (message is { MessageType: "m.text" }) {
@@ -48,7 +48,7 @@ public class CommandListenerHostedService : IHostedService {
if (messageContentWithoutReply.StartsWith(_config.Prefix)) {
var command = _commands.FirstOrDefault(x => x.Name == messageContentWithoutReply.Split(' ')[0][_config.Prefix.Length..]);
if (command == null) {
- await room.SendMessageEventAsync("m.room.message",
+ await room.SendMessageEventAsync(
new RoomMessageEventContent(messageType: "m.notice", body: "Command not found!"));
return;
}
@@ -64,12 +64,12 @@ public class CommandListenerHostedService : IHostedService {
await command.Invoke(ctx);
}
catch (Exception e) {
- await room.SendMessageEventAsync("m.room.message",
+ await room.SendMessageEventAsync(
MessageFormatter.FormatException("An error occurred during the execution of this command", e));
}
}
else {
- await room.SendMessageEventAsync("m.room.message",
+ await room.SendMessageEventAsync(
new RoomMessageEventContent(messageType: "m.notice", body: "You do not have permission to run this command!"));
}
}
|
