Refactors. Cleanup. Refactored responses source gen a little. Parametrized localized strings are now generic. Refactored .cash bank interaction. Updated changelog. Reverted clubapps/ban/unban to use .ToString method and configured it to not have right to left unicode. Added extension methods to SocketMessageComponent akin to ones on the IMessageChannel (RespondConfirm, etc...)

src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs

@@ -0,0 +1,27 @@
+namespace NadekoBot;
+
+public sealed class NadekoActionInteraction : NadekoOwnInteraction
+{
+    private readonly NadekoInteractionData _data;
+    private readonly Func<SocketMessageComponent, Task> _action;
+
+    public NadekoActionInteraction(
+        DiscordSocketClient client,
+        ulong authorId,
+        NadekoInteractionData data,
+        Func<SocketMessageComponent, Task> action
+    )
+        : base(client, authorId)
+    {
+        _data = data;
+        _action = action;
+    }
+
+    public override string Name
+        => _data.CustomId;
+    public override IEmote Emote
+        => _data.Emote;
+
+    public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
+        => _action(smc);
+}

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -1,6 +1,5 @@
 namespace NadekoBot;
 
-
 public abstract class NadekoInteraction
 {
     // improvements:
@@ -9,20 +8,16 @@ public abstract class NadekoInteraction
     //  - 
     public abstract string Name { get; }
     public abstract IEmote Emote { get; }
-    public Func<SocketMessageComponent, Task> OnAction { get; }
 
     protected readonly DiscordSocketClient _client;
 
     protected readonly TaskCompletionSource<bool> _interactionCompletedSource;
 
-    protected ulong _authorId;
     protected IUserMessage message = null!;
 
-    protected NadekoInteraction(DiscordSocketClient client, ulong authorId, Func<SocketMessageComponent, Task> onAction)
+    protected NadekoInteraction(DiscordSocketClient client)
     {
         _client = client;
-        _authorId = authorId;
-        OnAction = onAction;
         _interactionCompletedSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
     }
 
@@ -37,6 +32,7 @@ public abstract class NadekoInteraction
         await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
     }
 
+    protected abstract ValueTask<bool> Validate(SocketMessageComponent smc);
     private async Task OnInteraction(SocketInteraction arg)
     {
         if (arg is not SocketMessageComponent smc)
@@ -48,15 +44,15 @@ public abstract class NadekoInteraction
         if (smc.Data.CustomId != Name)
             return;
 
-        if (smc.User.Id != _authorId)
+        if (!await Validate(smc))
         {
-            await arg.DeferAsync();
+            await smc.DeferAsync();
             return;
         }
 
         _ = Task.Run(async () =>
         {
-            await OnAction(smc);
+            await ExecuteOnActionAsync(smc);
             
             // this should only be a thing on single-response buttons
             _interactionCompletedSource.TrySetResult(true);
@@ -76,5 +72,6 @@ public abstract class NadekoInteraction
 
         return comp.Build();
     }
-}
-    
+
+    public abstract Task ExecuteOnActionAsync(SocketMessageComponent smc);
+}

src/NadekoBot/Common/Interaction/NadekoInteractionBuilder.cs

@@ -0,0 +1,41 @@
+namespace NadekoBot;
+
+/// <summary>
+/// Builder class for NadekoInteractions
+/// </summary>
+public class NadekoInteractionBuilder
+{
+    private NadekoInteractionData? iData;
+    private Func<SocketMessageComponent, Task>? action;
+    // private bool isOwn;
+
+    public NadekoInteractionBuilder WithData<T>(in T data)
+        where T : NadekoInteractionData
+    {
+        iData = data;
+        return this;
+    }
+
+    // public NadekoOwnInteractionBuiler WithIsOwn(bool isOwn = true)
+    // {
+    //     this.isOwn = isOwn;
+    //     return this;
+    // }
+    
+    public NadekoInteractionBuilder WithAction(in Func<SocketMessageComponent, Task> fn)
+    {
+        this.action = fn;
+        return this;
+    }
+
+    public NadekoActionInteraction Build(DiscordSocketClient client, ulong userId)
+    {
+        if (iData is null)
+            throw new InvalidOperationException("You have to specify the data before building the interaction");
+
+        if (action is null)
+            throw new InvalidOperationException("You have to specify the action before building the interaction");
+
+        return new(client, userId, iData, action);
+    }
+}

src/NadekoBot/Common/Interaction/NadekoInteractionData.cs

@@ -0,0 +1,8 @@
+namespace NadekoBot;
+
+/// <summary>
+/// Represents essential interacation data
+/// </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);

src/NadekoBot/Common/Interaction/NadekoOwnInteraction.cs

@@ -0,0 +1,15 @@
+namespace NadekoBot;
+
+/// <summary>
+/// Interaction which only the author can use
+/// </summary>
+public abstract class NadekoOwnInteraction : NadekoInteraction
+{
+    protected readonly ulong _authorId;
+
+    protected NadekoOwnInteraction(DiscordSocketClient client, ulong authorId) : base(client)
+        => _authorId = authorId;
+
+    protected override ValueTask<bool> Validate(SocketMessageComponent smc)
+        => new(smc.User.Id == _authorId);
+}