From 2af65cf28eea397013a0f629761536339d6ace63 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 23 Jan 2025 21:01:56 +0100
Subject: [PATCH] fix: Fix duplicate `action` publish when `advanced.output`
 has `attribute` (#25963)

---
 lib/extension/homeassistant.ts        |  2 +-
 test/extensions/homeassistant.test.ts | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index b2c12df47f..a3e38cb777 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -1294,7 +1294,7 @@ export default class HomeAssistant extends Extension {
          * Whenever a device publish an {action: *} we discover an MQTT device trigger sensor
          * and republish it to zigbee2mqtt/my_device/action
          */
-        if (entity.isDevice() && entity.definition && data.message.action) {
+        if (settings.get().advanced.output === 'json' && entity.isDevice() && entity.definition && data.message.action) {
             const value = data.message['action'].toString();
             await this.publishDeviceTriggerDiscover(entity, 'action', value);
             await this.mqtt.publish(`${data.entity.name}/action`, value, {});
diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts
index b4d183b640..4ab152cb03 100644
--- a/test/extensions/homeassistant.test.ts
+++ b/test/extensions/homeassistant.test.ts
@@ -1724,8 +1724,6 @@ describe('Extension: HomeAssistant', () => {
             {retain: true, qos: 1},
         );
 
-        expect(mockMQTTPublishAsync).toHaveBeenCalledWith('zigbee2mqtt/button/action', 'single', {retain: false, qos: 0});
-
         expect(mockMQTTPublishAsync).toHaveBeenCalledWith(
             'zigbee2mqtt/button',
             stringify({
@@ -1749,8 +1747,6 @@ describe('Extension: HomeAssistant', () => {
             {retain: true, qos: 1},
         );
 
-        expect(mockMQTTPublishAsync).toHaveBeenCalledWith('zigbee2mqtt/button/action', 'single', {retain: false, qos: 0});
-
         // Shouldn't rediscover when already discovered in previous session
         clearDiscoveredTrigger('0x0017880104e45520');
         await mockMQTTEvents.message(
@@ -1789,6 +1785,19 @@ describe('Extension: HomeAssistant', () => {
         );
     });
 
+    test.each(['attribute_and_json', 'json', 'attribute'])('Should publish /action for MQTT device trigger', async (output) => {
+        settings.set(['advanced', 'output'], output);
+        mockMQTTPublishAsync.mockClear();
+
+        const device = devices.WXKG11LM;
+        const payload1 = {data: {onOff: 1}, cluster: 'genOnOff', device, endpoint: device.getEndpoint(1), type: 'attributeReport', linkquality: 10};
+        await mockZHEvents.message(payload1);
+        await flushPromises();
+
+        expect(mockMQTTPublishAsync).toHaveBeenCalledWith('zigbee2mqtt/button/action', 'single', {retain: false, qos: 0});
+        expect(mockMQTTPublishAsync.mock.calls.filter((c) => c[1] === 'single')).toHaveLength(1);
+    });
+
     it('Should not discover device_automation when disabled', async () => {
         settings.set(['device_options'], {
             homeassistant: {device_automation: null},