Develop

.github/workflows/docker-deploy-develop.yml

@@ -16,6 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: fjogeleit/http-request-action@v1
+      continue-on-error: true
       with:
         url: 'https://testbot.api.macro-deck.app/webhook/deploy'
         method: 'POST'
@@ -33,6 +34,7 @@ jobs:
     - name: Push the Docker image
       run: docker push suchbyte/macro-bot:dev_${{ github.sha }}
     - uses: fjogeleit/http-request-action@v1
+      continue-on-error: true
       with:
         url: 'https://testbot.api.macro-deck.app/webhook/deploy'
         method: 'POST'

MacroBotApp/Config/KoFiConfig.cs

@@ -0,0 +1,7 @@
+namespace MacroBot.Config;
+
+public class KoFiConfig : LoadableConfig<KoFiConfig>
+{
+    public string VerificationToken { get; set; } = string.Empty;
+    public ulong ChannelId { get; set; }
+}

MacroBotApp/Controllers/KoFiController.cs

@@ -0,0 +1,50 @@
+using System.Text.Json;
+using MacroBot.Config;
+using MacroBot.Crypto;
+using MacroBot.ManagerInterfaces;
+using MacroBot.Models.KoFi;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace MacroBot.Controllers;
+
+[Route("/kofi")]
+public class KoFiController : ControllerBase
+{
+    private readonly KoFiConfig _koFiConfig;
+    private readonly IKoFiManager _koFiManager;
+
+    public KoFiController(KoFiConfig koFiConfig,
+        IKoFiManager koFiManager)
+    {
+        _koFiConfig = koFiConfig;
+        _koFiManager = koFiManager;
+    }
+
+    [HttpPost("webhook")]
+    [AllowAnonymous]
+    [Consumes("application/x-www-form-urlencoded")]
+    public async Task<IActionResult> DonationCreated([FromForm] string data)
+    {
+        var koFiWebhookRequest = JsonSerializer.Deserialize<KoFiWebhookRequest>(data);
+        if (koFiWebhookRequest == null)
+        {
+            return new BadRequestResult();
+        }
+        var verificationToken = koFiWebhookRequest.VerificationToken;
+        if (string.IsNullOrWhiteSpace(verificationToken))
+        {
+            return new UnauthorizedResult();
+        }
+
+        if (!verificationToken.EqualsCryptographically(_koFiConfig.VerificationToken))
+        {
+            return new StatusCodeResult(StatusCodes.Status403Forbidden);
+        }
+
+        koFiWebhookRequest.VerificationToken = null;
+
+        await _koFiManager.HandleWebhook(koFiWebhookRequest);
+        return Ok();
+    }
+}

MacroBotApp/Crypto/CryptoExtensions.cs

@@ -0,0 +1,20 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace MacroBot.Crypto;
+
+public static class CryptoExtensions
+{
+    public static bool EqualsCryptographically(this string str1, string str2)
+    {
+        var hash1 = SHA256.HashData(Encoding.UTF8.GetBytes(str1));
+        var hash2 = SHA256.HashData(Encoding.UTF8.GetBytes(str2));
+
+        if (hash1.Length != hash2.Length)
+        {
+            return false;
+        }
+
+        return !hash1.Where((t, i) => t != hash2[i]).Any();
+    }
+}

MacroBotApp/Enums/KoFiWebhookType.cs

@@ -0,0 +1,7 @@
+namespace MacroBot.Enums;
+
+public enum KoFiWebhookType
+{
+    Donation,
+    Subscription,
+}

MacroBotApp/MacroBotApp.csproj

@@ -7,7 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

MacroBotApp/Manager/KoFiManager.cs

@@ -0,0 +1,123 @@
+using System.ComponentModel;
+using MacroBot.Config;
+using MacroBot.Enums;
+using MacroBot.ManagerInterfaces;
+using MacroBot.Models.KoFi;
+using MacroBot.Models.Webhook;
+using MacroBot.ServiceInterfaces;
+
+namespace MacroBot.Manager;
+
+public class KoFiManager : IKoFiManager
+{
+    private readonly KoFiConfig _koFiConfig;
+    private readonly IDiscordService _discordService;
+
+    public KoFiManager(KoFiConfig koFiConfig, IDiscordService discordService)
+    {
+        _koFiConfig = koFiConfig;
+        _discordService = discordService;
+    }
+
+    public async Task HandleWebhook(KoFiWebhookRequest koFiWebhookRequest)
+    {
+        switch (koFiWebhookRequest.Type)
+        {
+            case KoFiWebhookType.Donation:
+                await HandleDonation(koFiWebhookRequest);
+                break;
+            case KoFiWebhookType.Subscription:
+                await HandleSubscription(koFiWebhookRequest);
+                break;
+            default:
+                throw new InvalidEnumArgumentException("Type not found");
+        }
+    }
+
+    private async Task BroadcastDiscord(WebhookRequestEmbed webhookRequestEmbed)
+    {
+        var webhookRequest = new WebhookRequest
+        {
+            Embed = webhookRequestEmbed
+        };
+
+        var webhook = new WebhookItem
+        {
+            Id = "Ko-Fi",
+            ChannelId = _koFiConfig.ChannelId
+        };
+
+        await _discordService.BroadcastWebhookAsync(webhook, webhookRequest);
+    }
+
+    private async Task HandleDonation(KoFiWebhookRequest koFiWebhookRequest)
+    {
+        var webhookRequestEmbed = BuildEmbed(koFiWebhookRequest);
+        webhookRequestEmbed.Title = "New donation 🎊";
+        await BroadcastDiscord(webhookRequestEmbed);
+    }
+
+    private async Task HandleSubscription(KoFiWebhookRequest koFiWebhookRequest)
+    {
+
+        var webhookRequestEmbed = BuildEmbed(koFiWebhookRequest);
+        webhookRequestEmbed.Title = koFiWebhookRequest.IsFirstSubscriptionPayment 
+            ? "🎉 New monthly subscription 🎉"
+            : "🎉🎉 Monthly subscription renewal 🎉🎉";
+        await BroadcastDiscord(webhookRequestEmbed);
+    }
+
+    private static WebhookRequestEmbed BuildEmbed(KoFiWebhookRequest koFiWebhookRequest)
+    {
+        var supporterName = koFiWebhookRequest.FromName ?? "Anonymous";
+        var amount = koFiWebhookRequest.Amount ?? "Hidden";
+        var currency = koFiWebhookRequest.Currency ?? string.Empty;
+        var message = koFiWebhookRequest.IsPublic
+            ? koFiWebhookRequest.Message
+            : null;
+
+        var webHookRequestEmbed = new WebhookRequestEmbed
+        {
+            Color = new WebhookRequestEmbedColor
+            {
+                R = 0,
+                G = 1,
+                B = 0
+            },
+            Fields = new List<WebhookRequestEmbedField>()
+            {
+                new ()
+                {
+                    Name = "From",
+                    Value = supporterName,
+                    Inline = true
+                },
+                new ()
+                {
+                    Name = "Amount",
+                    Value = $"{amount} {currency}",
+                    Inline = true
+                }
+            }
+        };
+
+        if (!string.IsNullOrWhiteSpace(message))
+        {
+            webHookRequestEmbed.Fields.Add(new WebhookRequestEmbedField
+            {
+                Name = "Message",
+                Value = message,
+                Inline = false
+            });
+        }
+
+        webHookRequestEmbed.Fields.Add(new WebhookRequestEmbedField
+        {
+            Name = "Also want to support the project?",
+            Value = "https://ko-fi.com/manuelmayer",
+            Inline = false
+        });
+
+        return webHookRequestEmbed;
+    }
+}

MacroBotApp/ManagerInterfaces/IKoFiManager.cs

@@ -0,0 +1,8 @@
+using MacroBot.Models.KoFi;
+
+namespace MacroBot.ManagerInterfaces;
+
+public interface IKoFiManager
+{
+    public Task HandleWebhook(KoFiWebhookRequest koFiWebhookRequest);
+}

MacroBotApp/Models/KoFi/KoFiWebhookRequest.cs

@@ -0,0 +1,58 @@
+using System.Text.Json.Serialization;
+using MacroBot.Enums;
+
+namespace MacroBot.Models.KoFi;
+
+public class KoFiWebhookRequest
+{
+    [JsonPropertyName("verification_token")]
+    public string? VerificationToken { get; set; }
+
+    [JsonPropertyName("message_id")]
+    public string? MessageId { get; set; }
+
+    [JsonPropertyName("timestamp")]
+    public DateTime Timestamp { get; set; }
+
+    [JsonPropertyName("type"), JsonConverter(typeof(JsonStringEnumConverter))]
+    public KoFiWebhookType? Type { get; set; }
+
+    [JsonPropertyName("is_public")]
+    public bool IsPublic { get; set; }
+
+    [JsonPropertyName("from_name")]
+    public string? FromName { get; set; }
+
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    [JsonPropertyName("amount")]
+    public string? Amount { get; set; }
+
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+
+    [JsonPropertyName("email")]
+    public string? Email { get; set; }
+
+    [JsonPropertyName("currency")]
+    public string? Currency { get; set; }
+
+    [JsonPropertyName("is_subscription_payment")]
+    public bool IsSubscriptionPayment { get; set; }
+
+    [JsonPropertyName("is_first_subscription_payment")]
+    public bool IsFirstSubscriptionPayment { get; set; }
+
+    [JsonPropertyName("kofi_transaction_id")]
+    public string? KofiTransactionId { get; set; }
+
+    [JsonPropertyName("shop_items")]
+    public object? ShopItems { get; set; }
+
+    [JsonPropertyName("tier_name")]
+    public string? TierName { get; set; }
+
+    [JsonPropertyName("shipping")]
+    public object? Shipping { get; set; }
+}

MacroBotApp/Paths.cs

@@ -20,7 +20,7 @@ private static string MainDirectory
     public static readonly string CommandsConfigPath = Path.Combine(MainDirectory, "Commands.json");
     public static readonly string StatusCheckConfigPath = Path.Combine(MainDirectory, "StatusCheck.json");
     public static readonly string DatabasePath = Path.Combine(MainDirectory, "Database.db");
-    public static readonly string BuyMeACoffeeConfigPath = Path.Combine(MainDirectory, "BuyMeACoffee.json");
+    public static readonly string KoFiConfigPath = Path.Combine(MainDirectory, "KoFi.json");
 
     public static void EnsureDirectoriesCreated()
     {

MacroBotApp/Startup.cs

@@ -8,6 +8,8 @@
 using MacroBot.DataAccess.RepositoryInterfaces;
 using MacroBot.Discord.Modules.Tagging;
 using MacroBot.Extensions;
+using MacroBot.Manager;
+using MacroBot.ManagerInterfaces;
 using MacroBot.ServiceInterfaces;
 using MacroBot.Services;
 using MacroBot.StartupConfig;
@@ -45,6 +47,7 @@ public void ConfigureServices(IServiceCollection services)
         services.AddInjectableHostedService<IDiscordService, DiscordService>();
         services.AddInjectableHostedService<IStatusCheckService, StatusCheckService>();
         services.AddInjectableHostedService<ITimerService, TimerService>();
+        services.AddScoped<IKoFiManager, KoFiManager>();
         services.AddHttpClient();
         services.AddSwagger();
         services.AddControllers();
@@ -70,13 +73,13 @@ private static void LoadRegisterConfigs(IServiceCollection services)
     {
         Task.Run(async () =>
         {
-            var buyMeACoffeeConfig = await BuyMeACoffeeConfig.LoadAsync(Paths.BuyMeACoffeeConfigPath);
+            var koFiConfig = await KoFiConfig.LoadAsync(Paths.KoFiConfigPath);
             var botConfig = await BotConfig.LoadAsync(Paths.BotConfigPath);
             var commandsConfig = await CommandsConfig.LoadAsync(Paths.CommandsConfigPath);
             var statusCheckConfig = await StatusCheckConfig.LoadAsync(Paths.StatusCheckConfigPath);
             var webhooksConfig = await WebhooksConfig.LoadAsync(Paths.WebhooksPath);
 
-            services.AddSingleton(buyMeACoffeeConfig);
+            services.AddSingleton(koFiConfig);
             services.AddSingleton(statusCheckConfig);
             services.AddSingleton(webhooksConfig);
             services.AddSingleton(botConfig);