From 36aed76878b8d8d7e0e7c9fd5efa25c1c70a1e8f Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Sat, 23 Apr 2022 15:22:33 -0700
Subject: [PATCH] Improve camera names.

---
 src/browse-media-util.ts |  4 ++--
 src/common.ts            | 16 +++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/browse-media-util.ts b/src/browse-media-util.ts
index 0e7b6570..ec182437 100644
--- a/src/browse-media-util.ts
+++ b/src/browse-media-util.ts
@@ -176,14 +176,14 @@ export class BrowseMediaUtil {
     ): number => {
       if (
         !a.frigate?.event ||
-        (b.frigate?.event && b.frigate.event.start_time < a.frigate.event.start_time)
+        (b.frigate?.event && b.frigate.event.start_time > a.frigate.event.start_time)
       ) {
         return 1;
       }
 
       if (
         !b.frigate?.event ||
-        (a.frigate?.event && b.frigate.event.start_time > a.frigate.event.start_time)
+        (a.frigate?.event && b.frigate.event.start_time < a.frigate.event.start_time)
       ) {
         return -1;
       }
diff --git a/src/common.ts b/src/common.ts
index de3f9bb8..3f07ba94 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -497,20 +497,10 @@ export function getCameraTitle(
   // used on raw configuration in the editor.
   return (
     (typeof config?.title === 'string' && config.title) ||
+    (typeof config?.camera_entity === 'string' ? getEntityTitle(hass, config.camera_entity) : '') ||
+    (typeof config?.webrtc_card === 'object' &&  config.webrtc_card && typeof config.webrtc_card['entity'] === 'string' && config.webrtc_card['entity']) ||
+    (typeof config?.camera_name === 'string' ? prettifyFrigateName(config.camera_name) : '') ||
     (typeof config?.id === 'string' && config.id) ||
-    [
-      typeof config?.camera_entity === 'string'
-        ? getEntityTitle(hass, config.camera_entity)
-        : '',
-      typeof config?.client_id === 'string' ? config.client_id : '',
-      typeof config?.camera_name === 'string'
-        ? prettifyFrigateName(config.camera_name)
-        : '',
-      typeof config?.label === 'string' ? prettifyFrigateName(config.label) : '',
-      typeof config?.zone === 'string' ? prettifyFrigateName(config.zone) : '',
-    ]
-      .filter(Boolean)
-      .join(' / ') ||
     ''
   );
 }