UAC descriptions

see #40

Behaver.cs

@@ -1,7 +1,7 @@
 namespace vassago;
-#pragma warning disable 4014
+#pragma warning disable 4014  //the "not awaited" error
 using gray_messages.chat;
-using franz;//the "not awaited" error
+using franz;
 using vassago.Behavior;
 using vassago.Models;
 using System;

Behavior/TwitchSummon.cs

@@ -22,9 +22,11 @@ public class TwitchSummon : Behavior
             myUAC = new()
             {
                 OwnerId = uacID,
-                DisplayName = Name
+                DisplayName = Name,
+                Description = @"matching this means you can summon the bot <i>to</i> <b>any</b> twitch channel"
             };
         }
+        Rememberer.RememberUAC(myUAC);
     }
     public override bool ShouldAct(Message message)
     {
@@ -55,4 +57,44 @@ public class TwitchSummon : Behavior
         }
         return true;
     }
+    [StaticPlz]
+    public class TwitchDismiss : Behavior
+    {
+        public override string Name => "Twitch Dismiss";
+
+        public override string Trigger => "begone, @[me]";
+
+        public override bool ShouldAct(Message message)
+        {
+            var ti = ProtocolInterfaces.ProtocolList.twitchs.FirstOrDefault();
+            // Console.WriteLine($"TwitchDismiss checking. menions me? {message.MentionsMe}");
+            if (message.MentionsMe &&
+                (Regex.IsMatch(message.Content.ToLower(), "\\bbegone\\b") || Regex.IsMatch(message.Content.ToLower(), "\\bfuck off\\b")))
+            {
+                var channelTarget = message.Content.Substring(message.Content.IndexOf(Trigger) + Trigger.Length + 1).Trim();
+                ti.AttemptLeave(channelTarget);
+                //TODO: PERMISSION! who can dismiss me? pretty simple list:
+                //1) anyone in the channel with authority*
+                //2) whoever summoned me
+                //* i don't know if the twitch *chat* interface will tell me if someone's a mod.
+                return true;
+            }
+            return false;
+        }
+
+        public override async Task<bool> ActOn(Message message)
+        {
+            var ti = ProtocolInterfaces.ProtocolList.twitchs.FirstOrDefault();
+
+            if (ti != null)
+            {
+                ti.AttemptLeave(message.Channel.DisplayName);
+            }
+            else
+            {
+                await message.Reply("i don't have a twitch interface running :(");
+            }
+            return true;
+        }
+    }
 }

Behavior/TwitchUnsummon.cs

@@ -1,46 +0,0 @@
-namespace vassago.Behavior;
-
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using vassago.Models;
-
-[StaticPlz]
-public class TwitchDismiss : Behavior
-{
-    public override string Name => "Twitch Dismiss";
-
-    public override string Trigger => "begone, @[me]";
-
-    public override bool ShouldAct(Message message)
-    {
-        var ti = ProtocolInterfaces.ProtocolList.twitchs.FirstOrDefault();
-        // Console.WriteLine($"TwitchDismiss checking. menions me? {message.MentionsMe}");
-        if(message.MentionsMe &&
-            (Regex.IsMatch(message.Content.ToLower(), "\\bbegone\\b") || Regex.IsMatch(message.Content.ToLower(), "\\bfuck off\\b")))
-            {
-                var channelTarget = message.Content.Substring(message.Content.IndexOf(Trigger) + Trigger.Length + 1).Trim();
-                ti.AttemptLeave(channelTarget);
-                //TODO: PERMISSION! who can dismiss me? pretty simple list:
-                //1) anyone in the channel with authority*
-                //2) whoever summoned me
-                //* i don't know if the twitch *chat* interface will tell me if someone's a mod.
-                return true;
-            }
-        return false;
-    }
-
-    public override async Task<bool> ActOn(Message message)
-    {
-        var ti = ProtocolInterfaces.ProtocolList.twitchs.FirstOrDefault();
-
-        if(ti != null)
-        {
-            ti.AttemptLeave(message.Channel.DisplayName);
-        }
-        else
-        {
-            await message.Reply("i don't have a twitch interface running :(");
-        }
-        return true;
-    }
-}

Behavior/Webhook.cs

@@ -36,14 +36,17 @@ public class Webhook : Behavior
             {
                 Console.WriteLine($"{kvp[0]}: {kvp[1]}");
             }
+            var changed = false;
             var myUAC = Rememberer.SearchUAC(uac => uac.OwnerId == conf.uacID);
             if (myUAC == null)
             {
                 myUAC = new()
                 {
                     OwnerId = conf.uacID,
-                    DisplayName = confName
+                    DisplayName = confName,
+                    Description = conf.Description
                 };
+                changed = true;
                 Rememberer.RememberUAC(myUAC);
             }
             else
@@ -51,11 +54,18 @@ public class Webhook : Behavior
                 if (myUAC.DisplayName != confName)
                 {
                     myUAC.DisplayName = confName;
+                    changed = true;
+                }
+                if (myUAC.Description != conf.Description)
+                {
+                    myUAC.Description = conf.Description;
+                    changed = true;
+                }
+            }
+            if (changed)
                 Rememberer.RememberUAC(myUAC);
         }
     }
-        }
-    }
 
     public override bool ShouldAct(Message message)
     {
@@ -179,6 +189,7 @@ public class WebhookConf
     public Enumerations.HttpVerb Method { get; set; }
     public List<List<string>> Headers { get; set; }
     public string Content { get; set; }
+    public string Description { get; set; }
 }
 public class WebhookActionOrder
 {

Migrations/20250523181842_channelAliases.Designer.cs

@@ -0,0 +1,386 @@
+// <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("20250523181842_channelAliases")]
+    partial class channelAliases
+    {
+        /// <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<Dictionary<string, string>>("Aliases")
+                        .HasColumnType("hstore");
+
+                    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.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.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<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    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
+        }
+    }
+}

Migrations/20250523181842_channelAliases.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace vassago.Migrations
+{
+    /// <inheritdoc />
+    public partial class channelAliases : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterDatabase()
+                .Annotation("Npgsql:PostgresExtension:hstore", ",,");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Description",
+                table: "UACs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Dictionary<string, string>>(
+                name: "Aliases",
+                table: "Channels",
+                type: "hstore",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Description",
+                table: "UACs");
+
+            migrationBuilder.DropColumn(
+                name: "Aliases",
+                table: "Channels");
+
+            migrationBuilder.AlterDatabase()
+                .OldAnnotation("Npgsql:PostgresExtension:hstore", ",,");
+        }
+    }
+}

Migrations/ChattingContextModelSnapshot.cs

@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -20,6 +21,7 @@ namespace vassago.Migrations
                 .HasAnnotation("ProductVersion", "7.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "hstore");
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
             modelBuilder.Entity("AccountUAC", b =>
@@ -146,6 +148,9 @@ namespace vassago.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
+                    b.Property<Dictionary<string, string>>("Aliases")
+                        .HasColumnType("hstore");
+
                     b.Property<int>("ChannelType")
                         .HasColumnType("integer");
 
@@ -231,6 +236,9 @@ namespace vassago.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
                     b.Property<string>("DisplayName")
                         .HasColumnType("text");
 

Models/Channel.cs

@@ -34,8 +34,9 @@ public class Channel
     public bool? ReactionsPossible { get; set; }
     public Enumerations.LewdnessFilterLevel? LewdnessFilterLevel { get; set; }
     public Enumerations.MeannessFilterLevel? MeannessFilterLevel { get; set; }
-
     public List<UAC> UACs { get; set; }
+    //both incoming and outgoing
+    //public Dictionary<string, string> Aliases { get; set; }
 
     [NonSerialized]
     public Func<string, string, Task> SendFile;

appsettings.json

@@ -19,7 +19,13 @@
     {
       "uacID": "9a94855a-e5a2-43b5-8420-ce670472ce95",
       "Trigger": "test",
-      "Uri": "http://localhost"
+      "Description": "<i>test</i>",
+      "Uri": "http://localhost",
+      "Method": "POST",
+      "Headers": [
+        ["Content-Type", "application/json"]
+      ],
+      "Content": "{\"content\": \"Hello, this is a message from my webhook: {text}. username: {account}, user: {user}\"}"
     }
   ],
   "KafkaBootstrap":"http://localhost:9092",