From 287e453b9eca894845a2f873b07d7212da07a0d5 Mon Sep 17 00:00:00 2001 From: cohlexyz <142505474+cohlexyz@users.noreply.github.com> Date: Sun, 10 May 2026 17:51:56 +0200 Subject: [PATCH] Add tagging to image carousel (#113) --- KfChatDotNetBot/Commands/ImageCommands.cs | 126 +++- .../20260510073657_AddImageTags.Designer.cs | 636 ++++++++++++++++++ .../Migrations/20260510073657_AddImageTags.cs | 28 + .../ApplicationDbContextModelSnapshot.cs | 3 + .../Models/DbModels/ImageDbModel.cs | 1 + 5 files changed, 775 insertions(+), 19 deletions(-) create mode 100644 KfChatDotNetBot/Migrations/20260510073657_AddImageTags.Designer.cs create mode 100644 KfChatDotNetBot/Migrations/20260510073657_AddImageTags.cs diff --git a/KfChatDotNetBot/Commands/ImageCommands.cs b/KfChatDotNetBot/Commands/ImageCommands.cs index 643f674..bd48a6b 100644 --- a/KfChatDotNetBot/Commands/ImageCommands.cs +++ b/KfChatDotNetBot/Commands/ImageCommands.cs @@ -1,4 +1,5 @@ using System.Net.Http.Headers; +using System.Text.Json; using System.Text.RegularExpressions; using Humanizer; using KfChatDotNetBot.Extensions; @@ -15,10 +16,10 @@ namespace KfChatDotNetBot.Commands; public class AddImageCommand : ICommand { public List Patterns => [ - new Regex(@"^admin image (?\w+) add (?.+)$"), - new Regex(@"^admin images (?\w+) add (?.+)$"), - new Regex(@"^admin image (?\w+) add_nigger (?.+)$"), - new Regex(@"^admin images (?\w+) add_nigger (?.+)$") + new Regex(@"^admin image (?\w+) add (?\S+)(?:\s+(?raw))?(?:\s+(?.+))?$"), + new Regex(@"^admin images (?\w+) add (?\S+)(?:\s+(?raw))?(?:\s+(?.+))?$"), + new Regex(@"^admin image (?\w+) add_nigger (?\S+)(?:\s+(?raw))?(?:\s+(?.+))?$"), + new Regex(@"^admin images (?\w+) add_nigger (?\S+)(?:\s+(?raw))?(?:\s+(?.+))?$") ]; public string? HelpText => "Add an image to the image rotation specified"; public UserRight RequiredRight => UserRight.TrueAndHonest; @@ -33,7 +34,9 @@ public class AddImageCommand : ICommand if (imageKeys == null) throw new InvalidOperationException($"{BuiltIn.Keys.BotImageAcceptableKeys} was null"); var key = arguments["key"].Value; var url = arguments["url"].Value; + var tags = arguments["tags"].Success ? arguments["tags"].Value.Trim() : null; var niggerMode = message.Message.Contains("add_nigger"); + var _rawMode = arguments["raw"].Success; if (!imageKeys.Contains(key)) { await botInstance.SendChatMessageAsync( @@ -47,9 +50,17 @@ public class AddImageCommand : ICommand return; } - await db.Images.AddAsync(new ImageDbModel { Key = key, Url = url, LastSeen = DateTimeOffset.MinValue }, ctx); + if (!Regex.IsMatch(url, @"^https?://\S+$")) + { + await botInstance.SendWhisperAsync(user.KfId, $"The URL '{url}' you provided is not valid"); + return; + } + + string result = url; + // todo add automatic compression/re-upload and raw mode option + + await db.Images.AddAsync(new ImageDbModel { Key = key, Url = result, LastSeen = DateTimeOffset.MinValue, Tags = tags }, ctx); await db.SaveChangesAsync(ctx); - //await botInstance.SendChatMessageAsync("Added image to database", true); await botInstance.SendChatMessageAsync( $"{user.FormatUsername()}, you added the following media to the {key} carousel\n[img]{url}[/img]", true); } @@ -130,7 +141,9 @@ public class ListImageCommand : ICommand var content = string.Empty; foreach (var image in images) { - content += image.Url + Environment.NewLine; + var ts = DateTimeOffset.UtcNow - image.LastSeen; + var time = $"{ts.TotalDays:N0}d{ts.Hours:N0}h{ts.Minutes:N0}m{ts.Seconds:N0}s"; + content += $"{image.Url} - {time} - {image.Tags}" + Environment.NewLine; } var paste = await Zipline.Upload(content, new MediaTypeHeaderValue("text/plain"), "1d", ctx); @@ -152,11 +165,62 @@ public class ListImageCommand : ICommand } } +public class ManageImageKeyCommand : ICommand +{ + public List Patterns => [ + new Regex(@"^admin imagekey add (?\w+)$"), + new Regex(@"^admin imagekey remove (?\w+)$"), + new Regex(@"^admin imagekey delete (?\w+)$"), + new Regex(@"^admin imageskey add (?\w+)$"), + new Regex(@"^admin imageskey remove (?\w+)$"), + new Regex(@"^admin imageskey delete (?\w+)$") + ]; + public string? HelpText => "Add or remove an acceptable image key from the BotImageAcceptableKeys setting"; + public UserRight RequiredRight => UserRight.Admin; + public TimeSpan Timeout => TimeSpan.FromSeconds(10); + public RateLimitOptionsModel? RateLimitOptions => null; + public bool WhisperCanInvoke => false; + public async Task RunCommand(ChatBot botInstance, BotCommandMessageModel message, UserDbModel user, GroupCollection arguments, + CancellationToken ctx) + { + var imageKeys = (await SettingsProvider.GetValueAsync(BuiltIn.Keys.BotImageAcceptableKeys)).JsonDeserialize>(); + if (imageKeys == null) throw new InvalidOperationException($"{BuiltIn.Keys.BotImageAcceptableKeys} was null"); + var key = arguments["key"].Value.ToLower(); + var isAdd = message.Message.Contains(" add "); + + if (isAdd) + { + if (imageKeys.Contains(key)) + { + await botInstance.SendChatMessageAsync($"Key \"{key}\" is already in the acceptable keys list", true); + return; + } + imageKeys.Add(key); + await SettingsProvider.SetValueAsync(BuiltIn.Keys.BotImageAcceptableKeys, JsonSerializer.Serialize(imageKeys)); + await botInstance.SendChatMessageAsync( + $"Added key \"{key}\" to acceptable image keys. Current keys: {string.Join(' ', imageKeys)}", true); + } + else + { + if (!imageKeys.Contains(key)) + { + await botInstance.SendChatMessageAsync( + $"Key \"{key}\" is not in the acceptable keys list. Current keys: {string.Join(' ', imageKeys)}", true); + return; + } + imageKeys.Remove(key); + await SettingsProvider.SetValueAsync(BuiltIn.Keys.BotImageAcceptableKeys, JsonSerializer.Serialize(imageKeys)); + await botInstance.SendChatMessageAsync( + $"Removed key \"{key}\" from acceptable image keys. Current keys: {string.Join(' ', imageKeys)}", true); + } + } +} + [AllowAdditionalMatches] public class GetRandomImage : ICommand { public List Patterns => [ - new Regex(@"^(?\w+)") + new Regex(@"^(?\w+)(?:\s+(?.+))?") ]; public string? HelpText => "Get a random image"; public UserRight RequiredRight => UserRight.Loser; @@ -173,6 +237,7 @@ public class GetRandomImage : ICommand { await using var db = new ApplicationDbContext(); var key = arguments["key"].Value.ToLower(); + var searchTerm = arguments["search"].Success ? arguments["search"].Value.Trim() : null; var images = db.Images.Where(i => i.Key == key); if (!await images.AnyAsync(ctx)) { @@ -191,18 +256,41 @@ public class GetRandomImage : ICommand BuiltIn.Keys.BotImagePigCubeSelfDestructMax, BuiltIn.Keys.BotImageInvertedPigCubeSelfDestructDelay, BuiltIn.Keys.BotImageChinkSelfDestruct, BuiltIn.Keys.BotImageChinkSelfDestructDelay ]); - var divideBy = settings[BuiltIn.Keys.BotImageRandomSliceDivideBy].ToType(); - var limit = 1; - var count = await images.CountAsync(ctx); - if (count > divideBy) - { - limit = count / divideBy; - } - // EF with SQLite can't sort on dates as it's just TEXT - var selection = (await images.ToListAsync(ctx)).OrderBy(i => i.LastSeen).Take(limit).ToList(); - // MaxValue is never returned by Next so you don't need to -1 for indexing - var image = selection[new Random().Next(0, selection.Count)]; + ImageDbModel image; + if (!string.IsNullOrEmpty(searchTerm)) + { + var allImages = await images.ToListAsync(ctx); + var searchTokens = searchTerm.ToLower().Split(' ', StringSplitOptions.RemoveEmptyEntries); + var matches = allImages.Where(i => + { + if (i.Tags == null) return false; + var tagTokens = i.Tags.ToLower().Split(' ', StringSplitOptions.RemoveEmptyEntries); + return searchTokens.All(st => tagTokens.Contains(st)); + }).ToList(); + if (matches.Count == 0) + { + RateLimitService.RemoveMostRecentEntry(user, this); + await botInstance.SendChatMessageAsync($"No image in {key} matched \"{searchTerm}\"", true); + return; + } + image = matches.OrderBy(i => i.LastSeen).First(); + } + else + { + var divideBy = settings[BuiltIn.Keys.BotImageRandomSliceDivideBy].ToType(); + var limit = 1; + var count = await images.CountAsync(ctx); + if (count > divideBy) + { + limit = count / divideBy; + } + + // EF with SQLite can't sort on dates as it's just TEXT + var selection = (await images.ToListAsync(ctx)).OrderBy(i => i.LastSeen).Take(limit).ToList(); + // MaxValue is never returned by Next so you don't need to -1 for indexing + image = selection[new Random().Next(0, selection.Count)]; + } image.LastSeen = DateTimeOffset.UtcNow; db.Images.Update(image); await db.SaveChangesAsync(ctx); diff --git a/KfChatDotNetBot/Migrations/20260510073657_AddImageTags.Designer.cs b/KfChatDotNetBot/Migrations/20260510073657_AddImageTags.Designer.cs new file mode 100644 index 0000000..0220de7 --- /dev/null +++ b/KfChatDotNetBot/Migrations/20260510073657_AddImageTags.Designer.cs @@ -0,0 +1,636 @@ +// +using System; +using KfChatDotNetBot; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace KfChatDotNetBot.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20260510073657_AddImageTags")] + partial class AddImageTags + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "10.0.3"); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.ChipsggBetDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Amount") + .HasColumnType("REAL"); + + b.Property("BetId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("Currency") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("CurrencyPrice") + .HasColumnType("REAL"); + + b.Property("GameTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Multiplier") + .HasColumnType("REAL"); + + b.Property("Updated") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Username") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Win") + .HasColumnType("INTEGER"); + + b.Property("Winnings") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.ToTable("ChipsggBets"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.GamblerDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Balance") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("NextVipLevelWagerRequirement") + .HasColumnType("TEXT"); + + b.Property("RandomSeed") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TotalWagered") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Gamblers"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.GamblerExclusionDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("Expires") + .HasColumnType("TEXT"); + + b.Property("GamblerId") + .HasColumnType("INTEGER"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("GamblerId"); + + b.ToTable("Exclusions"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.GamblerPerkDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("GamblerId") + .HasColumnType("INTEGER"); + + b.Property("Metadata") + .HasColumnType("TEXT"); + + b.Property("Payout") + .HasColumnType("TEXT"); + + b.Property("PerkName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PerkTier") + .HasColumnType("INTEGER"); + + b.Property("PerkType") + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("GamblerId"); + + b.ToTable("Perks"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.HowlggBetsDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bet") + .HasColumnType("INTEGER"); + + b.Property("BetId") + .HasColumnType("INTEGER"); + + b.Property("Date") + .HasColumnType("TEXT"); + + b.Property("Game") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("GameId") + .HasColumnType("INTEGER"); + + b.Property("Profit") + .HasColumnType("INTEGER"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("HowlggBets"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.ImageDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastSeen") + .HasColumnType("TEXT"); + + b.Property("Tags") + .HasColumnType("TEXT"); + + b.Property("Url") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.JuicerDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Amount") + .HasColumnType("REAL"); + + b.Property("JuicedAt") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Juicers"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.MomDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Moms"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.RainbetBetsDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BetId") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("BetSeenAt") + .HasColumnType("TEXT"); + + b.Property("GameName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Multiplier") + .HasColumnType("REAL"); + + b.Property("Payout") + .HasColumnType("REAL"); + + b.Property("PublicId") + .HasColumnType("TEXT"); + + b.Property("RainbetUserId") + .HasColumnType("INTEGER"); + + b.Property("UpdatedAt") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.ToTable("RainbetBets"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.SettingDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CacheDuration") + .HasColumnType("REAL"); + + b.Property("Default") + .HasColumnType("TEXT"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IsSecret") + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Regex") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.Property("ValueType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Settings"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.StreamDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AutoCapture") + .HasColumnType("INTEGER"); + + b.Property("Metadata") + .HasColumnType("TEXT"); + + b.Property("Service") + .HasColumnType("INTEGER"); + + b.Property("StreamUrl") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Streams"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.TransactionDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Effect") + .HasColumnType("TEXT"); + + b.Property("EventSource") + .HasColumnType("INTEGER"); + + b.Property("FromId") + .HasColumnType("INTEGER"); + + b.Property("GamblerId") + .HasColumnType("INTEGER"); + + b.Property("NewBalance") + .HasColumnType("TEXT"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.Property("TimeUnixEpochSeconds") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("FromId"); + + b.HasIndex("GamblerId"); + + b.ToTable("Transactions"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.TwitchViewCountDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ServerTime") + .HasColumnType("REAL"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.Property("Topic") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Viewers") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("TwitchViewCounts"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.UserDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Ignored") + .HasColumnType("INTEGER"); + + b.Property("KfId") + .HasColumnType("INTEGER"); + + b.Property("KfUsername") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UserRight") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.UserWhoWasDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ActivityType") + .HasColumnType("INTEGER"); + + b.Property("FirstOccurence") + .HasColumnType("TEXT"); + + b.Property("LatestOccurence") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("UsersWhoWere"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.WagerDbModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("GamblerId") + .HasColumnType("INTEGER"); + + b.Property("Game") + .HasColumnType("INTEGER"); + + b.Property("GameMeta") + .HasColumnType("TEXT"); + + b.Property("IsComplete") + .HasColumnType("INTEGER"); + + b.Property("Multiplier") + .HasColumnType("TEXT"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.Property("TimeUnixEpochSeconds") + .HasColumnType("INTEGER"); + + b.Property("WagerAmount") + .HasColumnType("TEXT"); + + b.Property("WagerEffect") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("GamblerId"); + + b.ToTable("Wagers"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.GamblerDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.UserDbModel", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.GamblerExclusionDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.GamblerDbModel", "Gambler") + .WithMany() + .HasForeignKey("GamblerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Gambler"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.GamblerPerkDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.GamblerDbModel", "Gambler") + .WithMany() + .HasForeignKey("GamblerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Gambler"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.JuicerDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.UserDbModel", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.MomDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.UserDbModel", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.StreamDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.UserDbModel", "User") + .WithMany() + .HasForeignKey("UserId"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.TransactionDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.GamblerDbModel", "From") + .WithMany() + .HasForeignKey("FromId"); + + b.HasOne("KfChatDotNetBot.Models.DbModels.GamblerDbModel", "Gambler") + .WithMany() + .HasForeignKey("GamblerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("From"); + + b.Navigation("Gambler"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.UserWhoWasDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.UserDbModel", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("KfChatDotNetBot.Models.DbModels.WagerDbModel", b => + { + b.HasOne("KfChatDotNetBot.Models.DbModels.GamblerDbModel", "Gambler") + .WithMany() + .HasForeignKey("GamblerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Gambler"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/KfChatDotNetBot/Migrations/20260510073657_AddImageTags.cs b/KfChatDotNetBot/Migrations/20260510073657_AddImageTags.cs new file mode 100644 index 0000000..f7b15d9 --- /dev/null +++ b/KfChatDotNetBot/Migrations/20260510073657_AddImageTags.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace KfChatDotNetBot.Migrations +{ + /// + public partial class AddImageTags : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Tags", + table: "Images", + type: "TEXT", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Tags", + table: "Images"); + } + } +} diff --git a/KfChatDotNetBot/Migrations/ApplicationDbContextModelSnapshot.cs b/KfChatDotNetBot/Migrations/ApplicationDbContextModelSnapshot.cs index 9d7532f..f70983a 100644 --- a/KfChatDotNetBot/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/KfChatDotNetBot/Migrations/ApplicationDbContextModelSnapshot.cs @@ -212,6 +212,9 @@ namespace KfChatDotNetBot.Migrations b.Property("LastSeen") .HasColumnType("TEXT"); + b.Property("Tags") + .HasColumnType("TEXT"); + b.Property("Url") .IsRequired() .HasColumnType("TEXT"); diff --git a/KfChatDotNetBot/Models/DbModels/ImageDbModel.cs b/KfChatDotNetBot/Models/DbModels/ImageDbModel.cs index 53bd78a..8a330f7 100644 --- a/KfChatDotNetBot/Models/DbModels/ImageDbModel.cs +++ b/KfChatDotNetBot/Models/DbModels/ImageDbModel.cs @@ -6,4 +6,5 @@ public class ImageDbModel public required string Key { get; set; } public required string Url { get; set; } public required DateTimeOffset LastSeen { get; set; } + public string? Tags { get; set; } } \ No newline at end of file