update avatar file path

Author: Hanashi

files/lib/system/discord/WebhookHandler.class.php

@@ -8,7 +8,6 @@
 use wcf\data\discord\webhook\DiscordWebhookList;
 use wcf\system\cache\runtime\DiscordBotRuntimeCache;
 use wcf\system\SingletonFactory;
-use wcf\util\FileUtil;
 
 final class WebhookHandler extends SingletonFactory
 {
@@ -21,12 +20,7 @@ public function saveWebhooks(int $botID, array $channelIDs, string $usageBy)
         }
         $api = $bot->getDiscordApi();
 
-        $avatar = null;
-        $avatarFile = \sprintf('%simages/discord_webhook/%s.png', WCF_DIR, $botID);
-        if (\file_exists($avatarFile)) {
-            $mimeType = FileUtil::getMimeType($avatarFile);
-            $avatar = 'data:' . $mimeType . ';base64,' . \base64_encode(\file_get_contents($avatarFile));
-        }
+        $avatar = $bot->getWebhookAvatarData();
 
         $list = new DiscordWebhookList();
         $list->getConditionBuilder()->add('botID = ?', [$bot->botID]);

files/lib/system/discord/type/WebhookChannelMultiSelectDiscordType.class.php

@@ -6,7 +6,6 @@
 use wcf\data\discord\webhook\DiscordWebhookAction;
 use wcf\data\discord\webhook\DiscordWebhookList;
 use wcf\system\exception\UserInputException;
-use wcf\util\FileUtil;
 
 class WebhookChannelMultiSelectDiscordType extends ChannelMultiSelectDiscordType
 {
@@ -67,12 +66,7 @@ public function validate($newValue)
 
                 if (!isset($webhookChannelIDs[$botID]) || !\in_array($channelID, $webhookChannelIDs[$botID])) {
                     $discordApi = $discordBots[$botID]->getDiscordApi();
-                    $avatar = null;
-                    $avatarFile = \sprintf('%simages/discord_webhook/%s.png', WCF_DIR, $botID);
-                    if (\file_exists($avatarFile)) {
-                        $mimeType = FileUtil::getMimeType($avatarFile);
-                        $avatar = 'data:' . $mimeType . ';base64,' . \base64_encode(\file_get_contents($avatarFile));
-                    }
+                    $avatar = $discordBots[$botID]->getWebhookAvatarData();
                     $response = $discordApi->createWebhook($channelID, $discordBots[$botID]->webhookName, $avatar);
                     if (!$response['error']) {
                         $action = new DiscordWebhookAction([], 'create', [

files/lib/system/discord/type/WebhookChannelSelectDiscordType.class.php

@@ -6,7 +6,6 @@
 use wcf\data\discord\webhook\DiscordWebhookAction;
 use wcf\data\discord\webhook\DiscordWebhookList;
 use wcf\system\exception\UserInputException;
-use wcf\util\FileUtil;
 
 class WebhookChannelSelectDiscordType extends ChannelSelectDiscordType
 {
@@ -63,12 +62,7 @@ public function validate($newValue, ?int $maxChannels = null)
 
             if (!isset($webhookChannelIDs[$botID]) || !\in_array($channelID, $webhookChannelIDs[$botID])) {
                 $discordApi = $discordBots[$botID]->getDiscordApi();
-                $avatar = null;
-                $avatarFile = \sprintf('%simages/discord_webhook/%s.png', WCF_DIR, $botID);
-                if (\file_exists($avatarFile)) {
-                    $mimeType = FileUtil::getMimeType($avatarFile);
-                    $avatar = 'data:' . $mimeType . ';base64,' . \base64_encode(\file_get_contents($avatarFile));
-                }
+                $avatar = $discordBots[$botID]->getWebhookAvatarData();
                 $response = $discordApi->createWebhook($channelID, $discordBots[$botID]->webhookName, $avatar);
                 if (!$response['error']) {
                     $action = new DiscordWebhookAction([], 'create', [