NadekoBot Patronage system, Search commands improvements + fixes

src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs

@@ -1,11 +1,11 @@
 namespace NadekoBot;
 
-public sealed class NadekoActionInteraction : NadekoOwnInteraction
+public sealed class NadekoButtonActionInteraction : NadekoButtonOwnInteraction
 {
     private readonly NadekoInteractionData _data;
     private readonly Func<SocketMessageComponent, Task> _action;
 
-    public NadekoActionInteraction(
+    public NadekoButtonActionInteraction(
         DiscordSocketClient client,
         ulong authorId,
         NadekoInteractionData data,
@@ -17,10 +17,12 @@ public sealed class NadekoActionInteraction : NadekoOwnInteraction
         _action = action;
     }
 
-    public override string Name
+    protected override string Name
         => _data.CustomId;
-    public override IEmote Emote
+    protected override IEmote Emote
         => _data.Emote;
+    protected override string? Text
+        => _data.Text;
 
     public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
         => _action(smc);

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -1,23 +1,24 @@
 namespace NadekoBot;
 
-public abstract class NadekoInteraction
+public abstract class NadekoButtonInteraction
 {
     // improvements:
     //  - state in OnAction
     //  - configurable delay
     //  - 
-    public abstract string Name { get; }
-    public abstract IEmote Emote { get; }
+    protected abstract string Name { get; }
+    protected abstract IEmote Emote { get; }
+    protected virtual string? Text { get; } = null;
 
-    protected readonly DiscordSocketClient _client;
+    public DiscordSocketClient Client { get; }
 
     protected readonly TaskCompletionSource<bool> _interactionCompletedSource;
 
     protected IUserMessage message = null!;
 
-    protected NadekoInteraction(DiscordSocketClient client)
+    protected NadekoButtonInteraction(DiscordSocketClient client)
     {
-        _client = client;
+        Client = client;
         _interactionCompletedSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
     }
 
@@ -25,9 +26,9 @@ public abstract class NadekoInteraction
     {
         message = msg;
 
-        _client.InteractionCreated += OnInteraction;
+        Client.InteractionCreated += OnInteraction;
         await Task.WhenAny(Task.Delay(10_000), _interactionCompletedSource.Task);
-        _client.InteractionCreated -= OnInteraction;
+        Client.InteractionCreated -= OnInteraction;
 
         await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
     }
@@ -65,13 +66,18 @@ public abstract class NadekoInteraction
     }
 
 
-    public MessageComponent CreateComponent()
+    public virtual MessageComponent CreateComponent()
     {
         var comp = new ComponentBuilder()
-            .WithButton(new ButtonBuilder(style: ButtonStyle.Secondary, emote: Emote, customId: Name));
+            .WithButton(GetButtonBuilder());
 
         return comp.Build();
     }
 
+    public ButtonBuilder GetButtonBuilder()
+        => new ButtonBuilder(style: ButtonStyle.Secondary, emote: Emote, customId: Name, label: Text);
+
     public abstract Task ExecuteOnActionAsync(SocketMessageComponent smc);
-}
+}
+
+// this is all so wrong ...

src/NadekoBot/Common/Interaction/NadekoInteractionArray.cs

@@ -0,0 +1,43 @@
+// namespace NadekoBot;
+//
+// public class NadekoButtonInteractionArray : NadekoButtonInteraction
+// {
+//     private readonly ButtonBuilder[] _bbs;
+//     private readonly NadekoButtonInteraction[] _inters;
+//
+//     public NadekoButtonInteractionArray(params NadekoButtonInteraction[] inters)
+//         : base(inters[0].Client)
+//     {
+//         _inters = inters;
+//         _bbs = inters.Map(x => x.GetButtonBuilder());
+//     }
+//
+//     protected override string Name
+//         => throw new NotSupportedException();
+//     protected override IEmote Emote
+//         => throw new NotSupportedException();
+//
+//     protected override ValueTask<bool> Validate(SocketMessageComponent smc)
+//         => new(true);
+//
+//     public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
+//     {
+//         for (var i = 0; i < _bbs.Length; i++)
+//         {
+//             if (_bbs[i].CustomId == smc.Data.CustomId)
+//                 return _inters[i].ExecuteOnActionAsync(smc);
+//         }
+//
+//         return Task.CompletedTask;
+//     }
+//
+//     public override MessageComponent CreateComponent()
+//     {
+//         var comp = new ComponentBuilder();
+//
+//         foreach (var bb in _bbs)
+//             comp.WithButton(bb);
+//         
+//         return comp.Build();
+//     }
+// }

src/NadekoBot/Common/Interaction/NadekoInteractionBuilder.cs

@@ -20,6 +20,7 @@ public class NadekoInteractionBuilder
     // {
     //     this.isOwn = isOwn;
     //     return this;
+    
     // }
     
     public NadekoInteractionBuilder WithAction(in Func<SocketMessageComponent, Task> fn)
@@ -28,7 +29,7 @@ public class NadekoInteractionBuilder
         return this;
     }
 
-    public NadekoActionInteraction Build(DiscordSocketClient client, ulong userId)
+    public NadekoButtonActionInteraction Build(DiscordSocketClient client, ulong userId)
     {
         if (iData is null)
             throw new InvalidOperationException("You have to specify the data before building the interaction");

src/NadekoBot/Common/Interaction/NadekoInteractionData.cs

@@ -5,4 +5,4 @@
 /// </summary>
 /// <param name="Emote">Emote which will show on a button</param>
 /// <param name="CustomId">Custom interaction id</param>
-public record NadekoInteractionData(IEmote Emote, string CustomId);
+public record NadekoInteractionData(IEmote Emote, string CustomId, string? Text = null);

src/NadekoBot/Common/Interaction/NadekoOwnInteraction.cs

@@ -3,11 +3,11 @@
 /// <summary>
 /// Interaction which only the author can use
 /// </summary>
-public abstract class NadekoOwnInteraction : NadekoInteraction
+public abstract class NadekoButtonOwnInteraction : NadekoButtonInteraction
 {
     protected readonly ulong _authorId;
 
-    protected NadekoOwnInteraction(DiscordSocketClient client, ulong authorId) : base(client)
+    protected NadekoButtonOwnInteraction(DiscordSocketClient client, ulong authorId) : base(client)
         => _authorId = authorId;
 
     protected override ValueTask<bool> Validate(SocketMessageComponent smc)