diff --git a/homeassistant/components/habitica/button.py b/homeassistant/components/habitica/button.py index 204e50e4517..b254a828049 100644 --- a/homeassistant/components/habitica/button.py +++ b/homeassistant/components/habitica/button.py @@ -16,7 +16,7 @@ from homeassistant.components.button import ( ButtonEntityDescription, ) from homeassistant.core import HomeAssistant, callback -from homeassistant.exceptions import ServiceValidationError +from homeassistant.exceptions import HomeAssistantError, ServiceValidationError from homeassistant.helpers import entity_registry as er from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -120,11 +120,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( HabiticaButtonEntityDescription( key=HabitipyButtonEntity.FROST, translation_key=HabitipyButtonEntity.FROST, - press_fn=( - lambda coordinator: coordinator.api.user.class_.cast["frost"].post( - targetId=coordinator.config_entry.unique_id - ) - ), + press_fn=lambda coordinator: coordinator.api.user.class_.cast["frost"].post(), available_fn=( lambda data: data.user["stats"]["lvl"] >= 14 and data.user["stats"]["mp"] >= 40 @@ -138,7 +134,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( press_fn=( lambda coordinator: coordinator.api.user.class_.cast[ "defensiveStance" - ].post(targetId=coordinator.config_entry.unique_id) + ].post() ), available_fn=( lambda data: data.user["stats"]["lvl"] >= 12 @@ -153,7 +149,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( press_fn=( lambda coordinator: coordinator.api.user.class_.cast[ "valorousPresence" - ].post(targetId=coordinator.config_entry.unique_id) + ].post() ), available_fn=( lambda data: data.user["stats"]["lvl"] >= 13 @@ -166,9 +162,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( key=HabitipyButtonEntity.INTIMIDATE, translation_key=HabitipyButtonEntity.INTIMIDATE, press_fn=( - lambda coordinator: coordinator.api.user.class_.cast["intimidate"].post( - targetId=coordinator.config_entry.unique_id - ) + lambda coordinator: coordinator.api.user.class_.cast["intimidate"].post() ), available_fn=( lambda data: data.user["stats"]["lvl"] >= 14 @@ -194,9 +188,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( key=HabitipyButtonEntity.STEALTH, translation_key=HabitipyButtonEntity.STEALTH, press_fn=( - lambda coordinator: coordinator.api.user.class_.cast["stealth"].post( - targetId=coordinator.config_entry.unique_id - ) + lambda coordinator: coordinator.api.user.class_.cast["stealth"].post() ), available_fn=( lambda data: data.user["stats"]["lvl"] >= 14 @@ -208,11 +200,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( HabiticaButtonEntityDescription( key=HabitipyButtonEntity.HEAL, translation_key=HabitipyButtonEntity.HEAL, - press_fn=( - lambda coordinator: coordinator.api.user.class_.cast["heal"].post( - targetId=coordinator.config_entry.unique_id - ) - ), + press_fn=lambda coordinator: coordinator.api.user.class_.cast["heal"].post(), available_fn=( lambda data: data.user["stats"]["lvl"] >= 11 and data.user["stats"]["mp"] >= 15 @@ -223,9 +211,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = ( key=HabitipyButtonEntity.BRIGHTNESS, translation_key=HabitipyButtonEntity.BRIGHTNESS, press_fn=( - lambda coordinator: coordinator.api.user.class_.cast["brightness"].post( - targetId=coordinator.config_entry.unique_id - ) + lambda coordinator: coordinator.api.user.class_.cast["brightness"].post() ), available_fn=( lambda data: data.user["stats"]["lvl"] >= 12 @@ -329,7 +315,7 @@ class HabiticaButton(HabiticaBase, ButtonEntity): translation_domain=DOMAIN, translation_key="service_call_unallowed", ) from e - raise ServiceValidationError( + raise HomeAssistantError( translation_domain=DOMAIN, translation_key="service_call_exception", ) from e diff --git a/homeassistant/components/habitica/manifest.json b/homeassistant/components/habitica/manifest.json index 16a4ef959a8..8e3396d32cf 100644 --- a/homeassistant/components/habitica/manifest.json +++ b/homeassistant/components/habitica/manifest.json @@ -6,5 +6,5 @@ "documentation": "https://www.home-assistant.io/integrations/habitica", "iot_class": "cloud_polling", "loggers": ["habitipy", "plumbum"], - "requirements": ["habitipy==0.3.1"] + "requirements": ["habitipy==0.3.3"] } diff --git a/requirements_all.txt b/requirements_all.txt index 2dd04e45222..966380d1c64 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1078,7 +1078,7 @@ ha-iotawattpy==0.1.2 ha-philipsjs==3.2.2 # homeassistant.components.habitica -habitipy==0.3.1 +habitipy==0.3.3 # homeassistant.components.bluetooth habluetooth==3.6.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index acc437ed97e..0308441d2bf 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -916,7 +916,7 @@ ha-iotawattpy==0.1.2 ha-philipsjs==3.2.2 # homeassistant.components.habitica -habitipy==0.3.1 +habitipy==0.3.3 # homeassistant.components.bluetooth habluetooth==3.6.0