feat: code cleanup

jwplayer · Jul 5, 2023 · 13a1e21 · 13a1e21
1 parent 3895565
commit 13a1e21
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/public/jwpltx.js b/public/jwpltx.js
@@ -90,16 +90,15 @@ window.jwpltx = window.jwpltx || {};
   }
 
   // Process a player ready event
-  o.ready = function (aid, bun, fed, id, t, oaid, oiid) {
+  o.ready = function (aid, bun, fed, id, t, oaid, oiid, av) {
     uri = JSON.parse(JSON.stringify(URI));
     uri.aid = aid;
     uri.bun = bun;
     uri.fed = fed;
     uri.id = id;
     uri.t = t;
     uri.oiid = oiid;
-    // eslint-disable-next-line no-undef
-    uri.av = APP_VERSION;
+    uri.av = av;
 
     // Send oaid only for logged in users
     if (oaid) {

diff --git a/src/hooks/useOttAnalytics.ts b/src/hooks/useOttAnalytics.ts
@@ -15,6 +15,9 @@ const useOttAnalytics = (item?: PlaylistItem, feedId: string = '') => {
   // app config id (oiid)
   const oiid = config?.id;
 
+  // app version number (av)
+  const av = import.meta.env.APP_VERSION;
+
   const [player, setPlayer] = useState<jwplayer.JWPlayer | null>(null);
 
   useEffect(() => {
@@ -42,7 +45,7 @@ const useOttAnalytics = (item?: PlaylistItem, feedId: string = '') => {
         return;
       }
 
-      window.jwpltx.ready(analyticsToken, window.location.hostname, feedId, item.mediaid, item.title, oaid, oiid);
+      window.jwpltx.ready(analyticsToken, window.location.hostname, feedId, item.mediaid, item.title, oaid, oiid, av);
     };
 
     const completeHandler = () => {
@@ -70,7 +73,7 @@ const useOttAnalytics = (item?: PlaylistItem, feedId: string = '') => {
       player.off('seeked', seekedHandler);
       player.off('adImpression', adImpressionHandler);
     };
-  }, [player, item, analyticsToken, feedId, oaid, oiid]);
+  }, [player, item, analyticsToken, feedId, oaid, oiid, av]);
 
   return setPlayer;
 };

diff --git a/types/jwpltx.d.ts b/types/jwpltx.d.ts
@@ -1,5 +1,14 @@
 interface Jwpltx {
-  ready: (analyticsid: string, hostname: string, feedid: string, mediaid: string, title: string, accountid?: number, appid?: string) => void;
+  ready: (
+    analyticsid: string,
+    hostname: string,
+    feedid: string,
+    mediaid: string,
+    title: string,
+    accountid?: number,
+    appid?: string,
+    appversion?: string,
+  ) => void;
   adImpression: () => void;
   seek: (offset: number, duration: number) => void;
   seeked: () => void;