feat: 移除 Patreon & 新增綠界贊助方案，並修正無法獲取表情的問題

konnokai · konnokai · commit da8cf681fe70 · 2025-06-03T09:47:04.000+08:00
diff --git a/Discord Stream Notify Bot/BotConfig.cs b/Discord Stream Notify Bot/BotConfig.cs
@@ -31,6 +31,10 @@ public class BotConfig
     public string TwitterCSRFToken { get; set; } = "";
     public string TwitterSpaceRecordPath { get; set; } = "";
 
+    public ulong YouTubeEmoteId { get; set; } = 1265158558299848827;
+    public ulong PayPalEmoteId { get; set; } = 1265158658015236107;
+    public ulong ECPayEmoteId { get; set; } = 1379272194210795622;
+
     public void InitBotConfig()
     {
         try { File.WriteAllText("bot_config_example.json", JsonConvert.SerializeObject(new BotConfig(), Formatting.Indented)); } catch { }
@@ -98,6 +102,9 @@ public void InitBotConfig()
             GoogleClientId = config.GoogleClientId;
             GoogleClientSecret = config.GoogleClientSecret;
             UptimeKumaPushUrl = config.UptimeKumaPushUrl;
+            YouTubeEmoteId = config.YouTubeEmoteId;
+            PayPalEmoteId = config.PayPalEmoteId;
+            ECPayEmoteId = config.ECPayEmoteId;
 
             if (string.IsNullOrWhiteSpace(config.RedisTokenKey) || string.IsNullOrWhiteSpace(RedisTokenKey))
             {
diff --git a/Discord Stream Notify Bot/Command/Extensions.cs b/Discord Stream Notify Bot/Command/Extensions.cs
@@ -1,5 +1,4 @@
 ﻿using Discord.Commands;
-using Discord_Stream_Notify_Bot.DataBase;
 using Microsoft.Extensions.DependencyInjection;
 using System.Data;
 using System.Reflection;
diff --git a/Discord Stream Notify Bot/Interaction/Help/Help.cs b/Discord Stream Notify Bot/Interaction/Help/Help.cs
@@ -117,7 +117,7 @@ public async Task H([Summary("模組名稱"), Autocomplete(typeof(HelpGetModules
                 embed.Title += " (測試版)";
 #endif
                 embed.WithDescription(File.ReadAllText(Discord_Stream_Notify_Bot.Utility.GetDataFilePath("HelpDescription.txt")).Replace("\\n", "\n") +
-                    $"\n\n您可以透過 {Format.Url("Patreon", Discord_Stream_Notify_Bot.Utility.PatreonUrl)} 或 {Format.Url("Paypal", Discord_Stream_Notify_Bot.Utility.PaypalUrl)} 來贊助直播小幫手");
+                    $"\n\n您可以透過 {Format.Url("綠界", Discord_Stream_Notify_Bot.Utility.ECPayUrl)} 或 {Format.Url("Paypal", Discord_Stream_Notify_Bot.Utility.PaypalUrl)} 來贊助直播小幫手");
                 await RespondAsync(embed: embed.Build());
                 return;
             }
diff --git a/Discord Stream Notify Bot/SharedService/EmojiService.cs b/Discord Stream Notify Bot/SharedService/EmojiService.cs
@@ -4,82 +4,45 @@ namespace Discord_Stream_Notify_Bot.SharedService
 {
     public class EmojiService : IInteractionService
     {
-        // 好像要把 Emote Id 給拉到 BotConfig 設定還是怎樣的
-        public Emote YouTubeEmote
+        public Emote YouTubeEmote { get; private set; }
+        public Emote PayPalEmote { get; private set; }
+        public Emote ECPayEmote { get; private set; }
+
+        private readonly DiscordSocketClient _client;
+
+        public EmojiService(DiscordSocketClient client, BotConfig botConfig)
         {
-            get
+            _client = client;
+
+            try
             {
-#if !RELEASE
-                return null;
-#endif
-                if (youTubeEmote == null)
-                {
-                    try
-                    {
-                        Task.Run(async () => youTubeEmote = await _client.GetApplicationEmoteAsync(1265158558299848827));
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error($"無法取得YouTube Emote: {ex}");
-                        youTubeEmote = null;
-                    }
-                }
-                return youTubeEmote;
+                YouTubeEmote = _client.GetApplicationEmoteAsync(botConfig.YouTubeEmoteId).GetAwaiter().GetResult();
             }
-        }
-
-        public Emote PatreonEmote
-        {
-            get
+            catch (Exception ex)
             {
-#if !RELEASE
-                return null;
-#endif
-                if (patreonEmote == null)
-                {
-                    try
-                    {
-                        Task.Run(async () => patreonEmote = await _client.GetApplicationEmoteAsync(1265158902962458769));
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error($"無法取得Patreon Emote: {ex}");
-                        patreonEmote = null;
-                    }
-                }
-                return patreonEmote;
+                Log.Error($"無法取得 YouTube Emote: {ex}");
+                YouTubeEmote = null;
             }
-        }
 
-        public Emote PayPalEmote
-        {
-            get
+            try
             {
-#if !RELEASE
-                return null;
-#endif
-                if (payPalEmote == null)
-                {
-                    try
-                    {
-                        Task.Run(async () => payPalEmote = await _client.GetApplicationEmoteAsync(1265158658015236107));
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error($"無法取得PayPal Emote: {ex}");
-                        payPalEmote = null;
-                    }
-                }
-                return payPalEmote;
+                PayPalEmote = _client.GetApplicationEmoteAsync(botConfig.PayPalEmoteId).GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"無法取得 PayPal Emote: {ex}");
+                PayPalEmote = null;
             }
-        }
-
-        private Emote youTubeEmote, patreonEmote, payPalEmote;
-        private readonly DiscordSocketClient _client;
 
-        public EmojiService(DiscordSocketClient client)
-        {
-            _client = client;
+            try
+            {
+                ECPayEmote = _client.GetApplicationEmoteAsync(botConfig.ECPayEmoteId).GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"無法取得 ECPay Emote: {ex}");
+                ECPayEmote = null;
+            }
         }
     }
 }
diff --git a/Discord Stream Notify Bot/SharedService/TwitCasting/TwitCastingService.cs b/Discord Stream Notify Bot/SharedService/TwitCasting/TwitCastingService.cs
@@ -187,7 +187,7 @@ private async Task SendStreamMessageAsync(TwitcastingStream twitcastingStream, b
                 else embedBuilder.WithOkColor();
 
                 MessageComponent comp = new ComponentBuilder()
-                        .WithButton("贊助小幫手 (Patreon) #ad", style: ButtonStyle.Link, emote: _emojiService.PatreonEmote, url: Utility.PatreonUrl, row: 1)
+                        .WithButton("贊助小幫手 (綠界) #ad", style: ButtonStyle.Link, emote: _emojiService.ECPayEmote, url: Utility.ECPayUrl, row: 1)
                         .WithButton("贊助小幫手 (Paypal) #ad", style: ButtonStyle.Link, emote: _emojiService.PayPalEmote, url: Utility.PaypalUrl, row: 1).Build();
 
                 foreach (var item in noticeGuildList)
diff --git a/Discord Stream Notify Bot/SharedService/Twitch/TwitchService.cs b/Discord Stream Notify Bot/SharedService/Twitch/TwitchService.cs
@@ -104,7 +104,7 @@ public TwitchService(DiscordSocketClient client, BotConfig botConfig, EmojiServi
 
             _messageComponent = new ComponentBuilder()
                 .WithButton("好手氣，隨機帶你到一個影片或直播", style: ButtonStyle.Link, emote: emojiService.YouTubeEmote, url: "https://api.konnokai.me/randomvideo")
-                .WithButton("贊助小幫手 (Patreon) #ad", style: ButtonStyle.Link, emote: emojiService.PatreonEmote, url: Utility.PatreonUrl, row: 1)
+                .WithButton("贊助小幫手 (綠界) #ad", style: ButtonStyle.Link, emote: emojiService.ECPayEmote, url: Utility.ECPayUrl, row: 1)
                 .WithButton("贊助小幫手 (Paypal) #ad", style: ButtonStyle.Link, emote: emojiService.PayPalEmote, url: Utility.PaypalUrl, row: 1).Build();
 
 #nullable enable
diff --git a/Discord Stream Notify Bot/SharedService/Twitter/TwitterSpacesService.cs b/Discord Stream Notify Bot/SharedService/Twitter/TwitterSpacesService.cs
@@ -5,7 +5,6 @@
 using System.Runtime.InteropServices;
 
 #if RELEASE
-using Microsoft.EntityFrameworkCore;
 using Polly;
 #endif
 
@@ -204,7 +203,7 @@ private async Task SendSpaceMessageAsync(Result userModel, DataBase.Table.Twitte
                 else embedBuilder.WithOkColor();
 
                 MessageComponent comp = new ComponentBuilder()
-                        .WithButton("贊助小幫手 (Patreon) #ad", style: ButtonStyle.Link, emote: _emojiService.PatreonEmote, url: Utility.PatreonUrl, row: 1)
+                        .WithButton("贊助小幫手 (綠界) #ad", style: ButtonStyle.Link, emote: _emojiService.ECPayEmote, url: Utility.ECPayUrl, row: 1)
                         .WithButton("贊助小幫手 (Paypal) #ad", style: ButtonStyle.Link, emote: _emojiService.PayPalEmote, url: Utility.PaypalUrl, row: 1).Build();
 
                 foreach (var item in noticeGuildList)
diff --git a/Discord Stream Notify Bot/SharedService/Youtube/ChangeGuildBanner.cs b/Discord Stream Notify Bot/SharedService/Youtube/ChangeGuildBanner.cs
@@ -60,7 +60,7 @@ private async Task ChangeGuildBannerAsync(string channelId, string videoId)
                                 Image image = new Image(memStream);
                                 await guild.ModifyAsync((func) => func.Banner = image);
                             }
-                            
+
                             item.LastChangeStreamId = videoId;
 
                             using (var db = _dbService.GetDbContext())
diff --git a/Discord Stream Notify Bot/SharedService/Youtube/YoutubeStreamService.cs b/Discord Stream Notify Bot/SharedService/Youtube/YoutubeStreamService.cs
@@ -72,7 +72,7 @@ public YoutubeStreamService(DiscordSocketClient client, IHttpClientFactory httpC
 
             _messageComponent = new ComponentBuilder()
                         .WithButton("好手氣，隨機帶你到一個影片或直播", style: ButtonStyle.Link, emote: emojiService.YouTubeEmote, url: "https://api.konnokai.me/randomvideo")
-                        .WithButton("贊助小幫手 (Patreon) #ad", style: ButtonStyle.Link, emote: emojiService.PatreonEmote, url: Utility.PatreonUrl, row: 1)
+                        .WithButton("贊助小幫手 (綠界) #ad", style: ButtonStyle.Link, emote: emojiService.ECPayEmote, url: Utility.ECPayUrl, row: 1)
                         .WithButton("贊助小幫手 (Paypal) #ad", style: ButtonStyle.Link, emote: emojiService.PayPalEmote, url: Utility.PaypalUrl, row: 1).Build();
 
             if (Bot.Redis != null)
@@ -668,9 +668,9 @@ public async Task<Embed> GetNowStreamingChannel(NowStreamingHost host)
                                 .Select((x) => x.Attributes["href"].Value.Split("?v=")[1]));
                         }
                         break;
-                    //case NowStreamingHost.Niji: //Todo: 實作2434現正直播查詢
-                    //    return null;
-                    //    break;
+                        //case NowStreamingHost.Niji: //Todo: 實作2434現正直播查詢
+                        //    return null;
+                        //    break;
                 }
 
                 var video = YouTubeService.Videos.List("snippet");
diff --git a/Discord Stream Notify Bot/SharedService/YoutubeMember/CheckMemberShip.cs b/Discord Stream Notify Bot/SharedService/YoutubeMember/CheckMemberShip.cs
@@ -1,5 +1,4 @@
-﻿using Discord;
-using Discord_Stream_Notify_Bot.DataBase.Table;
+﻿using Discord_Stream_Notify_Bot.DataBase.Table;
 using Google.Apis.Auth.OAuth2;
 using Google.Apis.Services;
 using Google.Apis.YouTube.v3;
diff --git a/Discord Stream Notify Bot/Utility.cs b/Discord Stream Notify Bot/Utility.cs
@@ -4,7 +4,7 @@ namespace Discord_Stream_Notify_Bot
 {
     public static class Utility
     {
-        public const string PatreonUrl = "https://patreon.com/konnokai";
+        public const string ECPayUrl = "https://p.ecpay.com.tw/B8CCC";
         public const string PaypalUrl = "https://paypal.me/jun112561";
 
         //static Regex videoIdRegex = new Regex(@"youtube_(?'ChannelId'[\w\-]{24})_(?'Date'[\d]{8})_(?'Time'[\d]{6})_(?'VideoId'[\w\-]{11}).mp4.part");

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Discord.Commands;`
`2`		`-using Discord_Stream_Notify_Bot.DataBase;`
`3`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`3`	`using System.Data;`
`5`	`4`	`using System.Reflection;`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public async Task H([Summary("模組名稱"), Autocomplete(typeof(HelpGetModules`
`117`	`117`	`embed.Title += " (測試版)";`
`118`	`118`	`#endif`
`119`	`119`	`embed.WithDescription(File.ReadAllText(Discord_Stream_Notify_Bot.Utility.GetDataFilePath("HelpDescription.txt")).Replace("\\n", "\n") +`
`120`		`- $"\n\n您可以透過 {Format.Url("Patreon", Discord_Stream_Notify_Bot.Utility.PatreonUrl)} 或 {Format.Url("Paypal", Discord_Stream_Notify_Bot.Utility.PaypalUrl)} 來贊助直播小幫手");`
	`120`	`+ $"\n\n您可以透過 {Format.Url("綠界", Discord_Stream_Notify_Bot.Utility.ECPayUrl)} 或 {Format.Url("Paypal", Discord_Stream_Notify_Bot.Utility.PaypalUrl)} 來贊助直播小幫手");`
`121`	`121`	`await RespondAsync(embed: embed.Build());`
`122`	`122`	`return;`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private async Task ChangeGuildBannerAsync(string channelId, string videoId)`
`60`	`60`	`Image image = new Image(memStream);`
`61`	`61`	`await guild.ModifyAsync((func) => func.Banner = image);`
`62`	`62`	`}`
`63`		`-`
	`63`	`+`
`64`	`64`	`item.LastChangeStreamId = videoId;`
`65`	`65`
`66`	`66`	`using (var db = _dbService.GetDbContext())`