add prefix to status topic

switchbot_mqtt/__init__.py

@@ -52,7 +52,8 @@ def _mqtt_on_connect(
         else mqtt_broker_host,
         mqtt_broker_port,
     )
-    mqtt_client.publish(topic=availability_topic,payload=BirthMessage)
+    _availability_topic_with_prefix = userdata.mqtt_topic_prefix + _MQTT_AVAILABILITY_TOPIC
+    mqtt_client.publish(topic=_availability_topic_with_prefix,payload=_MQTT_BIRTH_PAYLOAD)
     _ButtonAutomator.mqtt_subscribe(mqtt_client=mqtt_client, settings=userdata)
     _CurtainMotor.mqtt_subscribe(mqtt_client=mqtt_client, settings=userdata)
 
@@ -91,7 +92,8 @@ def _run(
         mqtt_client.username_pw_set(username=mqtt_username, password=mqtt_password)
     elif mqtt_password:
         raise ValueError("Missing MQTT username")
-    mqtt_client.will_set(topic=availability_topic,payload=LWT)
+    _availability_topic_with_prefix = mqtt_topic_prefix + _MQTT_AVAILABILITY_TOPIC
+    mqtt_client.will_set(topic=_availability_topic_with_prefix,payload=_MQTT_LAST_WILL_PAYLOAD)
     mqtt_client.connect(host=mqtt_host, port=mqtt_port)
     # https://github.com/eclipse/paho.mqtt.python/blob/master/src/paho/mqtt/client.py#L1740
     mqtt_client.loop_forever()