Compare commits

...

2 Commits

Author SHA1 Message Date
6764acc55f kafka messages include UAC match
All checks were successful
gitea.arg.rip/vassago/pipeline/head This commit looks good
2025-05-22 11:46:03 -04:00
072a76794e it... works?
All checks were successful
gitea.arg.rip/vassago/pipeline/head This commit looks good
2025-05-15 16:50:56 -04:00
10 changed files with 97 additions and 7 deletions

View File

@ -1,5 +1,7 @@
namespace vassago;
#pragma warning disable 4014 //the "not awaited" error
#pragma warning disable 4014
using gray_messages.chat;
using franz;//the "not awaited" error
using vassago.Behavior;
using vassago.Models;
using System;
@ -41,14 +43,19 @@ public class Behaver
public async Task<bool> ActOn(Message message)
{
var matchingUACs = Rememberer.MatchUACs(message);
var behaviorsActedOn = new List<string>();
foreach (var behavior in Behaviors)
{
if (behavior.ShouldAct(message))
//if (!behavior.ShouldAct(message, matchingUACs)) //TODO: this way
if(!behavior.ShouldAct(message))
{
behavior.ActOn(message);
message.ActedOn = true;
Console.WriteLine("acted on, moving forward");
continue;
}
behavior.ActOn(message);
message.ActedOn = true;
behaviorsActedOn.Add(behavior.ToString());
Console.WriteLine("acted on, moving forward");
}
if (message.ActedOn == false && message.MentionsMe && message.Content.Contains('?') && !Behaver.Instance.SelfAccounts.Any(acc => acc.Id == message.Author.Id))
{
@ -59,10 +66,41 @@ public class Behaver
};
await message.Channel.SendMessage(responses[Shared.r.Next(responses.Count)]);
message.ActedOn = true;
behaviorsActedOn.Add("generic question fallback");
}
Rememberer.RememberMessage(message);
ForwardToKafka(message, behaviorsActedOn, matchingUACs);
return message.ActedOn;
}
internal void ForwardToKafka(Message message, List<string> actedOnBy, List<UAC> matchingUACs)
{
var kafkaesque = new chat_message()
{
Api_Uri = Shared.API_URL,
MessageId = message.Id,
MessageContent = message.Content,
MentionsMe = message.MentionsMe,
Timestamp = message.Timestamp,
AttachmentCount = (uint)(message.Attachments?.Count() ?? 0),
AccountId = message.Author.Id,
AccountName = message.Author.DisplayName,
UserId = message.Author.IsUser.Id,
UserName = message.Author.IsUser.DisplayName,
ChannelId = message.Channel.Id,
ChannelName = message.Channel.DisplayName,
ChannelProtoocl = message.Channel.Protocol,
UAC_Matches = matchingUACs.Select(uac => uac.Id).ToList(),
BehavedOnBy = actedOnBy
};
Telefranz.Instance.ProduceMessage(kafkaesque);
}
internal bool IsSelf(Guid AccountId)
{
var acc = Rememberer.SearchAccount(a => a.Id == AccountId);

View File

@ -1,5 +1,6 @@
namespace vassago
{
using franz;
using Microsoft.EntityFrameworkCore;
using vassago;
using vassago.Models;
@ -13,9 +14,11 @@ namespace vassago
{
Shared.DBConnectionString = aspConfig["DBConnectionString"];
Shared.SetupSlashCommands = aspConfig["SetupSlashCommands"]?.ToLower() == "true";
Shared.API_URL = new Uri(aspConfig["API_URL"]);
DiscordTokens = aspConfig.GetSection("DiscordTokens").Get<IEnumerable<string>>();
TwitchConfigs = aspConfig.GetSection("TwitchConfigs").Get<IEnumerable<TwitchConfig>>();
Conversion.Converter.Load(aspConfig["ExchangePairsLocation"]);
Telefranz.Configure(aspConfig["KafkaName"], aspConfig["KafkaBootstrap"]);
vassago.Behavior.Webhook.SetupWebhooks(aspConfig.GetSection("Webhooks"));
}

31
Models/FranzMessage.cs Normal file
View File

@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using franz;
using gray_messages;
namespace gray_messages.chat
{
public class chat_message : gray_messages.message
{
//expect this to be the same every time
public Uri Api_Uri { get; set; }
public Guid MessageId { get; set; }
public string MessageContent { get; set; }
public bool MentionsMe { get; set; }
public DateTimeOffset Timestamp { get; set; }
public uint AttachmentCount { get; set; }
public Guid AccountId { get; set; }
public string AccountName { get; set; }
public Guid UserId { get; set; }
public string UserName { get; set; }
public Guid ChannelId { get; set; }
public string ChannelName { get; set; }
public string ChannelProtoocl { get; set; }
public List<Guid> UAC_Matches { get; set; }
public List<string> BehavedOnBy { get; set; }
}
}

View File

@ -23,7 +23,6 @@ public class Message
public Account Author { get; set; }
public Channel Channel { get; set; }
//TODO: these are nicities to make it OOP, but it couples them with their respective platform interfaces (and connections!)
[NonSerialized]
public Func<string, Task> Reply;

View File

@ -209,6 +209,8 @@ public class DiscordInterface
var m = Rememberer.SearchMessage(mi => mi.ExternalId == dMessage.Id.ToString() && mi.Protocol == PROTOCOL)
?? new()
{
//I don't understand why messages need to have their Ids specified but no other entity does. shrug dot emoji
Id = Guid.NewGuid(),
Protocol = PROTOCOL
};

View File

@ -291,6 +291,7 @@ public class TwitchInterface
var m = Rememberer.SearchMessage(mi => mi.ExternalId == whisperMessage.MessageId && mi.Protocol == PROTOCOL)
?? new()
{
Id = Guid.NewGuid(),
Protocol = PROTOCOL,
Timestamp = (DateTimeOffset)DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Utc)
};

View File

@ -179,6 +179,17 @@ public static class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public static List<UAC> MatchUACs(Message message)
{
var msgId = message.Id;
var accId = message.Author.Id;
var usrId = message.Author.IsUser.Id;
var chId = message.Channel.Id;
return SearchUACs(uac => uac.AccountInChannels.FirstOrDefault(aic => aic.Id == accId) != null
|| uac.Users.FirstOrDefault(usr => usr.Id == usrId) != null
|| uac.Channels.FirstOrDefault(ch => ch.Id == chId) != null);
}
public static List<UAC> SearchUACs(Expression<Func<UAC, bool>> predicate)
{
List<UAC> toReturn;

View File

@ -11,4 +11,5 @@ public static class Shared
public static string DBConnectionString { get; set; }
public static HttpClient HttpClient { get; internal set; } = new HttpClient();
public static bool SetupSlashCommands { get; set; }
public static Uri API_URL {get;set;}
}

View File

@ -21,5 +21,8 @@
"Trigger": "test",
"Uri": "http://localhost"
}
]
],
"KafkaBootstrap":"http://localhost:9092",
"KafkaName":"vassago",
"API_URL": "http://localhost:5093/api"
}

View File

@ -10,6 +10,7 @@
<ItemGroup>
<PackageReference Include="bootstrap" Version="5.3.3" />
<PackageReference Include="discord.net" Version="3.10.0" />
<PackageReference Include="greyn.franz" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>