From bf2da30c7ae9d4c15a5e22f3ee0b1bae2ca66e46 Mon Sep 17 00:00:00 2001 From: "Emma [it/its]@Rory&" Date: Wed, 24 Jan 2024 02:28:54 +0100 Subject: MessageBuilder extensions --- ExampleBots/LibMatrix.ExampleBot/Bot/MRUBot.cs | 114 --------------------- .../Bot/MRUBotConfiguration.cs | 12 --- ExampleBots/LibMatrix.ExampleBot/Bot/RMUBot.cs | 114 +++++++++++++++++++++ .../Bot/RMUBotConfiguration.cs | 12 +++ .../Bot/StartupTasks/ServerRoomSizeCalulator.cs | 4 +- ExampleBots/LibMatrix.ExampleBot/Program.cs | 4 +- LibMatrix.EventTypes/LibMatrix.EventTypes.csproj | 4 +- LibMatrix/Helpers/MessageBuilder.cs | 50 +++++++-- LibMatrix/LibMatrix.csproj | 4 +- LibMatrix/Services/ServiceInstaller.cs | 2 +- Utilities/LibMatrix.DevTestBot/Bot/DevTestBot.cs | 1 + 11 files changed, 178 insertions(+), 143 deletions(-) delete mode 100644 ExampleBots/LibMatrix.ExampleBot/Bot/MRUBot.cs delete mode 100644 ExampleBots/LibMatrix.ExampleBot/Bot/MRUBotConfiguration.cs create mode 100644 ExampleBots/LibMatrix.ExampleBot/Bot/RMUBot.cs create mode 100644 ExampleBots/LibMatrix.ExampleBot/Bot/RMUBotConfiguration.cs diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/MRUBot.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/MRUBot.cs deleted file mode 100644 index 8e6cd6a..0000000 --- a/ExampleBots/LibMatrix.ExampleBot/Bot/MRUBot.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using ArcaneLibs.Extensions; -using LibMatrix.EventTypes.Spec; -using LibMatrix.EventTypes.Spec.State; -using LibMatrix.ExampleBot.Bot.Interfaces; -using LibMatrix.Helpers; -using LibMatrix.Homeservers; -using LibMatrix.Services; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -namespace LibMatrix.ExampleBot.Bot; - -public class MRUBot : IHostedService { - private readonly HomeserverProviderService _homeserverProviderService; - private readonly ILogger _logger; - private readonly MRUBotConfiguration _configuration; - private readonly IEnumerable _commands; - - public MRUBot(HomeserverProviderService homeserverProviderService, ILogger logger, - MRUBotConfiguration configuration, IServiceProvider services) { - logger.LogInformation("{} instantiated!", this.GetType().Name); - _homeserverProviderService = homeserverProviderService; - _logger = logger; - _configuration = configuration; - _logger.LogInformation("Getting commands..."); - _commands = services.GetServices(); - _logger.LogInformation("Got {} commands!", _commands.Count()); - } - - /// Triggered when the application host is ready to start the service. - /// Indicates that the start process has been aborted. - [SuppressMessage("ReSharper", "FunctionNeverReturns")] - public async Task StartAsync(CancellationToken cancellationToken) { - Directory.GetFiles("bot_data/cache").ToList().ForEach(File.Delete); - AuthenticatedHomeserverGeneric hs; - try { - hs = await _homeserverProviderService.GetAuthenticatedWithToken(_configuration.Homeserver, - _configuration.AccessToken); - } - catch (Exception e) { - _logger.LogError("{}", e.Message); - throw; - } - - var syncHelper = new SyncHelper(hs); - - await (hs.GetRoom("!DoHEdFablOLjddKWIp:rory.gay")).JoinAsync(); - - // foreach (var room in await hs.GetJoinedRooms()) { - // if(room.RoomId is "!OGEhHVWSdvArJzumhm:matrix.org") continue; - // foreach (var stateEvent in await room.GetStateAsync>("")) { - // var _ = stateEvent.GetType; - // } - // _logger.LogInformation($"Got room state for {room.RoomId}!"); - // } - - syncHelper.InviteReceivedHandlers.Add(async Task (args) => { - var inviteEvent = - args.Value.InviteState.Events.FirstOrDefault(x => - x.Type == "m.room.member" && x.StateKey == hs.UserId); - _logger.LogInformation( - $"Got invite to {args.Key} by {inviteEvent.Sender} with reason: {(inviteEvent.TypedContent as RoomMemberEventContent).Reason}"); - if (inviteEvent.Sender.EndsWith(":rory.gay") || inviteEvent.Sender == "@mxidupwitch:the-apothecary.club") { - try { - var senderProfile = await hs.GetProfileAsync(inviteEvent.Sender); - await (hs.GetRoom(args.Key)).JoinAsync(reason: $"I was invited by {senderProfile.DisplayName ?? inviteEvent.Sender}!"); - } - catch (Exception e) { - _logger.LogError("{}", e.ToString()); - await (hs.GetRoom(args.Key)).LeaveAsync(reason: "I was unable to join the room: " + e); - } - } - }); - syncHelper.TimelineEventHandlers.Add(async @event => { - _logger.LogInformation( - "Got timeline event in {}: {}", @event.RoomId, @event.ToJson(indent: false, ignoreNull: true)); - - 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" } && message.Body.StartsWith(_configuration.Prefix)) { - var command = _commands.FirstOrDefault(x => x.Name == message.Body.Split(' ')[0][_configuration.Prefix.Length..]); - if (command == null) { - await room.SendMessageEventAsync( - new RoomMessageEventContent(messageType: "m.text", body: "Command not found!")); - return; - } - - var ctx = new CommandContext { - Room = room, - MessageEvent = @event - }; - if (await command.CanInvoke(ctx)) { - await command.Invoke(ctx); - } - else { - await room.SendMessageEventAsync( - new RoomMessageEventContent(messageType: "m.text", body: "You do not have permission to run this command!")); - } - } - } - }); - await syncHelper.RunSyncLoopAsync(cancellationToken: cancellationToken); - } - - /// Triggered when the application host is performing a graceful shutdown. - /// Indicates that the shutdown process should no longer be graceful. - public Task StopAsync(CancellationToken cancellationToken) { - _logger.LogInformation("Shutting down bot!"); - return Task.CompletedTask; - } -} diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/MRUBotConfiguration.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/MRUBotConfiguration.cs deleted file mode 100644 index dcdfc4c..0000000 --- a/ExampleBots/LibMatrix.ExampleBot/Bot/MRUBotConfiguration.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Microsoft.Extensions.Configuration; - -namespace LibMatrix.ExampleBot.Bot; - -public class MRUBotConfiguration { - public MRUBotConfiguration(IConfiguration config) { - config.GetRequiredSection("Bot").Bind(this); - } - public string Homeserver { get; set; } = ""; - public string AccessToken { get; set; } = ""; - public string Prefix { get; set; } -} diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/RMUBot.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/RMUBot.cs new file mode 100644 index 0000000..de47ec6 --- /dev/null +++ b/ExampleBots/LibMatrix.ExampleBot/Bot/RMUBot.cs @@ -0,0 +1,114 @@ +using System.Diagnostics.CodeAnalysis; +using ArcaneLibs.Extensions; +using LibMatrix.EventTypes.Spec; +using LibMatrix.EventTypes.Spec.State; +using LibMatrix.ExampleBot.Bot.Interfaces; +using LibMatrix.Helpers; +using LibMatrix.Homeservers; +using LibMatrix.Services; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace LibMatrix.ExampleBot.Bot; + +public class RMUBot : IHostedService { + private readonly HomeserverProviderService _homeserverProviderService; + private readonly ILogger _logger; + private readonly RMUBotConfiguration _configuration; + private readonly IEnumerable _commands; + + public RMUBot(HomeserverProviderService homeserverProviderService, ILogger logger, + RMUBotConfiguration configuration, IServiceProvider services) { + logger.LogInformation("{} instantiated!", this.GetType().Name); + _homeserverProviderService = homeserverProviderService; + _logger = logger; + _configuration = configuration; + _logger.LogInformation("Getting commands..."); + _commands = services.GetServices(); + _logger.LogInformation("Got {} commands!", _commands.Count()); + } + + /// Triggered when the application host is ready to start the service. + /// Indicates that the start process has been aborted. + [SuppressMessage("ReSharper", "FunctionNeverReturns")] + public async Task StartAsync(CancellationToken cancellationToken) { + Directory.GetFiles("bot_data/cache").ToList().ForEach(File.Delete); + AuthenticatedHomeserverGeneric hs; + try { + hs = await _homeserverProviderService.GetAuthenticatedWithToken(_configuration.Homeserver, + _configuration.AccessToken); + } + catch (Exception e) { + _logger.LogError("{}", e.Message); + throw; + } + + var syncHelper = new SyncHelper(hs); + + await (hs.GetRoom("!DoHEdFablOLjddKWIp:rory.gay")).JoinAsync(); + + // foreach (var room in await hs.GetJoinedRooms()) { + // if(room.RoomId is "!OGEhHVWSdvArJzumhm:matrix.org") continue; + // foreach (var stateEvent in await room.GetStateAsync>("")) { + // var _ = stateEvent.GetType; + // } + // _logger.LogInformation($"Got room state for {room.RoomId}!"); + // } + + syncHelper.InviteReceivedHandlers.Add(async Task (args) => { + var inviteEvent = + args.Value.InviteState.Events.FirstOrDefault(x => + x.Type == "m.room.member" && x.StateKey == hs.UserId); + _logger.LogInformation( + $"Got invite to {args.Key} by {inviteEvent.Sender} with reason: {(inviteEvent.TypedContent as RoomMemberEventContent).Reason}"); + if (inviteEvent.Sender.EndsWith(":rory.gay") || inviteEvent.Sender == "@mxidupwitch:the-apothecary.club") { + try { + var senderProfile = await hs.GetProfileAsync(inviteEvent.Sender); + await (hs.GetRoom(args.Key)).JoinAsync(reason: $"I was invited by {senderProfile.DisplayName ?? inviteEvent.Sender}!"); + } + catch (Exception e) { + _logger.LogError("{}", e.ToString()); + await (hs.GetRoom(args.Key)).LeaveAsync(reason: "I was unable to join the room: " + e); + } + } + }); + syncHelper.TimelineEventHandlers.Add(async @event => { + _logger.LogInformation( + "Got timeline event in {}: {}", @event.RoomId, @event.ToJson(indent: false, ignoreNull: true)); + + 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" } && message.Body.StartsWith(_configuration.Prefix)) { + var command = _commands.FirstOrDefault(x => x.Name == message.Body.Split(' ')[0][_configuration.Prefix.Length..]); + if (command == null) { + await room.SendMessageEventAsync( + new RoomMessageEventContent(messageType: "m.text", body: "Command not found!")); + return; + } + + var ctx = new CommandContext { + Room = room, + MessageEvent = @event + }; + if (await command.CanInvoke(ctx)) { + await command.Invoke(ctx); + } + else { + await room.SendMessageEventAsync( + new RoomMessageEventContent(messageType: "m.text", body: "You do not have permission to run this command!")); + } + } + } + }); + await syncHelper.RunSyncLoopAsync(cancellationToken: cancellationToken); + } + + /// Triggered when the application host is performing a graceful shutdown. + /// Indicates that the shutdown process should no longer be graceful. + public Task StopAsync(CancellationToken cancellationToken) { + _logger.LogInformation("Shutting down bot!"); + return Task.CompletedTask; + } +} diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/RMUBotConfiguration.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/RMUBotConfiguration.cs new file mode 100644 index 0000000..9edc4bd --- /dev/null +++ b/ExampleBots/LibMatrix.ExampleBot/Bot/RMUBotConfiguration.cs @@ -0,0 +1,12 @@ +using Microsoft.Extensions.Configuration; + +namespace LibMatrix.ExampleBot.Bot; + +public class RMUBotConfiguration { + public RMUBotConfiguration(IConfiguration config) { + config.GetRequiredSection("Bot").Bind(this); + } + public string Homeserver { get; set; } = ""; + public string AccessToken { get; set; } = ""; + public string Prefix { get; set; } +} diff --git a/ExampleBots/LibMatrix.ExampleBot/Bot/StartupTasks/ServerRoomSizeCalulator.cs b/ExampleBots/LibMatrix.ExampleBot/Bot/StartupTasks/ServerRoomSizeCalulator.cs index 2f6e0b0..0645668 100644 --- a/ExampleBots/LibMatrix.ExampleBot/Bot/StartupTasks/ServerRoomSizeCalulator.cs +++ b/ExampleBots/LibMatrix.ExampleBot/Bot/StartupTasks/ServerRoomSizeCalulator.cs @@ -10,11 +10,11 @@ namespace LibMatrix.ExampleBot.Bot.StartupTasks; public class ServerRoomSizeCalulator : IHostedService { private readonly HomeserverProviderService _homeserverProviderService; private readonly ILogger _logger; - private readonly MRUBotConfiguration _configuration; + private readonly RMUBotConfiguration _configuration; private readonly IEnumerable _commands; public ServerRoomSizeCalulator(HomeserverProviderService homeserverProviderService, ILogger logger, - MRUBotConfiguration configuration, IServiceProvider services) { + RMUBotConfiguration configuration, IServiceProvider services) { logger.LogInformation("Server room size calculator hosted service instantiated!"); _homeserverProviderService = homeserverProviderService; _logger = logger; diff --git a/ExampleBots/LibMatrix.ExampleBot/Program.cs b/ExampleBots/LibMatrix.ExampleBot/Program.cs index 25ce07d..86d7598 100644 --- a/ExampleBots/LibMatrix.ExampleBot/Program.cs +++ b/ExampleBots/LibMatrix.ExampleBot/Program.cs @@ -16,7 +16,7 @@ var host = Host.CreateDefaultBuilder(args).ConfigureServices((_, services) => { dataStorageProvider: new FileStorageProvider("bot_data/data/") ) ); - services.AddScoped(); + services.AddScoped(); services.AddRoryLibMatrixServices(); foreach (var commandClass in new ClassCollector().ResolveFromAllAccessibleAssemblies()) { Console.WriteLine($"Adding command {commandClass.Name}"); @@ -24,7 +24,7 @@ var host = Host.CreateDefaultBuilder(args).ConfigureServices((_, services) => { } // services.AddHostedService(); - services.AddHostedService(); + services.AddHostedService(); }).UseConsoleLifetime().Build(); await host.RunAsync(); diff --git a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj index a242125..1c38825 100644 --- a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj +++ b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj @@ -11,8 +11,8 @@ + If you want to use a time-appropriate version of the library, recursively clone https://cgit.rory.gay/matrix/MatrixUtils.git + instead, since this will be locked by the MatrixUtils project, which contains both LibMatrix and ArcaneLibs as a submodule. --> diff --git a/LibMatrix/Helpers/MessageBuilder.cs b/LibMatrix/Helpers/MessageBuilder.cs index 7715462..250187a 100644 --- a/LibMatrix/Helpers/MessageBuilder.cs +++ b/LibMatrix/Helpers/MessageBuilder.cs @@ -11,6 +11,37 @@ public class MessageBuilder(string msgType = "m.text", string format = "org.matr public RoomMessageEventContent Build() => Content; + public MessageBuilder WithBody(string body) { + Content.Body += body; + Content.FormattedBody += body; + return this; + } + + public MessageBuilder WithHtmlTag(string tag, string body, Dictionary? attributes = null) { + Content.Body += body; + Content.FormattedBody += $"<{tag}"; + if (attributes != null) { + foreach (var (key, value) in attributes) { + Content.FormattedBody += $" {key}=\"{value}\""; + } + } + Content.FormattedBody += $">{body}"; + return this; + } + + public MessageBuilder WithHtmlTag(string tag, Action bodyBuilder, Dictionary? attributes = null) { + Content.FormattedBody += $"<{tag}"; + if (attributes != null) { + foreach (var (key, value) in attributes) { + Content.FormattedBody += $" {key}=\"{value}\""; + } + } + Content.FormattedBody += ">"; + bodyBuilder(this); + Content.FormattedBody += $""; + return this; + } + public MessageBuilder WithColoredBody(string color, string body) { Content.Body += body; Content.FormattedBody += $"{body}"; @@ -25,14 +56,17 @@ public class MessageBuilder(string msgType = "m.text", string format = "org.matr } public MessageBuilder WithRainbowString(string text, byte skip = 1, int offset = 0, double lengthFactor = 255.0, bool useLength = true) { - if (useLength) { - lengthFactor = text.Length; - } - RainbowEnumerator enumerator = new(skip, offset, lengthFactor); - for (int i = 0; i < text.Length; i++) { - var (r, g, b) = enumerator.Next(); - Content.FormattedBody += $"{text[i]}"; - } + // if (useLength) { + // lengthFactor = text.Length; + // } + // HslaColorInterpolator interpolator = new((0, 255, 128, 255), (255, 255, 128, 255)); + // // RainbowEnumerator enumerator = new(skip, offset, lengthFactor); + // for (int i = 0; i < text.Length; i++) { + // // var (r, g, b) = enumerator.Next(); + // // var (r,g,b,a) = interpolator.Interpolate((i+offset) * skip, lengthFactor).ToRgba(); + // // Console.WriteLine($"RBA: {r} {g} {b} {a}"); + // // Content.FormattedBody += $"{text[i]}"; + // } return this; } diff --git a/LibMatrix/LibMatrix.csproj b/LibMatrix/LibMatrix.csproj index a2ee327..16e43f5 100644 --- a/LibMatrix/LibMatrix.csproj +++ b/LibMatrix/LibMatrix.csproj @@ -21,8 +21,8 @@ + If you want to use a time-appropriate version of the library, recursively clone https://cgit.rory.gay/matrix/MatrixUtils.git + instead, since this will be locked by the MatrixUtils project, which contains both LibMatrix and ArcaneLibs as a submodule. --> diff --git a/LibMatrix/Services/ServiceInstaller.cs b/LibMatrix/Services/ServiceInstaller.cs index ad5bedc..358dc2a 100644 --- a/LibMatrix/Services/ServiceInstaller.cs +++ b/LibMatrix/Services/ServiceInstaller.cs @@ -7,7 +7,7 @@ public static class ServiceInstaller { public static IServiceCollection AddRoryLibMatrixServices(this IServiceCollection services, RoryLibMatrixConfiguration? config = null) { //Check required services // if (!services.Any(x => x.ServiceType == typeof(TieredStorageService))) - // throw new Exception("[MRUCore/DI] No TieredStorageService has been registered!"); + // throw new Exception("[RMUCore/DI] No TieredStorageService has been registered!"); //Add config services.AddSingleton(config ?? new RoryLibMatrixConfiguration()); diff --git a/Utilities/LibMatrix.DevTestBot/Bot/DevTestBot.cs b/Utilities/LibMatrix.DevTestBot/Bot/DevTestBot.cs index b2f597c..678df27 100644 --- a/Utilities/LibMatrix.DevTestBot/Bot/DevTestBot.cs +++ b/Utilities/LibMatrix.DevTestBot/Bot/DevTestBot.cs @@ -44,6 +44,7 @@ public class DevTestBot : IHostedService { throw; } + var msg = new MessageBuilder().WithRainbowString("Meanwhile, I'm sitting here, still struggling with trying to rainbow. ^^'").Build(); var res = await hs.ResolveRoomAliasAsync("#watercooler:maunium.net"); var syncHelper = new SyncHelper(hs); -- cgit 1.4.1