#1 reset object per default on send

Signed-off-by: scrummer <[email protected]>
LabyMod · Jan 26, 2022 · f532334 · f532334
1 parent b0847ec
commit f532334
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/DiscordWebhookBundle/DependencyInjection/DiscordWebhookExtension.php b/src/DiscordWebhookBundle/DependencyInjection/DiscordWebhookExtension.php
@@ -30,6 +30,7 @@ public function load(array $configs, ContainerBuilder $container): void
             ->register(DiscordWebhook::class, DiscordWebhook::class)
             ->setPublic(true)
             ->setArgument('$url', $config['default_url'])
+            ->setArgument('$serviceName', DiscordWebhook::class)
             ->addTag('discord_webhook.client', ['key' => DiscordWebhook::class]);
 
         // configure the additional named clients
@@ -47,6 +48,7 @@ private function configureClients(array $config, ContainerBuilder $container, Fi
                 ->register($name, DiscordWebhook::class)
                 ->setPublic(true)
                 ->setArgument('$url', $clientConfig['webhook_url'])
+                ->setArgument('$serviceName', $name)
                 ->addMethodCall('setUsername', [$clientConfig['username']])
                 ->addMethodCall('setAvatar', [$clientConfig['avatar_url']])
                 ->addTag('discord_webhook.client', ['key' => $name]);

diff --git a/src/DiscordWebhookBundle/DiscordWebhook.php b/src/DiscordWebhookBundle/DiscordWebhook.php
@@ -13,9 +13,27 @@
  */
 class DiscordWebhook extends Webhook
 {
-    public function __construct(array|string $url = [])
+    private string $serviceName;
+
+    public function __construct(array|string $url = [], string $serviceName = DiscordWebhook::class)
     {
         parent::__construct($url);
+
+        $this->serviceName = $serviceName;
+    }
+
+    public function send(): bool
+    {
+        $status = parent::send(false);
+        $ignoredFields = [];
+
+        if ($this->serviceName !== DiscordWebhook::class) {
+            $ignoredFields = ['username', 'avatarUrl'];
+        }
+
+        $this->reset($ignoredFields);
+
+        return $status;
     }
 
     public function setUrl(string $webhook): void