rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor message handling to use SignedCommand

Browse source 
Updated IM and group message handling to use SignedCommand and CommandsService.RunCommand instead of direct client calls. Also updated data classes to use properties with getters and setters, and fixed casing inconsistencies in JsonCommandFormat.
This commit is contained in:
Madpeter 2025-11-16 12:00:45 +00:00
parent 80f1ce7af0
commit 4133496775
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
SecondBotEvents/Services/RabbitService.cs
View file

@ -10,6 +10,8 @@ using System.Text.Json;
using Swan;
using OpenMetaverse;
using Microsoft.Extensions.Logging.Abstractions;
using System.Text.RegularExpressions;
using SecondBotEvents.Commands;
namespace SecondBotEvents.Services
{
@ -30,9 +32,9 @@ namespace SecondBotEvents.Services
}
if (myConfig.GetLogDebug() == true)
{
LogFormater.Info($"Command Message UUID: {result.CommandName}, args: {String.Join(",", result.commandArgs)}");
LogFormater.Info($"Command Message UUID: {result.CommandName}, args: {String.Join(",", result.CommandArgs)}");
}
SignedCommand C = new(master.CommandsService, "rabbit", result.CommandName, "", result.commandArgs, 0, "", false, 0, "", false);
SignedCommand C = new(master.CommandsService, "rabbit", result.CommandName, "", result.CommandArgs, 0, "", false, 0, "", false);
master.CommandsService.RunCommand("rabbit", C, false);
}
catch (Exception E)
@ -95,12 +97,8 @@ namespace SecondBotEvents.Services
{
LogFormater.Info($"IM Message UUID: {result.UUID}, Message: {result.Message}");
}
if (UUID.TryParse(result.UUID, out UUID uuid) == false)
{
LogFormater.Warn("IM Message UUID is not valid: " + result.UUID);
return Task.CompletedTask;
}
GetClient().Self.InstantMessage(uuid, result.Message);
SignedCommand C = new SignedCommand(master.CommandsService, "rabbit", "IM", "notused", new string[] {result.UUID, result.Message }, 0, "", false, 0, "notused", false);
master.CommandsService.RunCommand("rabbit", C, false);
}
catch (Exception E)
{
@ -126,12 +124,8 @@ namespace SecondBotEvents.Services
{
LogFormater.Info($"Group Message UUID: {result.UUID}, Message: {result.Message}");
}
if (UUID.TryParse(result.UUID, out UUID uuid) == false)
{
LogFormater.Warn("Group Message UUID is not valid: " + result.UUID);
return Task.CompletedTask;
}
GetClient().Self.InstantMessageGroup(uuid, result.Message);
SignedCommand C = new SignedCommand(master.CommandsService, "rabbit", "Groupchat", "notused", new string[] { result.UUID, result.Message }, 0, "", false, 0, "notused", false);
master.CommandsService.RunCommand("rabbit", C, false);
}
catch (Exception E)
{
@ -332,21 +326,21 @@ namespace SecondBotEvents.Services
public class JsonMessageFormat
{
public string UUID;
public string Message;
public string UUID { get; set; }
public string Message { get; set; }
}
public class JsonCommandFormat
{
public string CommandName;
public string[] commandArgs;
public string CommandName { get; set; }
public string[] CommandArgs { get; set; }
}
public class JsonNotecardFormat
{
public string Name;
public string Subject;
public string Content;
public string UUID;
public string Name { get; set; }
public string Subject { get; set; }
public string Content { get; set; }
public string UUID { get; set; }
}
}