greyn/vassago
greyn/vassago
2
1
Fork 0
forked from adam/discord-bot-shtik
Code Issues 36 Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: greyn:unified-configuration
Branches Tags
greyn:master
greyn:unified-configuration
greyn:release
greyn:internalAPI
adam:multiplatform
adam:master
greyn:1.0
greyn:test-release-2
greyn:test-release
adam:test-release
adam:test-release-2
..
compare: greyn:master
Branches Tags
greyn:unified-configuration
greyn:master
greyn:release
greyn:internalAPI
adam:multiplatform
adam:master
greyn:1.0
greyn:test-release-2
greyn:test-release
adam:test-release
adam:test-release-2

No commits in common. "unified-configuration" and "master" have entirely different histories.
unified-co ... master

25 changed files with 194 additions and 1220 deletions
Show Stats Expand all files Collapse all files

29
Behaver.cs
View File

@ -17,7 +17,6 @@ public class Behaver
private List<Account> SelfAccounts { get; set; } = new List<Account>();
private User SelfUser { get; set; }
public static List<vassago.Behavior.Behavior> Behaviors { get; private set; } = new List<vassago.Behavior.Behavior>();
private static Rememberer r = Rememberer.Instance;
internal Behaver()
{
var subtypes = AppDomain.CurrentDomain.GetAssemblies()
@ -45,7 +44,7 @@ public class Behaver
public async Task<bool> ActOn(Message message)
{
//TODO: this is yet another hit to the database, and a big one. cache them in memory! there needs to be a feasibly-viewable amount, anyway.
var matchingUACs = r.MatchUACs(message);
var matchingUACs = Rememberer.MatchUACs(message);
message.TranslatedContent = message.Content;
foreach (var uacMatch in matchingUACs)
{
@ -80,7 +79,7 @@ public class Behaver
message.ActedOn = true;
behaviorsActedOn.Add("generic question fallback");
}
r.RememberMessage(message);
Rememberer.RememberMessage(message);
ForwardToKafka(message, behaviorsActedOn, matchingUACs);
return message.ActedOn;
}
@ -118,7 +117,7 @@ public class Behaver
internal bool IsSelf(Guid AccountId)
{
var acc = r.SearchAccount(a => a.Id == AccountId);
var acc = Rememberer.SearchAccount(a => a.Id == AccountId);
return SelfAccounts.Any(acc => acc.Id == AccountId);
}
@ -133,8 +132,8 @@ public class Behaver
{
CollapseUsers(SelfUser, selfAccount.IsUser);
}
SelfAccounts = r.SearchAccounts(a => a.IsUser == SelfUser);
r.RememberAccount(selfAccount);
SelfAccounts = Rememberer.SearchAccounts(a => a.IsUser == SelfUser);
Rememberer.RememberAccount(selfAccount);
}
public bool CollapseUsers(User primary, User secondary)
@ -148,18 +147,18 @@ public class Behaver
a.IsUser = primary;
}
secondary.Accounts.Clear();
var uacs = r.SearchUACs(u => u.Users.FirstOrDefault(u => u.Id == secondary.Id) != null);
var uacs = Rememberer.SearchUACs(u => u.Users.FirstOrDefault(u => u.Id == secondary.Id) != null);
if (uacs.Count() > 0)
{
foreach (var uac in uacs)
{
uac.Users.RemoveAll(u => u.Id == secondary.Id);
uac.Users.Add(primary);
r.RememberUAC(uac);
Rememberer.RememberUAC(uac);
}
}
r.ForgetUser(secondary);
r.RememberUser(primary);
Rememberer.ForgetUser(secondary);
Rememberer.RememberUser(primary);
return true;
}
private ProtocolInterface fetchInterface(Channel ch)
@ -178,7 +177,7 @@ public class Behaver
}
public async Task<int> SendMessage(Guid channelId, string text)
{
var channel = r.ChannelDetail(channelId);
var channel = Rememberer.ChannelDetail(channelId);
if (channel == null)
return 404;
var iprotocol = fetchInterface(channel);
@ -190,7 +189,7 @@ public class Behaver
public async Task<int> React(Guid messageId, string reaction)
{
Console.WriteLine($"sanity check: behaver is reacting, {messageId}, {reaction}");
var message = r.MessageDetail(messageId);
var message = Rememberer.MessageDetail(messageId);
if (message == null)
{
Console.Error.WriteLine($"message {messageId} not found");
@ -213,7 +212,7 @@ public class Behaver
}
public async Task<int> Reply(Guid messageId, string text)
{
var message = r.MessageDetail(messageId);
var message = Rememberer.MessageDetail(messageId);
if (message == null)
{
Console.WriteLine($"message {messageId} not found");
@ -229,7 +228,7 @@ public class Behaver
}
public async Task<int> SendFile(Guid channelId, string path, string accompanyingText)
{
var channel = r.ChannelDetail(channelId);
var channel = Rememberer.ChannelDetail(channelId);
if (channel == null)
return 404;
var iprotocol = fetchInterface(channel);
@ -240,7 +239,7 @@ public class Behaver
}
public async Task<int> SendFile(Guid channelId, string base64dData, string filename, string accompanyingText)
{
var channel = r.ChannelDetail(channelId);
var channel = Rememberer.ChannelDetail(channelId);
if (channel == null)
return 404;
var iprotocol = fetchInterface(channel);

1
Behavior/Behavior.cs
View File

@ -12,7 +12,6 @@ public abstract class Behavior
{
//recommendation: set up your UACs in your constructor.
public abstract Task<bool> ActOn(Message message);
protected static Rememberer rememberer = Rememberer.Instance;
public virtual bool ShouldAct(Message message, List<UAC> matchedUACs)
{

4
Behavior/Ripcord.cs
View File

@ -16,7 +16,7 @@ public class Ripcord: Behavior
public Ripcord()
{
myUAC = rememberer.SearchUAC(uac => uac.OwnerId == uacID);
myUAC = Rememberer.SearchUAC(uac => uac.OwnerId == uacID);
if (myUAC == null)
{
myUAC = new()
@ -26,7 +26,7 @@ public class Ripcord: Behavior
Description = @"matching this means you can tell the bot to shutdown, now"
};
}
rememberer.RememberUAC(myUAC);
Rememberer.RememberUAC(myUAC);
}
public override bool ShouldAct(Message message, List<UAC> matchedUACs)
{

4
Behavior/TwitchSummon.cs
View File

@ -16,7 +16,7 @@ public class TwitchSummon : Behavior
public TwitchSummon()
{
myUAC = rememberer.SearchUAC(uac => uac.OwnerId == uacID);
myUAC = Rememberer.SearchUAC(uac => uac.OwnerId == uacID);
if (myUAC == null)
{
myUAC = new()
@ -26,7 +26,7 @@ public class TwitchSummon : Behavior
Description = @"matching this means you can summon the bot <i>to</i> <b>any</b> twitch channel"
};
}
rememberer.RememberUAC(myUAC);
Rememberer.RememberUAC(myUAC);
}
internal static TwitchInterface.TwitchInterface getAnyTwitchInterface()
{

24
Behavior/Webhook.cs
View File

@ -10,7 +10,6 @@ using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using vassago.Models;
using Newtonsoft.Json;
[StaticPlz]
public class Webhook : Behavior
@ -25,15 +24,20 @@ public class Webhook : Behavior
private ConcurrentDictionary<Guid, WebhookActionOrder> authedCache = new ConcurrentDictionary<Guid, WebhookActionOrder>();
private HttpClient hc = new HttpClient();
public static void SetupWebhooks(IEnumerable<string> confSection)
public static void SetupWebhooks(IConfigurationSection confSection)
{
//configuredWebhooks = confSection.Get<List<vassago.Behavior.WebhookConf>>();
if(confSection != null) foreach (var confLine in confSection)
configuredWebhooks = confSection.Get<List<vassago.Behavior.WebhookConf>>();
foreach (var conf in configuredWebhooks)
{
var conf = JsonConvert.DeserializeObject<WebhookConf>(confLine);
var confName = $"Webhook: {conf.Trigger}";
Console.WriteLine($"confName: {confName}; conf.uri: {conf.Uri}, conf.uacID: {conf.uacID}, conf.Method: {conf.Method}, conf.Headers: {conf.Headers?.Count() ?? 0}, conf.Content: {conf.Content}");
foreach (var kvp in conf.Headers)
{
Console.WriteLine($"{kvp[0]}: {kvp[1]}");
}
var changed = false;
var myUAC = rememberer.SearchUAC(uac => uac.OwnerId == conf.uacID);
var myUAC = Rememberer.SearchUAC(uac => uac.OwnerId == conf.uacID);
if (myUAC == null)
{
myUAC = new()
@ -43,7 +47,7 @@ public class Webhook : Behavior
Description = conf.Description
};
changed = true;
rememberer.RememberUAC(myUAC);
Rememberer.RememberUAC(myUAC);
}
else
{
@ -59,7 +63,7 @@ public class Webhook : Behavior
}
}
if (changed)
rememberer.RememberUAC(myUAC);
Rememberer.RememberUAC(myUAC);
}
}
@ -84,7 +88,7 @@ public class Webhook : Behavior
{
var webhookableMessageContent = message.Content.Substring(message.Content.IndexOf(triggerTarget) + triggerTarget.Length + 1);
Console.WriteLine($"webhookable content: {webhookableMessageContent}");
var uacConf = rememberer.SearchUAC(uac => uac.OwnerId == wh.uacID);
var uacConf = Rememberer.SearchUAC(uac => uac.OwnerId == wh.uacID);
if (uacConf.Users.Contains(message.Author.IsUser) || uacConf.Channels.Contains(message.Channel) || uacConf.AccountInChannels.Contains(message.Author))
{
Console.WriteLine("webhook UAC passed, preparing WebhookActionOrder");
@ -186,7 +190,7 @@ public class WebhookConf
public Uri Uri { get; set; }
//public HttpMethod Method { get; set; }
public Enumerations.HttpVerb Method { get; set; }
public List<string> Headers { get; set; }
public List<List<string>> Headers { get; set; }
public string Content { get; set; }
public string Description { get; set; }
}

52
ConsoleService.cs
View File

@ -7,17 +7,24 @@ namespace vassago
using vassago.TwitchInterface;
using vassago.ProtocolInterfaces.DiscordInterface;
using System.Runtime.CompilerServices;
using Newtonsoft.Json;
internal class ConsoleService : BackgroundService
{
public ConsoleService(IConfiguration aspConfig)
{
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"]);
Console.WriteLine($"Telefranz.Configure({aspConfig["KafkaName"]}, {aspConfig["KafkaBootstrap"]});");
vassago.Behavior.Webhook.SetupWebhooks(aspConfig.GetSection("Webhooks"));
}
List<string> DiscordTokens;
List<TwitchConfig> TwitchConfigs;
IEnumerable<string> DiscordTokens { get; }
IEnumerable<TwitchConfig> TwitchConfigs { get; }
protected override async Task ExecuteAsync(CancellationToken cancellationToken)
{
@ -25,31 +32,14 @@ namespace vassago
var dbc = new ChattingContext();
await dbc.Database.MigrateAsync(cancellationToken);
var confEntity = dbc.Configurations.FirstOrDefault() ?? new Configuration();
if (dbc.Configurations.Count() == 0)
{
dbc.Configurations.Add(confEntity);
dbc.SaveChanges();
}
dbConfig(ref confEntity);
if (DiscordTokens?.Any() ?? false)
foreach (var dt in DiscordTokens)
{
var d = new DiscordInterface();
initTasks.Add(Task.Run(() =>
{
try
{
d.Init(dt);
Shared.ProtocolList.Add(d);
}
catch (Exception e){
Console.Error.WriteLine($"couldn't initialize discord interface with token {dt}");
Console.Error.WriteLine(e);
}
}));
initTasks.Add(d.Init(dt));
Shared.ProtocolList.Add(d);
}
if (TwitchConfigs?.Any() ?? false)
foreach (var tc in TwitchConfigs)
{
@ -59,21 +49,7 @@ namespace vassago
}
Task.WaitAll(initTasks.ToArray(), cancellationToken);
Console.WriteLine("init tasks are done");
}
private void dbConfig(ref vassago.Models.Configuration confEntity)
{
Shared.SetupSlashCommands = confEntity.SetupDiscordSlashCommands;
Shared.API_URL = new Uri(confEntity.reportedApiUrl);
DiscordTokens = confEntity.DiscordTokens;
TwitchConfigs = new List<TwitchConfig>();
if (confEntity.TwitchConfigs != null) foreach (var twitchConfString in confEntity.TwitchConfigs)
{
TwitchConfigs.Add(JsonConvert.DeserializeObject<TwitchConfig>(twitchConfString));
}
Conversion.Converter.Load(confEntity.ExchangePairsLocation);
Telefranz.Configure(confEntity.KafkaName, confEntity.KafkaBootstrap);
vassago.Behavior.Webhook.SetupWebhooks(confEntity.Webhooks);
}
}
}

427
Migrations/20250628034005_ConfigInDatabase.Designer.cs generated
View File

@ -1,427 +0,0 @@
// <auto-generated />
using System;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using vassago.Models;
#nullable disable
namespace vassago.Migrations
{
[DbContext(typeof(ChattingContext))]
[Migration("20250628034005_ConfigInDatabase")]
partial class ConfigInDatabase
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.5")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "hstore");
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("AccountUAC", b =>
{
b.Property<Guid>("AccountInChannelsId")
.HasColumnType("uuid");
b.Property<Guid>("UACsId")
.HasColumnType("uuid");
b.HasKey("AccountInChannelsId", "UACsId");
b.HasIndex("UACsId");
b.ToTable("AccountUAC");
});
modelBuilder.Entity("ChannelUAC", b =>
{
b.Property<Guid>("ChannelsId")
.HasColumnType("uuid");
b.Property<Guid>("UACsId")
.HasColumnType("uuid");
b.HasKey("ChannelsId", "UACsId");
b.HasIndex("UACsId");
b.ToTable("ChannelUAC");
});
modelBuilder.Entity("UACUser", b =>
{
b.Property<Guid>("UACsId")
.HasColumnType("uuid");
b.Property<Guid>("UsersId")
.HasColumnType("uuid");
b.HasKey("UACsId", "UsersId");
b.HasIndex("UsersId");
b.ToTable("UACUser");
});
modelBuilder.Entity("vassago.Models.Account", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("DisplayName")
.HasColumnType("text");
b.Property<string>("ExternalId")
.HasColumnType("text");
b.Property<bool>("IsBot")
.HasColumnType("boolean");
b.Property<Guid?>("IsUserId")
.HasColumnType("uuid");
b.Property<string>("Protocol")
.HasColumnType("text");
b.Property<Guid?>("SeenInChannelId")
.HasColumnType("uuid");
b.Property<string>("Username")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("IsUserId");
b.HasIndex("SeenInChannelId");
b.ToTable("Accounts");
});
modelBuilder.Entity("vassago.Models.Attachment", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<byte[]>("Content")
.HasColumnType("bytea");
b.Property<string>("ContentType")
.HasColumnType("text");
b.Property<string>("Description")
.HasColumnType("text");
b.Property<decimal?>("ExternalId")
.HasColumnType("numeric(20,0)");
b.Property<string>("Filename")
.HasColumnType("text");
b.Property<Guid?>("MessageId")
.HasColumnType("uuid");
b.Property<int>("Size")
.HasColumnType("integer");
b.Property<string>("Source")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("MessageId");
b.ToTable("Attachments");
});
modelBuilder.Entity("vassago.Models.Channel", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<int>("ChannelType")
.HasColumnType("integer");
b.Property<string>("DisplayName")
.HasColumnType("text");
b.Property<string>("ExternalId")
.HasColumnType("text");
b.Property<int?>("LewdnessFilterLevel")
.HasColumnType("integer");
b.Property<bool?>("LinksAllowed")
.HasColumnType("boolean");
b.Property<decimal?>("MaxAttachmentBytes")
.HasColumnType("numeric(20,0)");
b.Property<long?>("MaxTextChars")
.HasColumnType("bigint");
b.Property<int?>("MeannessFilterLevel")
.HasColumnType("integer");
b.Property<Guid?>("ParentChannelId")
.HasColumnType("uuid");
b.Property<string>("Protocol")
.HasColumnType("text");
b.Property<bool?>("ReactionsPossible")
.HasColumnType("boolean");
b.HasKey("Id");
b.HasIndex("ParentChannelId");
b.ToTable("Channels");
});
modelBuilder.Entity("vassago.Models.Configuration", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<List<string>>("DiscordTokens")
.HasColumnType("text[]");
b.Property<string>("ExchangePairsLocation")
.HasColumnType("text");
b.Property<string>("KafkaBootstrap")
.HasColumnType("text");
b.Property<string>("KafkaName")
.HasColumnType("text");
b.Property<bool>("SetupDiscordSlashCommands")
.HasColumnType("boolean");
b.Property<List<string>>("TwitchConfigs")
.HasColumnType("text[]");
b.Property<List<string>>("Webhooks")
.HasColumnType("text[]");
b.Property<string>("reportedApiUrl")
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Configurations");
});
modelBuilder.Entity("vassago.Models.Message", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<bool>("ActedOn")
.HasColumnType("boolean");
b.Property<Guid?>("AuthorId")
.HasColumnType("uuid");
b.Property<Guid?>("ChannelId")
.HasColumnType("uuid");
b.Property<string>("Content")
.HasColumnType("text");
b.Property<string>("ExternalId")
.HasColumnType("text");
b.Property<bool>("MentionsMe")
.HasColumnType("boolean");
b.Property<string>("Protocol")
.HasColumnType("text");
b.Property<DateTimeOffset>("Timestamp")
.HasColumnType("timestamp with time zone");
b.Property<string>("TranslatedContent")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("AuthorId");
b.HasIndex("ChannelId");
b.ToTable("Messages");
});
modelBuilder.Entity("vassago.Models.UAC", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<Dictionary<string, string>>("CommandAlterations")
.HasColumnType("hstore");
b.Property<string>("Description")
.HasColumnType("text");
b.Property<string>("DisplayName")
.HasColumnType("text");
b.Property<Guid>("OwnerId")
.HasColumnType("uuid");
b.Property<Dictionary<string, string>>("Translations")
.HasColumnType("hstore");
b.HasKey("Id");
b.ToTable("UACs");
});
modelBuilder.Entity("vassago.Models.User", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.HasKey("Id");
b.ToTable("Users");
});
modelBuilder.Entity("AccountUAC", b =>
{
b.HasOne("vassago.Models.Account", null)
.WithMany()
.HasForeignKey("AccountInChannelsId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("vassago.Models.UAC", null)
.WithMany()
.HasForeignKey("UACsId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("ChannelUAC", b =>
{
b.HasOne("vassago.Models.Channel", null)
.WithMany()
.HasForeignKey("ChannelsId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("vassago.Models.UAC", null)
.WithMany()
.HasForeignKey("UACsId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("UACUser", b =>
{
b.HasOne("vassago.Models.UAC", null)
.WithMany()
.HasForeignKey("UACsId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("vassago.Models.User", null)
.WithMany()
.HasForeignKey("UsersId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("vassago.Models.Account", b =>
{
b.HasOne("vassago.Models.User", "IsUser")
.WithMany("Accounts")
.HasForeignKey("IsUserId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("vassago.Models.Channel", "SeenInChannel")
.WithMany("Users")
.HasForeignKey("SeenInChannelId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("IsUser");
b.Navigation("SeenInChannel");
});
modelBuilder.Entity("vassago.Models.Attachment", b =>
{
b.HasOne("vassago.Models.Message", "Message")
.WithMany("Attachments")
.HasForeignKey("MessageId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("Message");
});
modelBuilder.Entity("vassago.Models.Channel", b =>
{
b.HasOne("vassago.Models.Channel", "ParentChannel")
.WithMany("SubChannels")
.HasForeignKey("ParentChannelId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("ParentChannel");
});
modelBuilder.Entity("vassago.Models.Message", b =>
{
b.HasOne("vassago.Models.Account", "Author")
.WithMany()
.HasForeignKey("AuthorId");
b.HasOne("vassago.Models.Channel", "Channel")
.WithMany("Messages")
.HasForeignKey("ChannelId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("Author");
b.Navigation("Channel");
});
modelBuilder.Entity("vassago.Models.Channel", b =>
{
b.Navigation("Messages");
b.Navigation("SubChannels");
b.Navigation("Users");
});
modelBuilder.Entity("vassago.Models.Message", b =>
{
b.Navigation("Attachments");
});
modelBuilder.Entity("vassago.Models.User", b =>
{
b.Navigation("Accounts");
});
#pragma warning restore 612, 618
}
}
}

42
Migrations/20250628034005_ConfigInDatabase.cs
View File

@ -1,42 +0,0 @@
using System;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace vassago.Migrations
{
/// <inheritdoc />
public partial class ConfigInDatabase : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Configurations",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
DiscordTokens = table.Column<List<string>>(type: "text[]", nullable: true),
TwitchConfigs = table.Column<List<string>>(type: "text[]", nullable: true),
ExchangePairsLocation = table.Column<string>(type: "text", nullable: true),
SetupDiscordSlashCommands = table.Column<bool>(type: "boolean", nullable: false),
Webhooks = table.Column<List<string>>(type: "text[]", nullable: true),
KafkaBootstrap = table.Column<string>(type: "text", nullable: true),
KafkaName = table.Column<string>(type: "text", nullable: true),
reportedApiUrl = table.Column<string>(type: "text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Configurations", x => x.Id);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Configurations");
}
}
}

35
Migrations/ChattingContextModelSnapshot.cs
View File

@ -188,41 +188,6 @@ namespace vassago.Migrations
b.ToTable("Channels");
});
modelBuilder.Entity("vassago.Models.Configuration", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<List<string>>("DiscordTokens")
.HasColumnType("text[]");
b.Property<string>("ExchangePairsLocation")
.HasColumnType("text");
b.Property<string>("KafkaBootstrap")
.HasColumnType("text");
b.Property<string>("KafkaName")
.HasColumnType("text");
b.Property<bool>("SetupDiscordSlashCommands")
.HasColumnType("boolean");
b.Property<List<string>>("TwitchConfigs")
.HasColumnType("text[]");
b.Property<List<string>>("Webhooks")
.HasColumnType("text[]");
b.Property<string>("reportedApiUrl")
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Configurations");
});
modelBuilder.Entity("vassago.Models.Message", b =>
{
b.Property<Guid>("Id")

1
Models/ChattingContext.cs
View File

@ -11,7 +11,6 @@ public class ChattingContext : DbContext
public DbSet<Message> Messages { get; set; }
public DbSet<Account> Accounts { get; set; }
public DbSet<User> Users { get; set; }
public DbSet<Configuration> Configurations {get; set;}
public ChattingContext(DbContextOptions<ChattingContext> options) : base(options) { }
public ChattingContext() : base() { }

28
Models/Configuration.cs
View File

@ -1,28 +0,0 @@
namespace vassago.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Reflection;
using System.Threading.Tasks;
using Discord.WebSocket;
using Microsoft.EntityFrameworkCore;
using vassago.TwitchInterface;
using vassago.Behavior;
//TODO: it feels gross to have a *table* in a database that's intended to hold 1 **UND EXACTLY ONE** row, ever.
//but also it feels worse to scatter my configuraiton-y data across external files and the database.
public class Configuration
{
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public Guid Id { get; set; }
public List<string> DiscordTokens { get; set; }
public List<string> TwitchConfigs { get; set; }
public string ExchangePairsLocation { get; set; } = "assets/exchangepairs.json"; //TODO: have this be "exchange API key", so you can have it continually update.
public bool SetupDiscordSlashCommands { get; set; } = false; //i'm kind of idealogically opposed to these.
public List<string> Webhooks { get; set; }
public string KafkaBootstrap { get; set; } = "http://localhost:9092";
public string KafkaName { get; set; } = "vassago";
public string reportedApiUrl { get; set; } = "http://localhost:5093/api";
}

45
ProtocolInterfaces/DiscordInterface/DiscordInterface.cs
View File

@ -28,13 +28,10 @@ public class DiscordInterface : ProtocolInterface
private static readonly SemaphoreSlim discordChannelSetup = new(1, 1);
private Channel protocolAsChannel;
public override Channel SelfChannel { get => protocolAsChannel; }
private static Rememberer r = Rememberer.Instance;
public async Task Init(string config)
{
var token = config;
Console.WriteLine($"going to validate token {token}");
Discord.TokenUtils.ValidateToken(TokenType.Bot, token);//throws an exception if invalid
await SetupDiscordChannel();
client = new DiscordSocketClient(new DiscordSocketConfig() { GatewayIntents = GatewayIntents.All });
@ -43,18 +40,12 @@ public class DiscordInterface : ProtocolInterface
Console.WriteLine(msg.ToString());
return Task.CompletedTask;
};
client.Connected += this.SelfConnected;
client.Disconnected += this.ClientDisconnected;
client.Ready += this.ClientReady;
client.Connected += () => Task.Run(SelfConnected);
client.Ready += () => Task.Run(ClientReady);
await client.LoginAsync(TokenType.Bot, token);
await client.StartAsync();
}
private async Task ClientDisconnected(Exception e)
{
Console.WriteLine("client disconnected!");
Console.WriteLine(e?.Message);
}
private async Task SetupDiscordChannel()
{
@ -62,7 +53,7 @@ public class DiscordInterface : ProtocolInterface
try
{
protocolAsChannel = r.SearchChannel(c => c.ParentChannel == null && c.Protocol == Protocol);
protocolAsChannel = Rememberer.SearchChannel(c => c.ParentChannel == null && c.Protocol == Protocol);
if (protocolAsChannel == null)
{
protocolAsChannel = new Channel()
@ -84,7 +75,7 @@ public class DiscordInterface : ProtocolInterface
Console.WriteLine($"discord, channel with id {protocolAsChannel.Id}, already exists");
}
protocolAsChannel.DisplayName = "discord (itself)";
protocolAsChannel = r.RememberChannel(protocolAsChannel);
protocolAsChannel = Rememberer.RememberChannel(protocolAsChannel);
Console.WriteLine($"protocol as channel addeed; {protocolAsChannel}");
}
finally
@ -201,7 +192,7 @@ public class DiscordInterface : ProtocolInterface
}
internal static vassago.Models.Attachment UpsertAttachment(IAttachment dAttachment)
{
var a = r.SearchAttachment(ai => ai.ExternalId == dAttachment.Id)
var a = Rememberer.SearchAttachment(ai => ai.ExternalId == dAttachment.Id)
?? new vassago.Models.Attachment();
a.ContentType = dAttachment.ContentType;
@ -209,12 +200,12 @@ public class DiscordInterface : ProtocolInterface
a.Filename = dAttachment.Filename;
a.Size = dAttachment.Size;
a.Source = new Uri(dAttachment.Url);
r.RememberAttachment(a);
Rememberer.RememberAttachment(a);
return a;
}
internal Message UpsertMessage(IUserMessage dMessage)
{
var m = r.SearchMessage(mi => mi.ExternalId == dMessage.Id.ToString() && mi.Protocol == Protocol)
var m = Rememberer.SearchMessage(mi => mi.ExternalId == dMessage.Id.ToString() && mi.Protocol == Protocol)
?? new()
{
Protocol = Protocol
@ -240,13 +231,13 @@ public class DiscordInterface : ProtocolInterface
m.MentionsMe = (dMessage.Author.Id != client.CurrentUser.Id
&& (dMessage.MentionedUserIds?.FirstOrDefault(muid => muid == client.CurrentUser.Id) > 0));
r.RememberMessage(m);
Rememberer.RememberMessage(m);
Console.WriteLine($"received message; author: {m.Author.DisplayName}, {m.Author.Id}. messageid:{m.Id}");
return m;
}
internal Channel UpsertChannel(IMessageChannel channel)
{
Channel c = r.SearchChannel(ci => ci.ExternalId == channel.Id.ToString() && ci.Protocol == Protocol);
Channel c = Rememberer.SearchChannel(ci => ci.ExternalId == channel.Id.ToString() && ci.Protocol == Protocol);
if (c == null)
{
Console.WriteLine($"couldn't find channel under protocol {Protocol} with externalId {channel.Id.ToString()}");
@ -299,7 +290,7 @@ public class DiscordInterface : ProtocolInterface
Channel parentChannel = null;
if (channel is IGuildChannel)
{
parentChannel = r.SearchChannel(c => c.ExternalId == (channel as IGuildChannel).Guild.Id.ToString() && c.Protocol == Protocol);
parentChannel = Rememberer.SearchChannel(c => c.ExternalId == (channel as IGuildChannel).Guild.Id.ToString() && c.Protocol == Protocol);
if (parentChannel is null)
{
Console.Error.WriteLine("why am I still null?");
@ -320,7 +311,7 @@ public class DiscordInterface : ProtocolInterface
parentChannel.SubChannels.Add(c);
}
c = r.RememberChannel(c);
c = Rememberer.RememberChannel(c);
//Console.WriteLine($"no one knows how to make good tooling. c.users.first, which needs client currentuser id tostring. c: {c}, c.Users {c.Users}, client: {client}, client.CurrentUser: {client.CurrentUser}, client.currentUser.Id: {client.CurrentUser.Id}");
var selfAccountInChannel = c.Users?.FirstOrDefault(a => a.ExternalId == client.CurrentUser.Id.ToString());
@ -333,7 +324,7 @@ public class DiscordInterface : ProtocolInterface
}
internal Channel UpsertChannel(IGuild channel)
{
Channel c = r.SearchChannel(ci => ci.ExternalId == channel.Id.ToString() && ci.Protocol == Protocol);
Channel c = Rememberer.SearchChannel(ci => ci.ExternalId == channel.Id.ToString() && ci.Protocol == Protocol);
if (c == null)
{
Console.WriteLine($"couldn't find channel under protocol {Protocol} with externalId {channel.Id.ToString()}");
@ -349,11 +340,11 @@ public class DiscordInterface : ProtocolInterface
c.SubChannels ??= [];
c.MaxAttachmentBytes = channel.MaxUploadLimit;
return r.RememberChannel(c);
return Rememberer.RememberChannel(c);
}
internal static Account UpsertAccount(IUser discordUser, Channel inChannel)
{
var acc = r.SearchAccount(ui => ui.ExternalId == discordUser.Id.ToString() && ui.SeenInChannel.Id == inChannel.Id);
var acc = Rememberer.SearchAccount(ui => ui.ExternalId == discordUser.Id.ToString() && ui.SeenInChannel.Id == inChannel.Id);
Console.WriteLine($"upserting account, retrieved {acc?.Id}.");
if (acc != null)
{
@ -361,7 +352,7 @@ public class DiscordInterface : ProtocolInterface
}
acc ??= new Account()
{
IsUser = r.SearchUser(u => u.Accounts.Any(a => a.ExternalId == discordUser.Id.ToString() && a.Protocol == Protocol))
IsUser = Rememberer.SearchUser(u => u.Accounts.Any(a => a.ExternalId == discordUser.Id.ToString() && a.Protocol == Protocol))
?? new User()
};
@ -381,12 +372,12 @@ public class DiscordInterface : ProtocolInterface
{
Console.WriteLine($"channel has {inChannel.Users.Count} accounts");
}
r.RememberAccount(acc);
Rememberer.RememberAccount(acc);
inChannel.Users ??= [];
if (!inChannel.Users.Contains(acc))
{
inChannel.Users.Add(acc);
r.RememberChannel(inChannel);
Rememberer.RememberChannel(inChannel);
}
return acc;
}
@ -394,7 +385,7 @@ public class DiscordInterface : ProtocolInterface
private static async Task<int> AttemptReact(IUserMessage msg, string e)
{
Console.WriteLine("discord attempting to react");
var c = r.SearchChannel(c => c.ExternalId == msg.Channel.Id.ToString());// db.Channels.FirstOrDefault(c => c.ExternalId == msg.Channel.Id.ToString());
var c = Rememberer.SearchChannel(c => c.ExternalId == msg.Channel.Id.ToString());// db.Channels.FirstOrDefault(c => c.ExternalId == msg.Channel.Id.ToString());
//var preferredEmote = c.EmoteOverrides?[e] ?? e; //TODO: emote overrides
var preferredEmote = e;
if (Emoji.TryParse(preferredEmote, out Emoji emoji))

29
ProtocolInterfaces/TwitchInterface/TwitchInterface.cs
View File

@ -21,7 +21,6 @@ public class TwitchInterface : ProtocolInterface
private Channel protocolAsChannel;
public override Channel SelfChannel { get => protocolAsChannel;}
private Account selfAccountInProtocol;
private static Rememberer r = Rememberer.Instance;
TwitchClient client;
private async Task SetupTwitchChannel()
@ -30,7 +29,7 @@ public class TwitchInterface : ProtocolInterface
try
{
protocolAsChannel = r.SearchChannel(c => c.ParentChannel == null && c.Protocol == Protocol);
protocolAsChannel = Rememberer.SearchChannel(c => c.ParentChannel == null && c.Protocol == Protocol);
if (protocolAsChannel == null)
{
protocolAsChannel = new Channel()
@ -47,7 +46,7 @@ public class TwitchInterface : ProtocolInterface
SubChannels = []
};
protocolAsChannel.DisplayName = "twitch (itself)";
protocolAsChannel = r.RememberChannel(protocolAsChannel);
protocolAsChannel = Rememberer.RememberChannel(protocolAsChannel);
Console.WriteLine($"protocol as channle added; {protocolAsChannel}");
}
else
@ -140,7 +139,7 @@ public class TwitchInterface : ProtocolInterface
private Account UpsertAccount(string username, Channel inChannel)
{
//Console.WriteLine($"upserting twitch account. username: {username}. inChannel: {inChannel?.Id}");
var acc = r.SearchAccount(ui => ui.ExternalId == username && ui.SeenInChannel.ExternalId == inChannel.ExternalId);
var acc = Rememberer.SearchAccount(ui => ui.ExternalId == username && ui.SeenInChannel.ExternalId == inChannel.ExternalId);
// Console.WriteLine($"upserting twitch account, retrieved {acc?.Id}.");
if (acc != null)
{
@ -148,7 +147,7 @@ public class TwitchInterface : ProtocolInterface
}
acc ??= new Account()
{
IsUser = r.SearchUser(
IsUser = Rememberer.SearchUser(
u => u.Accounts.Any(a => a.ExternalId == username && a.Protocol == Protocol))
?? new vassago.Models.User()
};
@ -169,19 +168,19 @@ public class TwitchInterface : ProtocolInterface
// {
// Console.WriteLine($"channel has {inChannel.Users.Count} accounts");
// }
r.RememberAccount(acc);
Rememberer.RememberAccount(acc);
inChannel.Users ??= [];
if (!inChannel.Users.Contains(acc))
{
inChannel.Users.Add(acc);
r.RememberChannel(inChannel);
Rememberer.RememberChannel(inChannel);
}
return acc;
}
private Channel UpsertChannel(string channelName)
{
Channel c = r.SearchChannel(ci => ci.ExternalId == channelName
Channel c = Rememberer.SearchChannel(ci => ci.ExternalId == channelName
&& ci.Protocol == Protocol);
if (c == null)
{
@ -199,7 +198,7 @@ public class TwitchInterface : ProtocolInterface
c.Protocol = Protocol;
c.ParentChannel = protocolAsChannel;
c.SubChannels = c.SubChannels ?? new List<Channel>();
c = r.RememberChannel(c);
c = Rememberer.RememberChannel(c);
var selfAccountInChannel = c.Users?.FirstOrDefault(a => a.ExternalId == selfAccountInProtocol.ExternalId);
if (selfAccountInChannel == null)
@ -211,7 +210,7 @@ public class TwitchInterface : ProtocolInterface
}
private Channel UpsertDMChannel(string whisperWith)
{
Channel c = r.SearchChannel(ci => ci.ExternalId == $"w_{whisperWith}"
Channel c = Rememberer.SearchChannel(ci => ci.ExternalId == $"w_{whisperWith}"
&& ci.Protocol == Protocol);
if (c == null)
{
@ -229,7 +228,7 @@ public class TwitchInterface : ProtocolInterface
c.Protocol = Protocol;
c.ParentChannel = protocolAsChannel;
c.SubChannels = c.SubChannels ?? new List<Channel>();
c = r.RememberChannel(c);
c = Rememberer.RememberChannel(c);
var selfAccountInChannel = c.Users.FirstOrDefault(a => a.ExternalId == selfAccountInProtocol.ExternalId);
if (selfAccountInChannel == null)
@ -245,7 +244,7 @@ public class TwitchInterface : ProtocolInterface
//none of the features we care about are on it!
private Message UpsertMessage(ChatMessage chatMessage)
{
var m = r.SearchMessage(mi => mi.ExternalId == chatMessage.Id && mi.Protocol == Protocol)
var m = Rememberer.SearchMessage(mi => mi.ExternalId == chatMessage.Id && mi.Protocol == Protocol)
?? new()
{
Protocol = Protocol,
@ -256,7 +255,7 @@ public class TwitchInterface : ProtocolInterface
m.Channel = UpsertChannel(chatMessage.Channel);
m.Author = UpsertAccount(chatMessage.Username, m.Channel);
m.MentionsMe = Regex.IsMatch(m.Content?.ToLower(), $"@\\b{selfAccountInProtocol.Username.ToLower()}\\b");
r.RememberMessage(m);
Rememberer.RememberMessage(m);
return m;
}
//n.b., I see you future adam. "we should unify these, they're redundant".
@ -265,7 +264,7 @@ public class TwitchInterface : ProtocolInterface
private Message UpsertMessage(WhisperMessage whisperMessage)
{
//WhisperMessage.Id corresponds to chatMessage.Id. \*eye twitch*
var m = r.SearchMessage(mi => mi.ExternalId == whisperMessage.MessageId && mi.Protocol == Protocol)
var m = Rememberer.SearchMessage(mi => mi.ExternalId == whisperMessage.MessageId && mi.Protocol == Protocol)
?? new()
{
Id = Guid.NewGuid(),
@ -277,7 +276,7 @@ public class TwitchInterface : ProtocolInterface
m.Channel = UpsertDMChannel(whisperMessage.Username);
m.Author = UpsertAccount(whisperMessage.Username, m.Channel);
m.MentionsMe = Regex.IsMatch(m.Content?.ToLower(), $"@\\b{selfAccountInProtocol.Username.ToLower()}\\b");
r.RememberMessage(m);
Rememberer.RememberMessage(m);
return m;
}

125
Rememberer.cs
View File

@ -4,38 +4,18 @@ using System.Linq.Expressions;
using vassago.Models;
using Microsoft.EntityFrameworkCore;
public class Rememberer
public static class Rememberer
{
private readonly SemaphoreSlim dbAccessSemaphore = new(1, 1);
private readonly ChattingContext db = new();
private List<Channel> channels;
private bool channelCacheDirty = true;
private Rememberer() { }
private static Rememberer _instance = null;
public static Rememberer Instance
{
get
{
if (_instance == null)
{
private static readonly SemaphoreSlim dbAccessSemaphore = new(1, 1);
private static readonly ChattingContext db = new();
private static List<Channel> channels;
private static bool channelCacheDirty = true;
lock (instantiationLock)
{
if (_instance == null)
{
_instance = new Rememberer();
}
}
}
return _instance;
}
}
private static readonly object instantiationLock = new();
private void cacheChannels()
private static void cacheChannels()
{
dbAccessSemaphore.Wait();
channels = db.Channels.ToList();
Console.WriteLine($"caching channels. {channels.Count} channels retrieved");
foreach (Channel ch in channels)
{
if (ch.ParentChannelId != null)
@ -47,13 +27,17 @@ public class Rememberer
ch.ParentChannel.SubChannels.Add(ch);
}
}
if (ch.Messages?.Count > 0)
{
Console.WriteLine($"{ch.DisplayName} got {ch.Messages.Count} messages");
}
ch.SubChannels ??= [];
}
channelCacheDirty = false;
dbAccessSemaphore.Release();
}
public Account SearchAccount(Expression<Func<Account, bool>> predicate)
public static Account SearchAccount(Expression<Func<Account, bool>> predicate)
{
Account toReturn;
dbAccessSemaphore.Wait();
@ -61,7 +45,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public List<Account> SearchAccounts(Expression<Func<Account, bool>> predicate)
public static List<Account> SearchAccounts(Expression<Func<Account, bool>> predicate)
{
List<Account> toReturn;
dbAccessSemaphore.Wait();
@ -69,7 +53,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public Attachment SearchAttachment(Expression<Func<Attachment, bool>> predicate)
public static Attachment SearchAttachment(Expression<Func<Attachment, bool>> predicate)
{
Attachment toReturn;
dbAccessSemaphore.Wait();
@ -77,13 +61,13 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public Channel SearchChannel(Func<Channel, bool> predicate)
public static Channel SearchChannel(Func<Channel, bool> predicate)
{
if (channelCacheDirty)
Task.Run(() => cacheChannels()).Wait();
return channels.FirstOrDefault(predicate);
}
public Message SearchMessage(Expression<Func<Message, bool>> predicate)
public static Message SearchMessage(Expression<Func<Message, bool>> predicate)
{
Message toReturn;
dbAccessSemaphore.Wait();
@ -91,7 +75,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public List<Message> SearchMessages(Expression<Func<Message, bool>> predicate)
public static List<Message> SearchMessages(Expression<Func<Message, bool>> predicate)
{
List<Message> toReturn;
dbAccessSemaphore.Wait();
@ -99,7 +83,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public User SearchUser(Expression<Func<User, bool>> predicate)
public static User SearchUser(Expression<Func<User, bool>> predicate)
{
User toReturn;
dbAccessSemaphore.Wait();
@ -107,7 +91,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public void RememberAccount(Account toRemember)
public static void RememberAccount(Account toRemember)
{
dbAccessSemaphore.Wait();
toRemember.IsUser ??= new User { Accounts = [toRemember] };
@ -115,7 +99,7 @@ public class Rememberer
db.SaveChanges();
dbAccessSemaphore.Release();
}
public void RememberAttachment(Attachment toRemember)
public static void RememberAttachment(Attachment toRemember)
{
dbAccessSemaphore.Wait();
toRemember.Message ??= new Message() { Attachments = [toRemember] };
@ -123,7 +107,7 @@ public class Rememberer
db.SaveChanges();
dbAccessSemaphore.Release();
}
public Channel RememberChannel(Channel toRemember)
public static Channel RememberChannel(Channel toRemember)
{
if (channelCacheDirty)
Task.Run(() => cacheChannels()).Wait(); //so we always do 2 db trips?
@ -135,7 +119,7 @@ public class Rememberer
cacheChannels();
return toRemember;
}
public void RememberMessage(Message toRemember)
public static void RememberMessage(Message toRemember)
{
dbAccessSemaphore.Wait();
toRemember.Channel ??= new();
@ -149,21 +133,21 @@ public class Rememberer
db.SaveChanges();
dbAccessSemaphore.Release();
}
public void RememberUser(User toRemember)
public static void RememberUser(User toRemember)
{
dbAccessSemaphore.Wait();
db.Users.Update(toRemember);
db.SaveChanges();
dbAccessSemaphore.Release();
}
public void ForgetAccount(Account toForget)
public static void ForgetAccount(Account toForget)
{
var user = toForget.IsUser;
var usersOnlyAccount = user.Accounts?.Count == 1;
if (usersOnlyAccount)
{
ForgetUser(user);
Rememberer.ForgetUser(user);
}
else
{
@ -173,14 +157,14 @@ public class Rememberer
dbAccessSemaphore.Release();
}
}
public void ForgetAttachment(Attachment toForget)
public static void ForgetAttachment(Attachment toForget)
{
dbAccessSemaphore.Wait();
db.Attachments.Remove(toForget);
db.SaveChanges();
dbAccessSemaphore.Release();
}
public void ForgetChannel(Channel toForget)
public static void ForgetChannel(Channel toForget)
{
if (toForget.SubChannels?.Count > 0)
{
@ -203,28 +187,28 @@ public class Rememberer
channelCacheDirty = true;
cacheChannels();
}
public void ForgetMessage(Message toForget)
public static void ForgetMessage(Message toForget)
{
dbAccessSemaphore.Wait();
db.Messages.Remove(toForget);
db.SaveChanges();
dbAccessSemaphore.Release();
}
public void ForgetUAC(UAC toForget)
public static void ForgetUAC(UAC toForget)
{
dbAccessSemaphore.Wait();
db.UACs.Remove(toForget);
db.SaveChanges();
dbAccessSemaphore.Release();
}
public void ForgetUser(User toForget)
public static void ForgetUser(User toForget)
{
dbAccessSemaphore.Wait();
db.Users.Remove(toForget);
db.SaveChanges();
dbAccessSemaphore.Release();
}
public List<Account> AccountsOverview()
public static List<Account> AccountsOverview()
{
List<Account> toReturn;
dbAccessSemaphore.Wait();
@ -232,16 +216,13 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
///<summary>
///intentionally does not include Users; to help search for orphaned accounts.
///</summary>
public List<Channel> ChannelsOverview()
public static List<Channel> ChannelsOverview()
{
if (channelCacheDirty)
Task.Run(() => cacheChannels()).Wait();
return channels.ToList();
return channels;
}
public Account AccountDetail(Guid Id)
public static Account AccountDetail(Guid Id)
{
Account toReturn;
dbAccessSemaphore.Wait();
@ -249,7 +230,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public Attachment AttachmentDetail(Guid Id)
public static Attachment AttachmentDetail(Guid Id)
{
Attachment toReturn;
dbAccessSemaphore.Wait();
@ -257,18 +238,16 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public Channel ChannelDetail(Guid Id, bool accounts = true, bool messages = false)
public static Channel ChannelDetail(Guid Id, bool messages = false)
{
if (channelCacheDirty)
Task.Run(() => cacheChannels()).Wait();
var ch = channels.Find(c => c.Id == Id);
if(accounts)
ch.Users = SearchAccounts(a => a.SeenInChannel == ch);
if (messages)
ch.Messages = SearchMessages(m => m.ChannelId == ch.Id);
return ch;
}
public Message MessageDetail(Guid Id)
public static Message MessageDetail(Guid Id)
{
Message toReturn;
dbAccessSemaphore.Wait();
@ -277,7 +256,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public UAC UACDetail(Guid Id)
public static UAC UACDetail(Guid Id)
{
UAC toReturn;
dbAccessSemaphore.Wait();
@ -285,7 +264,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public User UserDetail(Guid Id)
public static User UserDetail(Guid Id)
{
User toReturn;
dbAccessSemaphore.Wait();
@ -293,7 +272,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public List<User> UsersOverview()
public static List<User> UsersOverview()
{
List<User> toReturn;
dbAccessSemaphore.Wait();
@ -301,7 +280,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public List<UAC> UACsOverview()
public static List<UAC> UACsOverview()
{
List<UAC> toReturn;
dbAccessSemaphore.Wait();
@ -309,7 +288,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public UAC SearchUAC(Expression<Func<UAC, bool>> predicate)
public static UAC SearchUAC(Expression<Func<UAC, bool>> predicate)
{
UAC toReturn;
dbAccessSemaphore.Wait();
@ -318,7 +297,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public List<UAC> MatchUACs(Message message)
public static List<UAC> MatchUACs(Message message)
{
var msgId = message.Id;
var accId = message.Author.Id;
@ -329,7 +308,7 @@ public class Rememberer
|| uac.Users.FirstOrDefault(usr => usr.Id == usrId) != null
|| uac.Channels.FirstOrDefault(ch => ch.Id == chId) != null);
}
public List<UAC> SearchUACs(Expression<Func<UAC, bool>> predicate)
public static List<UAC> SearchUACs(Expression<Func<UAC, bool>> predicate)
{
List<UAC> toReturn;
dbAccessSemaphore.Wait();
@ -338,7 +317,7 @@ public class Rememberer
dbAccessSemaphore.Release();
return toReturn;
}
public void RememberUAC(UAC toRemember)
public static void RememberUAC(UAC toRemember)
{
dbAccessSemaphore.Wait();
db.Update(toRemember);
@ -347,18 +326,4 @@ public class Rememberer
if (toRemember.Channels?.Count() > 0)
cacheChannels();
}
public Configuration Configuration()
{
dbAccessSemaphore.Wait();
var toReturn = db.Configurations.FirstOrDefault();
dbAccessSemaphore.Release();
return toReturn;
}
public void RememberConfiguration(Configuration conf)
{
dbAccessSemaphore.Wait();
db.Update(conf);
db.SaveChanges();
dbAccessSemaphore.Release();
}
}

10
WebInterface/Controllers/ChannelsController.cs
View File

@ -10,17 +10,17 @@ namespace vassago.WebInterface.Controllers;
public class ChannelsController() : Controller
{
private static Rememberer r = Rememberer.Instance;
public IActionResult Details(Guid id)
{
var channel = r.ChannelDetail(id);
var allChannels = Rememberer.ChannelsOverview();
if (allChannels == null)
return Problem("no channels.");
var channel = allChannels.FirstOrDefault(u => u.Id == id);
if (channel == null)
{
return Problem($"couldn't find channle {id}");
}
else {
Console.WriteLine($"details.cshtml will have a channel; {channel}.");
}
var walker = channel;
while (walker != null)
{

129
WebInterface/Controllers/ConfigurationController.cs
View File

@ -1,129 +0,0 @@
using System.Diagnostics;
using System.Text;
using Newtonsoft.Json;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using vassago;
using vassago.Behavior;
using vassago.Models;
using vassago.WebInterface.Models;
using vassago.TwitchInterface;
namespace vassago.WebInterface.Controllers;
public class ConfigurationController() : Controller
{
private static Rememberer r = Rememberer.Instance;
public IActionResult Index()
{
var conf = r.Configuration() ?? new Configuration();
ViewData.Add("Serialized", JsonConvert.SerializeObject(conf));
return View(conf);
}
[HttpPost]
public IActionResult Submit(Configuration incoming)
{
var conf = r.Configuration() ?? new Configuration();
conf.DiscordTokens = incoming.DiscordTokens;
conf.TwitchConfigs = incoming.TwitchConfigs;
conf.ExchangePairsLocation = incoming.ExchangePairsLocation;
conf.SetupDiscordSlashCommands = incoming.SetupDiscordSlashCommands;
conf.Webhooks = incoming.Webhooks;
conf.KafkaBootstrap = incoming.KafkaBootstrap;
conf.KafkaName = incoming.KafkaName;
conf.reportedApiUrl = incoming.reportedApiUrl;
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error()
{
return View(new ErrorPageViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
}
[HttpPost]
public IActionResult AddDiscord(string newToken)
{
Console.WriteLine($"adding discord, {newToken}");
var conf = r.Configuration();
conf.DiscordTokens ??= [];
conf.DiscordTokens.Add(newToken);
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
[HttpPost]
public IActionResult RemoveDiscord(int index)
{
Console.WriteLine($"removing discord[{index}]");
var conf = r.Configuration();
if (conf.DiscordTokens?.Count <= index)
{
Console.Error.WriteLine("error removing discord {index} from configuration, only have {conf.DiscordTokens?.Count}.");
return RedirectToAction("Index", "Configuration");
}
conf.DiscordTokens.RemoveAt(index);
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
[HttpPost]
public IActionResult AddTwitch(string newUsername, string newOauth)
{
Console.WriteLine($"adding twitch, {newUsername}/{newOauth}");
var conf = r.Configuration();
conf.TwitchConfigs ??= [];
var thisOne = new TwitchConfig()
{
username = newUsername,
oauth = newOauth
};
conf.TwitchConfigs.Add(JsonConvert.SerializeObject(thisOne));
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
[HttpPost]
public IActionResult RemoveTwitch(int index)
{
Console.WriteLine($"removing twitch[{index}]");
var conf = r.Configuration();
if (conf.TwitchConfigs?.Count <= index)
{
Console.Error.WriteLine("error removing twitch {index} from configuration, only have {conf.TwitchConfigs?.Count}.");
return RedirectToAction("Index", "Configuration");
}
conf.TwitchConfigs.RemoveAt(index);
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
[HttpPost]
public IActionResult AddWebhook(WebhookConf newWebhook)
{
Console.WriteLine($"adding webhook, {newWebhook}");
var conf = r.Configuration();
conf.Webhooks??= [];
conf.Webhooks.Add(JsonConvert.SerializeObject(newWebhook));
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
[HttpPost]
public IActionResult RemoveWebhook(int index)
{
Console.WriteLine($"removing webhook[{index}]");
var conf = r.Configuration();
if (conf.Webhooks?.Count <= index)
{
Console.Error.WriteLine("error removing webhook {index} from configuration, only have {conf.Webhooks?.Count}.");
return RedirectToAction("Index", "Configuration");
}
conf.Webhooks.RemoveAt(index);
r.RememberConfiguration(conf);
return RedirectToAction("Index", "Configuration");
}
}

16
WebInterface/Controllers/HomeController.cs
View File

@ -12,7 +12,6 @@ namespace vassago.Controllers;
public class HomeController : Controller
{
private readonly ILogger<HomeController> _logger;
private static Rememberer r = Rememberer.Instance;
public HomeController(ILogger<HomeController> logger)
{
@ -21,16 +20,14 @@ public class HomeController : Controller
public IActionResult Index()
{
var allAccounts = r.AccountsOverview();
var allChannels = r.ChannelsOverview();
var allAccounts = Rememberer.AccountsOverview();
var allChannels = Rememberer.ChannelsOverview();
Console.WriteLine($"accounts: {allAccounts?.Count ?? 0}, channels: {allChannels?.Count ?? 0}");
var sb = new StringBuilder();
sb.Append('[');
sb.Append($"{{\"text\": \"<a href=\\\"{Url.ActionLink(action: "Index", controller: "Configuration")}\\\">Configuration</a>\"}},");
//UACs
var allUACs = r.UACsOverview();
var allUACs = Rememberer.UACsOverview();
var first = true;
if(allUACs.Any())
{
@ -61,13 +58,13 @@ public class HomeController : Controller
}
//users
var users = r.UsersOverview();
var users = Rememberer.UsersOverview();
if(users.Any())
{
sb.Append(",{text: \"users\", expanded:true, nodes: [");
first=true;
//refresh list; we'll be knocking them out again in serializeUser
allAccounts = r.AccountsOverview();
allAccounts = Rememberer.AccountsOverview();
foreach(var user in users)
{
if (first)
@ -83,9 +80,10 @@ public class HomeController : Controller
sb.Append("]}");
}
//type error, e is not defined
//channels
sb.Append(",{text: \"channels\", expanded:true, nodes: [");
var topLevelChannels = r.ChannelsOverview().Where(x => x.ParentChannel == null).ToList();
var topLevelChannels = Rememberer.ChannelsOverview().Where(x => x.ParentChannel == null).ToList();
first = true;
foreach (var topLevelChannel in topLevelChannels)
{

4
WebInterface/Controllers/UACsController.cs
View File

@ -10,11 +10,11 @@ public class UACsController() : Controller
{
public IActionResult Index()
{
return View(Rememberer.Instance.UACsOverview());
return View(Rememberer.UACsOverview());
}
public IActionResult Details(Guid id)
{
return View(Rememberer.Instance.SearchUAC(uac => uac.Id == id));
return View(Rememberer.SearchUAC(uac => uac.Id == id));
}
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]

7
WebInterface/Controllers/api/AccountsController.cs
View File

@ -11,7 +11,6 @@ namespace vassago.Controllers.api;
public class AccountsController : ControllerBase
{
private readonly ILogger<AccountsController> _logger;
private static Rememberer r = Rememberer.Instance;
public AccountsController(ILogger<AccountsController> logger)
{
@ -30,14 +29,14 @@ public class AccountsController : ControllerBase
public IActionResult UnlinkUser([FromBody] extraSpecialObjectReadGlorifiedTupleFor_UnlinkUser req)
{
var acc_guid = req.acc_guid;
var accFromDb = r.SearchAccount(acc => acc.Id == acc_guid);
var accFromDb = Rememberer.SearchAccount(acc => acc.Id == acc_guid);
if (accFromDb == null)
{
var err = $"attempt to unlink user for acc {acc_guid}, not found";
_logger.LogError(err);
return NotFound(err);
}
var userFromDb = r.SearchUser(c => c.Id == accFromDb.IsUser.Id);
var userFromDb = Rememberer.SearchUser(c => c.Id == accFromDb.IsUser.Id);
if (userFromDb == null)
{
var err = $"attempt to unlink user for {acc_guid}, doesn't have a user";
@ -47,7 +46,7 @@ public class AccountsController : ControllerBase
accFromDb.IsUser = null;
r.RememberAccount(accFromDb);
Rememberer.RememberAccount(accFromDb);
return Ok(accFromDb);
}
}

53
WebInterface/Controllers/api/RemembererController.cs
View File

@ -10,7 +10,6 @@ namespace vassago.Controllers.api;
public class RemembererController : ControllerBase
{
private readonly ILogger<RemembererController> _logger;
private static Rememberer r = Rememberer.Instance;
public RemembererController(ILogger<RemembererController> logger)
{
@ -23,42 +22,42 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public Account CreateAccount(Guid id)
{
return r.AccountDetail(id);
return Rememberer.AccountDetail(id);
}
[HttpPut]
[Route("Attachment")]
[Produces("application/json")]
public Attachment CreateAttachment(Guid id)
{
return r.AttachmentDetail(id);
return Rememberer.AttachmentDetail(id);
}
[HttpPut]
[Route("Channels")]
[Produces("application/json")]
public Channel CreateChannel(Guid id)
{
return r.ChannelDetail(id);
return Rememberer.ChannelDetail(id);
}
[HttpPut]
[Route("Message")]
[Produces("application/json")]
public Message CreateMessage(Guid id)
{
return r.MessageDetail(id);
return Rememberer.MessageDetail(id);
}
[HttpPut]
[Route("UAC")]
[Produces("application/json")]
public UAC CreateUAC(Guid id)
{
return r.UACDetail(id);
return Rememberer.UACDetail(id);
}
[HttpPut]
[Route("User")]
[Produces("application/json")]
public User CreateUser(Guid id)
{
return r.UserDetail(id);
return Rememberer.UserDetail(id);
}
//Read
[HttpGet]
@ -66,42 +65,42 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public Account GetAccount(Guid id)
{
return r.AccountDetail(id);
return Rememberer.AccountDetail(id);
}
[HttpGet]
[Route("Attachment")]
[Produces("application/json")]
public Attachment GetAttachment(Guid id)
{
return r.AttachmentDetail(id);
return Rememberer.AttachmentDetail(id);
}
[HttpGet]
[Route("Channels")]
[Produces("application/json")]
public Channel GetChannel(Guid id)
{
return r.ChannelDetail(id);
return Rememberer.ChannelDetail(id);
}
[HttpGet]
[Route("Message")]
[Produces("application/json")]
public Message GetMessage(Guid id)
{
return r.MessageDetail(id);
return Rememberer.MessageDetail(id);
}
[HttpGet]
[Route("UAC")]
[Produces("application/json")]
public UAC GetUAC(Guid id)
{
return r.UACDetail(id);
return Rememberer.UACDetail(id);
}
[HttpGet]
[Route("User")]
[Produces("application/json")]
public User GetUser(Guid id)
{
return r.UserDetail(id);
return Rememberer.UserDetail(id);
}
//Update
[HttpPatch]
@ -109,7 +108,7 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult Patch([FromBody] Channel channel)
{
var fromDb = r.ChannelDetail(channel.Id);
var fromDb = Rememberer.ChannelDetail(channel.Id);
if (fromDb == null)
{
_logger.LogError($"attempt to update channel {channel.Id}, not found");
@ -122,7 +121,7 @@ public class RemembererController : ControllerBase
//settable values: lewdness filter level, meanness filter level. maybe i could decorate them...
fromDb.LewdnessFilterLevel = channel.LewdnessFilterLevel;
fromDb.MeannessFilterLevel = channel.MeannessFilterLevel;
r.RememberChannel(fromDb);
Rememberer.RememberChannel(fromDb);
return Ok(fromDb);
}
//Delete
@ -131,13 +130,13 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult DeleteAccount(Guid id)
{
var fromDb = r.AccountDetail(id);
var fromDb = Rememberer.AccountDetail(id);
if (fromDb == null)
{
_logger.LogError($"attempt to delete account {id}, not found");
return NotFound();
}
r.ForgetAccount(fromDb);
Rememberer.ForgetAccount(fromDb);
return Ok();
}
[HttpDelete]
@ -145,13 +144,13 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult DeleteAttachment(Guid id)
{
var fromDb = r.AttachmentDetail(id);
var fromDb = Rememberer.AttachmentDetail(id);
if (fromDb == null)
{
_logger.LogError($"attempt to delete attachment {id}, not found");
return NotFound();
}
r.ForgetAttachment(fromDb);
Rememberer.ForgetAttachment(fromDb);
return Ok();
}
[HttpDelete]
@ -159,14 +158,14 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult DeleteChannel(Guid id)
{
var fromDb = r.ChannelDetail(id);
var fromDb = Rememberer.ChannelDetail(id);
_logger.LogDebug($"delete channel {id}");
if (fromDb == null)
{
_logger.LogError($"attempt to delete channel {id}, not found");
return NotFound();
}
r.ForgetChannel(fromDb);
Rememberer.ForgetChannel(fromDb);
_logger.LogDebug($"delete channel {id} success");
return Ok();
}
@ -175,13 +174,13 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult DeleteMessage(Guid id)
{
var fromDb = r.MessageDetail(id);
var fromDb = Rememberer.MessageDetail(id);
if (fromDb == null)
{
_logger.LogError($"attempt to delete message {id}, not found");
return NotFound();
}
r.ForgetMessage(fromDb);
Rememberer.ForgetMessage(fromDb);
return Ok();
}
[HttpDelete]
@ -189,13 +188,13 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult DeleteUAC(Guid id)
{
var fromDb = r.UACDetail(id);
var fromDb = Rememberer.UACDetail(id);
if (fromDb == null)
{
_logger.LogError($"attempt to delete uac {id}, not found");
return NotFound();
}
r.ForgetUAC(fromDb);
Rememberer.ForgetUAC(fromDb);
return Ok();
}
[HttpDelete]
@ -203,13 +202,13 @@ public class RemembererController : ControllerBase
[Produces("application/json")]
public IActionResult DeleteUser(Guid id)
{
var fromDb = r.UserDetail(id);
var fromDb = Rememberer.UserDetail(id);
if (fromDb == null)
{
_logger.LogError($"attempt to delete user {id}, not found");
return NotFound();
}
r.ForgetUser(fromDb);
Rememberer.ForgetUser(fromDb);
return Ok();
}
}

51
WebInterface/Controllers/api/UACsController.cs
View File

@ -11,7 +11,6 @@ namespace vassago.Controllers.api;
public class UACController : ControllerBase
{
private readonly ILogger<UACController> _logger;
private static Rememberer r = Rememberer.Instance;
public UACController(ILogger<UACController> logger)
{
@ -32,14 +31,14 @@ public class UACController : ControllerBase
{
var uac_guid = req.uac_guid;
var channel_guid = req.channel_guid;
var uacFromDb = r.SearchUAC(uac => uac.Id == uac_guid);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == uac_guid);
if (uacFromDb == null)
{
var err = $"attempt to link channel for uac {uac_guid}, not found";
_logger.LogError(err);
return NotFound(err);
}
var channelFromDb = r.SearchChannel(c => c.Id == channel_guid);
var channelFromDb = Rememberer.SearchChannel(c => c.Id == channel_guid);
if (channelFromDb == null)
{
var err = $"attempt to link channel for channel {channel_guid}, not found";
@ -53,7 +52,7 @@ public class UACController : ControllerBase
return BadRequest("channel already linked");
}
uacFromDb.Channels.Add(channelFromDb);
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb);
}
public class extraSpecialObjectReadGlorifiedTupleFor_LinkUser
@ -68,13 +67,13 @@ public class UACController : ControllerBase
{
var uac_guid = req.uac_guid;
var user_guid = req.user_guid;
var uacFromDb = r.SearchUAC(uac => uac.Id == uac_guid);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == uac_guid);
if (uacFromDb == null)
{
_logger.LogError($"attempt to link channal for uac {uac_guid}, not found");
return NotFound();
}
var userFromDb = r.SearchUser(c => c.Id == user_guid);
var userFromDb = Rememberer.SearchUser(c => c.Id == user_guid);
if (userFromDb == null)
{
_logger.LogError($"attempt to link user for user {user_guid}, not found");
@ -87,7 +86,7 @@ public class UACController : ControllerBase
return BadRequest("user already linked");
}
uacFromDb.Users.Add(userFromDb);
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb);
}
public class extraSpecialObjectReadGlorifiedTupleFor_LinkAccount
@ -102,13 +101,13 @@ public class UACController : ControllerBase
{
var uac_guid = req.uac_guid;
var account_guid = req.account_guid;
var uacFromDb = r.SearchUAC(uac => uac.Id == uac_guid);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == uac_guid);
if (uacFromDb == null)
{
_logger.LogError($"attempt to link channal for uac {uac_guid}, not found");
return NotFound();
}
var accountFromDb = r.SearchAccount(c => c.Id == account_guid);
var accountFromDb = Rememberer.SearchAccount(c => c.Id == account_guid);
if (accountFromDb == null)
{
_logger.LogError($"attempt to link account for user {account_guid}, not found");
@ -121,7 +120,7 @@ public class UACController : ControllerBase
return BadRequest("account already linked");
}
uacFromDb.AccountInChannels.Add(accountFromDb);
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb);
}
[HttpPatch]
@ -131,13 +130,13 @@ public class UACController : ControllerBase
{
var uac_guid = req.uac_guid;
var user_guid = req.user_guid;
var uacFromDb = r.SearchUAC(uac => uac.Id == uac_guid);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == uac_guid);
if (uacFromDb == null)
{
_logger.LogError($"attempt to unlink uac for uac {uac_guid}, not found");
return NotFound();
}
var userFromDb = r.SearchUser(c => c.Id == user_guid);
var userFromDb = Rememberer.SearchUser(c => c.Id == user_guid);
if (userFromDb == null)
{
_logger.LogError($"attempt to unlink user for user {user_guid}, not found");
@ -150,7 +149,7 @@ public class UACController : ControllerBase
return BadRequest("user not linked");
}
uacFromDb.Users.Remove(userFromDb);
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb);
}
[HttpPatch]
@ -160,13 +159,13 @@ public class UACController : ControllerBase
{
var uac_guid = req.uac_guid;
var account_guid = req.account_guid;
var uacFromDb = r.SearchUAC(uac => uac.Id == uac_guid);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == uac_guid);
if (uacFromDb == null)
{
_logger.LogError($"attempt to unlink uac for uac {uac_guid}, not found");
return NotFound();
}
var accountFromDb = r.SearchAccount(a => a.Id == account_guid);
var accountFromDb = Rememberer.SearchAccount(a => a.Id == account_guid);
if (accountFromDb == null)
{
_logger.LogError($"attempt to unlink account for user {account_guid}, not found");
@ -179,7 +178,7 @@ public class UACController : ControllerBase
return BadRequest("account not linked");
}
uacFromDb.AccountInChannels.Remove(accountFromDb);
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb);
}
[HttpPatch]
@ -189,13 +188,13 @@ public class UACController : ControllerBase
{
var uac_guid = req.uac_guid;
var channel_guid = req.channel_guid;
var uacFromDb = r.SearchUAC(uac => uac.Id == uac_guid);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == uac_guid);
if (uacFromDb == null)
{
_logger.LogError($"attempt to unlink channal for uac {uac_guid}, not found");
return NotFound();
}
var channelFromDb = r.SearchChannel(c => c.Id == channel_guid);
var channelFromDb = Rememberer.SearchChannel(c => c.Id == channel_guid);
if (channelFromDb == null)
{
_logger.LogError($"attempt to unlink user for user {channel_guid}, not found");
@ -208,7 +207,7 @@ public class UACController : ControllerBase
return BadRequest("user not linked");
}
uacFromDb.Channels.Remove(channelFromDb);
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb);
}
[HttpPut]
@ -217,7 +216,7 @@ public class UACController : ControllerBase
public IActionResult CreateForChannels(Guid Id)
{
_logger.LogDebug($"made it to controller. creating for channel {Id}");
var targetChannel = r.ChannelDetail(Id);
var targetChannel = Rememberer.ChannelDetail(Id);
if (targetChannel == null)
{
return NotFound();
@ -226,8 +225,8 @@ public class UACController : ControllerBase
{
Channels = [targetChannel]
};
r.RememberUAC(newUAC);
r.RememberChannel(targetChannel);
Rememberer.RememberUAC(newUAC);
Rememberer.RememberChannel(targetChannel);
return Ok(newUAC.Id);
}
[HttpPut]
@ -236,7 +235,7 @@ public class UACController : ControllerBase
public IActionResult AddTranslation(Guid Id)
{
_logger.LogDebug($"made it to controller. creating translation for uac {Id}");
var uacFromDb = r.SearchUAC(uac => uac.Id == Id);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == Id);
if (uacFromDb == null)
{
_logger.LogError($"attempt to create translation for uac {Id}, not found");
@ -244,7 +243,7 @@ public class UACController : ControllerBase
}
uacFromDb.Translations ??= [];
uacFromDb.Translations.Add(Guid.NewGuid().ToString(), Guid.NewGuid().ToString());
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb.Translations.Count);
}
[HttpPut]
@ -253,7 +252,7 @@ public class UACController : ControllerBase
public IActionResult AddCommandAlteration(Guid Id)
{
_logger.LogDebug($"made it to controller. creating command alteration for uac {Id}");
var uacFromDb = r.SearchUAC(uac => uac.Id == Id);
var uacFromDb = Rememberer.SearchUAC(uac => uac.Id == Id);
if (uacFromDb == null)
{
_logger.LogError($"attempt to create command alteration for uac {Id}, not found");
@ -261,7 +260,7 @@ public class UACController : ControllerBase
}
uacFromDb.CommandAlterations ??= [];
uacFromDb.CommandAlterations.Add(Guid.NewGuid().ToString(), Guid.NewGuid().ToString());
r.RememberUAC(uacFromDb);
Rememberer.RememberUAC(uacFromDb);
return Ok(uacFromDb.CommandAlterations.Count);
}

3
WebInterface/Views/Channels/Details.cshtml
View File

@ -189,8 +189,7 @@
sb.Append("[{text: \"accounts\", \"expanded\":true, nodes: [");
var first = true;
Console.WriteLine($"{ThisChannel.DisplayName} has {ThisChannel.Users?.Count ?? 0} users.");
foreach (var acc in ThisChannel.Users?.OrderBy(a => a?.SeenInChannel?.LineageSummary ?? " ERROR"))
foreach (var acc in ThisChannel.Users?.OrderBy(a => a?.SeenInChannel?.LineageSummary))
{
if(!first)
sb.Append(',');

283
WebInterface/Views/Configuration/Index.cshtml
View File

@ -1,283 +0,0 @@
@model vassago.Models.Configuration
@using Newtonsoft.Json;
@using vassago.Behavior;
@using vassago.TwitchInterface;
@using System.Text;
<a href="/">home</a>/configuration
<form action="@Url.Action("submit", "Configuration")" method="post" id="theForm">
<table class="table">
<tbody>
<tr>
<th colspan="2">Discord (@(Model?.DiscordTokens?.Count ?? 0) accounts)</th>
</tr>
@{
if(Model.DiscordTokens != null) for(var i = 0; i < Model.DiscordTokens.Count; i++)
{
<tr>
<th><label for="DiscordTokens[@i]"></label></th>
<td>
<input type="text" class="form-control" name="DiscordTokens[@i]" value="@Model.DiscordTokens[i]"/>
<button type="button" onclick="removeDiscord(@i)" class="btn btn-danger">del</button>
</td>
</tr>
}
}
<tr>
<td></td>
<td>
<button type="button" onclick="addDiscord.showModal()">add</button>
</td>
</tr>
<tr>
<th><label class="form-check-label" for="SetupDiscordSlashCommands">Setup Discord Slash Commands</label>
<td><input type="checkbox" class="form-check-input position-static" name="SetupDiscordSlashCommands" checked="@Model.SetupDiscordSlashCommands" value="true"/></td>
</tr>
<tr>
<th colspan="2">Twitch (@(Model?.TwitchConfigs?.Count ?? 0) accounts)</th>
</tr>
@{
if(Model.TwitchConfigs != null) for(var i = 0; i < Model.TwitchConfigs.Count; i++)
{
var tc = JsonConvert.DeserializeObject<TwitchConfig>(Model.TwitchConfigs[i]);
<tr>
<th><label for="TwitchConfigs[@i]"></label></th>
<td>
<input type="hidden" name="TwitchConfigs[@i]" id="TwitchConfigs_@i" value="@Model.TwitchConfigs[i]" />
<input type="text" class="form-control" data-name="username" value="@tc.username"/>
<input type="text" class="form-control" data-name="oauth" value="@tc.oauth"/>
<button type="button" onclick="removeTwitch(@i);" class="btn btn-danger">del</button>
</td>
</tr>
}
}
<tr>
<td></td>
<td>
<button type="button" onclick="addTwitch.showModal()">add</button>
</td>
</tr>
<tr class="form-text">
<th><label for="ExchangePairsLocation">Exchange Pairs Location</label></th>
<td><input type="text" class="form-control" name="ExchangePairsLocation" value="@Model.ExchangePairsLocation"/></td>
</tr>
<tr>
<th colspan="2">Webhooks</th>
</tr>
@{
if(Model.Webhooks != null) for(var i = 0; i < Model.Webhooks.Count; i++)
{
if(Model.Webhooks[i] == null) continue;
Console.WriteLine(Model.Webhooks[i]);
var wh = JsonConvert.DeserializeObject<WebhookConf>(Model.Webhooks[i]);
if(wh == null) continue;
var sb = new StringBuilder();
if(wh.Headers != null) foreach(var header in wh.Headers)
{
sb.Append($"{header[0]}:");
if(header.Count == 2)
sb.Append(header[1]);
sb.AppendLine();
}
<tr>
<th><label for="Webhooks[@i]">@wh.Trigger</label></th>
<td>
<input type="hidden" name="Webhooks[@i]" id="Webhooks_@i" value="@Model.Webhooks[i]" />
<input type="text" class="form-control" data-name="Trigger" value="@wh.Trigger"/>
<input type="text" class="form-control" data-name="Uri" value="@wh.Uri"/>
<input type="text" class="form-control" data-name="Method" value="@wh.Method"/>
<input type="textarea" class="form-control" data-name="Headers" value="@sb.ToString()"/>
<input type="text" class="form-control" data-name="Content" value="@wh.Content"/>
<input type="text" class="form-control" data-name="Description" value="@wh.Description"/>
<button type="button" onclick="removeWebhook(@i);" class="btn btn-danger">del</button>
</td>
</tr>
}
}
<tr>
<td></td>
<td>
<button type="button" onclick="addWebhookDialog.showModal()">add</button>
</td>
</tr>
<tr class="form-text">
<th><label for="KafkaBootstrap">Kafka Bootstrap Server</label></th>
<td><input type="text" class="form-control" name="KafkaBootstrap" value="@Model.KafkaBootstrap"/></td>
</tr>
<tr class="form-text">
<th><label for="KafkaName">Kafka Name</label></th>
<td><input type="text" class="form-control" name="KafkaName" value="@Model.KafkaName"/></td>
</tr>
<tr class="form-text">
<th><label for="reportedApiUrl">reportedApiUrl</label></th>
<td><input type="text" class="form-control" name="reportedApiUrl" value="@Model.reportedApiUrl"/></td>
</tr>
<tr class="form-text">
<td colspan="2"><button class="btn btn-success" type="button" onclick="complexSubmit()">save</button></td>
</tr>
</tbody>
</table>
</form>
<dialog id="addDiscord">
<form action="@Url.Action("AddDiscord", "Configuration")" method="post">
<input type="text" class="form-control" name="newToken" />
<button class="btn btn-secondary" type="button" onclick="addDiscord.close()">cancel</button>
<button class="btn btn-success" type="submit">save</button>
</form>
</dialog>
<dialog id="removeDiscordDialog">
<form action="@Url.Action("RemoveDiscord", "Configuration")" method="post">
Are you sure?
<input type="hidden" name="index" id="removeDiscordTarget" />
<button class="btn btn-secondary" type="button" onclick="removeDiscordDialog.close()">cancel</button>
<button class="btn btn-danger" type="submit">delete</button>
</form>
</dialog>
<dialog id="addTwitch">
<form action="@Url.Action("AddTwitch", "Configuration")" method="post">
username: <input type="text" class="form-control" name="newUsername" />
oauth: <input type="text" class="form-control" name="newOauth" />
<button class="btn btn-secondary" type="button" onclick="addTwitch.close()">cancel</button>
<button class="btn btn-success" type="submit">save</button>
</form>
</dialog>
<dialog id="removeTwitchDialog">
<form action="@Url.Action("RemoveTwitch", "Configuration")" method="post">
Are you sure?
<input type="hidden" name="id" id="removeTwitchTarget" />
<button class="btn btn-secondary" type="button" onclick="removeTwitchDialog.close()">cancel</button>
<button class="btn btn-danger" type="submit">delete</button>
</form>
</dialog>
<dialog id="addWebhookDialog">
<form action="@Url.Action("AddWebhook", "Configuration")" method="post">
trigger
<input type="text" class="form-control" name="Trigger" />
Uri
<input type="text" class="form-control" name="Uri" />
Method
<input type="text" class="form-control" name="Method" />
Headers
<input type="textarea" class="form-control" id="newWebhookHeaders" />
<input type="hidden" name="Headers" />
Content
<input type="text" class="form-control" name="Content" />
Description
<input type="text" class="form-control" name="Description" />
<button class="btn btn-secondary" type="button" onclick="addWebhookDialog.close()">cancel</button>
<button class="btn btn-success" type="button" onclick="addWebhookComplexSubmit()">save</button>
</form>
</dialog>
<dialog id="removeWebhookDialog">
<form action="@Url.Action("RemoveWebhook", "Configuration")" method="post">
Are you sure?
<input type="hidden" name="id" id="removeWebhookTarget" />
<button class="btn btn-secondary" type="button" onclick="removeWebhookDialog.close()">cancel</button>
<button class="btn btn-danger" type="submit">delete</button>
</form>
</dialog>
@section scripts{
<script type="text/javascript">
function removeDiscord(idx){
removeDiscordTarget.Value = idx;
console.log("removeDiscordTarget is now " + idx);
removeDiscordDialog.showModal();
}
function removeTwitch(idx){
removeTwitchTarget.value = idx;
removeTwitchDialog.showModal();
}
function removeWebhook(idx){
removeWebhookTarget.value = idx;
removeWebhookDialog.showModal();
}
function complexSubmit()
{
for (let i = 0; true; i++)
{
let thisCell = document.querySelector("td>#TwitchConfigs_" + i);
if(thisCell !== null)
{
let usernameElem = thisCell.nextElementSibling;
let oauthElem = usernameElem.nextElementSibling;
let asObj = {username: usernameElem.value, oauth: oauthElem.value};
thisCell.value = JSON.stringify(asObj);
}
else
{
break;
}
}
for (let i = 0; true; i++)
{
let thisCell = document.querySelector("td>#Webhooks_" + i);
if(thisCell !== null)
{
let nextCell = thisCell;
let asObj = {};
while(true){
nextCell = nextCell.nextElementSibling;
if(nextCell == null)
break;
if(!nextCell.hasAttribute("data-name"))
continue;
let dataname = nextCell.attributes["data-name"].value;
if(nextCell.value != "")
{
if(dataname == "Headers")
{
asObj["Headers"] = [];
let headerArray = nextCell.value.split('\n');
headerArray.forEach((elem) => {
if(elem.indexOf(":") > -1)
{
asObj["Headers"].push(elem.split(":"));
}
});
}
else
{
asObj[dataname] = nextCell.value;
}
}
}
thisCell.value = JSON.stringify(asObj);
}
else
{
break;
}
}
theForm.submit();
}
function addWebhookComplexSubmit()
{
let headersInput = document.querySelector("#newWebhookHeaders");
if(headersInput.value != "")
{
if(headersInput.value.indexOf("\n") == -1)
{
headersInput.value += "\n";
}
let headers = headersInput.value.split("\n");
let i = 0;
headers.forEach((headerInputLine) => {
console.log(headerInputLine);
if(headerInputLine.indexOf(":") > -1)
{
var newElem = document.createElement("input");
newElem.setAttribute("type", "hidden");
newElem.setAttribute("name", "Headers[" + i + "]");
newElem.value = JSON.stringify(headerInputLine.split(":"));
headersInput.parentElement.appendChild(newElem);
console.log(newElem.value);
i++;
}
});
}
document.querySelector("#addWebhookDialog form").submit();
}
</script>
}

2
appsettings.json
View File

@ -18,7 +18,7 @@
"Webhooks": [
{
"uacID": "9a94855a-e5a2-43b5-8420-ce670472ce95",
"Trigger": "!test",
"Trigger": "test",
"Description": "<i>test</i>",
"Uri": "http://localhost",
"Method": "POST",

8
devutils.sh
View File

@ -19,14 +19,6 @@ case "$1" in
dotnet ef migrations add "$2"
dotnet ef database update --connection "$connnectionstr"
;;
"remove-migration")
echo "ef migrations will tell you you can use dotnet ef migrations remove."
echo ""
echo "LIES."
echo ""
echo "it doesn't have a way to specify the connection string. can't be done."
echo "edit the db the hard way."
;;
"dbupdate")
dotnet ef database update --connection "$connnectionstr"