Revert "fix: only allow entities with platform=sonos"

punxaphil · Jan 3, 2024 · e515efb · e515efb
1 parent ef51105
commit e515efb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/src/card.ts b/src/card.ts
@@ -1,8 +1,9 @@
+import { HomeAssistant } from 'custom-card-helpers';
 import { css, html, LitElement } from 'lit';
 import { property, state } from 'lit/decorators.js';
 import { choose } from 'lit/directives/choose.js';
 import Store from './model/store';
-import { CardConfig, HomeAssistant, Section } from './types';
+import { CardConfig, Section } from './types';
 import './components/footer';
 import './editor/editor';
 import {

diff --git a/src/editor/base-editor.ts b/src/editor/base-editor.ts
@@ -1,7 +1,7 @@
 import { css, LitElement } from 'lit';
-import { fireEvent } from 'custom-card-helpers';
+import { fireEvent, HomeAssistant } from 'custom-card-helpers';
 import { property } from 'lit/decorators.js';
-import { CardConfig, HomeAssistant } from '../types';
+import { CardConfig } from '../types';
 import Store from '../model/store';
 import { dispatch } from '../utils/utils';
 

diff --git a/src/model/store.ts b/src/model/store.ts
@@ -1,11 +1,11 @@
+import { HomeAssistant } from 'custom-card-helpers';
 import HassService from '../services/hass-service';
 import MediaBrowseService from '../services/media-browse-service';
 import MediaControlService from '../services/media-control-service';
 import {
   CardConfig,
   ConfigPredefinedGroup,
   ConfigPredefinedGroupPlayer,
-  HomeAssistant,
   PredefinedGroup,
   PredefinedGroupPlayer,
   Section,
@@ -110,9 +110,7 @@ export default class Store {
 
   public getMediaPlayerHassEntities(hass: HomeAssistant) {
     const configEntities = [...new Set(this.config.entities)];
-    return Object.values(this.hass.entities)
-      .filter((e) => e.entity_id.includes('media_player.') && e.platform === 'sonos')
-      .map((e) => hass.states[e.entity_id])
+    return Object.values(hass.states)
       .filter(getGroupPlayerIds)
       .filter((hassEntity) => {
         const includesEntity = configEntities.includes(hassEntity.entity_id);

diff --git a/src/services/hass-service.ts b/src/services/hass-service.ts
@@ -1,4 +1,5 @@
-import { HomeAssistant, MediaPlayerItem, Section, TemplateResult } from '../types';
+import { HomeAssistant } from 'custom-card-helpers';
+import { MediaPlayerItem, Section, TemplateResult } from '../types';
 import { ServiceCallRequest } from 'custom-card-helpers/dist/types';
 import { CALL_MEDIA_DONE, CALL_MEDIA_STARTED } from '../constants';
 import { MediaPlayer } from '../model/media-player';

diff --git a/src/types.ts b/src/types.ts
@@ -1,4 +1,4 @@
-import { HomeAssistant as HomeAssistantBase, LovelaceCardConfig } from 'custom-card-helpers';
+import { LovelaceCardConfig } from 'custom-card-helpers';
 import { MediaPlayer } from './model/media-player';
 
 declare global {
@@ -117,12 +117,3 @@ export enum MediaPlayerEntityFeature {
   REPEAT_SET = 262144,
   GROUPING = 524288,
 }
-
-export interface HomeAssistant extends HomeAssistantBase {
-  entities: { [id: string]: EntityRegistryDisplayEntry };
-}
-
-export interface EntityRegistryDisplayEntry {
-  entity_id: string;
-  platform?: string;
-}