diff --git a/homeassistant/components/habitica/button.py b/homeassistant/components/habitica/button.py index 30e326f79a07f64375b54621dbfc1d8f4fc6a86c..2b9a4199133f01dbab48e79f01b3115e34a01fe3 100644 --- a/homeassistant/components/habitica/button.py +++ b/homeassistant/components/habitica/button.py @@ -33,7 +33,7 @@ class HabiticaButtonEntityDescription(ButtonEntityDescription): """Describes Habitica button entity.""" press_fn: Callable[[HabiticaDataUpdateCoordinator], Any] - available_fn: Callable[[HabiticaData], bool] | None = None + available_fn: Callable[[HabiticaData], bool] class_needed: str | None = None entity_picture: str | None = None @@ -343,11 +343,10 @@ class HabiticaButton(HabiticaBase, ButtonEntity): @property def available(self) -> bool: """Is entity available.""" - if not super().available: - return False - if self.entity_description.available_fn: - return self.entity_description.available_fn(self.coordinator.data) - return True + + return super().available and self.entity_description.available_fn( + self.coordinator.data + ) @property def entity_picture(self) -> str | None: diff --git a/homeassistant/components/habitica/calendar.py b/homeassistant/components/habitica/calendar.py index be4433cb3550141b69365da7db49858e643be391..6de22a0314ac3fc8cb4405dce6f1c83d2706b62a 100644 --- a/homeassistant/components/habitica/calendar.py +++ b/homeassistant/components/habitica/calendar.py @@ -374,9 +374,6 @@ class HabiticaDailyRemindersCalendarEntity(HabiticaCalendarEntity): # Event ends before date range continue - if end_date and start > end_date: - # Event starts after date range - continue events.append( CalendarEvent( start=start,